« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 6510
- compare with another revision
- download diff
- download tarball
- view history from revision 6510
- Committer: Patch Queue Manager
- Date: 2012-03-16 14:15:06 UTC
- mfrom: (6503.3.1 typo-fix)
- Revision ID: pqm@pqm.ubuntu.com-20120316141506-30gdc3wkbgmwkdus
(jelmer) Fix a typo: extention -> extension. (Jelmer Vernooij)
- files added:
- NEWS
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- contrib/apport/ => apport/
- contrib/apport/bzr.conf => apport/bzr-crashdb.conf
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_branch/test_bound_sftp.py => bzrlib/tests/per_branch/test_bound_sftp.py.THIS
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => bzrlib/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2005-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
17
17
"""builtin bzr commands"""
18
18
19
from __future__ import absolute_import
20
19
21
import os
20
22
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
import codecs
23
import bzrlib.bzrdir
24
25
from bzrlib import lazy_import
26
lazy_import.lazy_import(globals(), """
24
27
import cStringIO
28
import errno
25
29
import sys
26
30
import time
27
31
30
34
bugtracker,
31
35
bundle,
32
36
btree_index,
33
bzrdir,
37
controldir,
34
38
directory_service,
35
39
delta,
36
config,
40
config as _mod_config,
37
41
errors,
38
42
globbing,
39
43
hooks,
45
49
rename_map,
46
50
revision as _mod_revision,
47
51
static_tuple,
48
symbol_versioning,
49
52
timestamp,
50
53
transport,
51
54
ui,
52
55
urlutils,
53
56
views,
57
gpg,
54
58
)
55
59
from bzrlib.branch import Branch
56
60
from bzrlib.conflicts import ConflictList
58
62
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
63
from bzrlib.smtp_connection import SMTPConnection
60
64
from bzrlib.workingtree import WorkingTree
65
from bzrlib.i18n import gettext, ngettext
61
66
""")
62
67
63
from bzrlib.commands import Command, display_command
68
from bzrlib.commands import (
69
Command,
70
builtin_command_registry,
71
display_command,
72
)
64
73
from bzrlib.option import (
65
74
ListOption,
66
75
Option,
69
78
_parse_revision_str,
70
79
)
71
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
72
73
74
def tree_files(file_list, default_branch=u'.', canonicalize=True,
75
apply_view=True):
76
try:
77
return internal_tree_files(file_list, default_branch, canonicalize,
78
apply_view)
79
except errors.FileInWrongBranch, e:
80
raise errors.BzrCommandError("%s is not in the same branch as %s" %
81
(e.path, file_list[0]))
81
from bzrlib import (
82
symbol_versioning,
83
)
84
85
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
88
try:
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
93
return target
94
this_branch = control_dir.open_branch(
95
possible_transports=possible_transports)
96
# This may be a heavy checkout, where we want the master branch
97
master_location = this_branch.get_bound_location()
98
if master_location is not None:
99
return master_location
100
# If not, use a local sibling
101
return this_branch.base
102
103
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
106
107
:param control_dir: Control directory
108
:return: Tuple with boolean indicating whether the branch is colocated
109
and the full URL to the actual branch
110
"""
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
115
try:
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
120
else:
121
try:
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
125
else:
126
return (
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
129
this_url)
130
131
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
134
135
:param control_dir: Control directory to find sibling branches from
136
:param location: Name of the new branch
137
:return: Full location to the new branch
138
"""
139
location = directory_service.directories.dereference(location)
140
if '/' not in location and '\\' not in location:
141
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
142
143
if colocated:
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
146
else:
147
return urlutils.join(this_url, '..', urlutils.escape(location))
148
return location
149
150
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
153
154
:param control_dir: Control directory relative to which to lookup the
155
location.
156
:param location: Location to look up
157
:return: branch to open
158
"""
159
try:
160
# Perhaps it's a colocated branch?
161
return control_dir.open_branch(location,
162
possible_transports=possible_transports)
163
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
164
this_url = _get_branch_location(control_dir)
165
return Branch.open(
166
urlutils.join(
167
this_url, '..', urlutils.escape(location)))
168
169
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
172
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
176
"""
177
if near is None:
178
if location is None:
179
location = "."
180
try:
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
184
near = "."
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
189
190
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
193
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
196
"""
197
seen_urls = set()
198
try:
199
reference = control_dir.get_branch_reference()
200
except errors.NotBranchError:
201
# There is no active branch, just return the colocated branches.
202
for name, branch in control_dir.get_branches().iteritems():
203
yield name, branch
204
return
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
208
else:
209
ref_branch = None
210
if ref_branch is None or ref_branch.name:
211
if ref_branch is not None:
212
control_dir = ref_branch.bzrdir
213
for name, branch in control_dir.get_branches().iteritems():
214
yield name, branch
215
else:
216
repo = ref_branch.bzrdir.find_repository()
217
for branch in repo.find_branches(using=True):
218
name = urlutils.relative_url(repo.user_url,
219
branch.user_url).rstrip("/")
220
yield name, branch
82
221
83
222
84
223
def tree_files_for_add(file_list):
109
248
if view_files:
110
249
file_list = view_files
111
250
view_str = views.view_display_str(view_files)
112
note("Ignoring files outside view. View is %s" % view_str)
251
note(gettext("Ignoring files outside view. View is %s") % view_str)
113
252
return tree, file_list
114
253
115
254
117
256
if revisions is None:
118
257
return None
119
258
if len(revisions) != 1:
120
raise errors.BzrCommandError(
121
'bzr %s --revision takes exactly one revision identifier' % (
259
raise errors.BzrCommandError(gettext(
260
'bzr %s --revision takes exactly one revision identifier') % (
122
261
command_name,))
123
262
return revisions[0]
124
263
146
285
return rev_tree
147
286
148
287
149
# XXX: Bad function name; should possibly also be a class method of
150
# WorkingTree rather than a function.
151
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
152
apply_view=True):
153
"""Convert command-line paths to a WorkingTree and relative paths.
154
155
This is typically used for command-line processors that take one or
156
more filenames, and infer the workingtree that contains them.
157
158
The filenames given are not required to exist.
159
160
:param file_list: Filenames to convert.
161
162
:param default_branch: Fallback tree path to use if file_list is empty or
163
None.
164
165
:param apply_view: if True and a view is set, apply it or check that
166
specified files are within it
167
168
:return: workingtree, [relative_paths]
169
"""
170
if file_list is None or len(file_list) == 0:
171
tree = WorkingTree.open_containing(default_branch)[0]
172
if tree.supports_views() and apply_view:
173
view_files = tree.views.lookup_view()
174
if view_files:
175
file_list = view_files
176
view_str = views.view_display_str(view_files)
177
note("Ignoring files outside view. View is %s" % view_str)
178
return tree, file_list
179
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
180
return tree, safe_relpath_files(tree, file_list, canonicalize,
181
apply_view=apply_view)
182
183
184
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
185
"""Convert file_list into a list of relpaths in tree.
186
187
:param tree: A tree to operate on.
188
:param file_list: A list of user provided paths or None.
189
:param apply_view: if True and a view is set, apply it or check that
190
specified files are within it
191
:return: A list of relative paths.
192
:raises errors.PathNotChild: When a provided path is in a different tree
193
than tree.
194
"""
195
if file_list is None:
196
return None
197
if tree.supports_views() and apply_view:
198
view_files = tree.views.lookup_view()
199
else:
200
view_files = []
201
new_list = []
202
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
203
# doesn't - fix that up here before we enter the loop.
204
if canonicalize:
205
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
206
else:
207
fixer = tree.relpath
208
for filename in file_list:
209
try:
210
relpath = fixer(osutils.dereference_path(filename))
211
if view_files and not osutils.is_inside_any(view_files, relpath):
212
raise errors.FileOutsideView(filename, view_files)
213
new_list.append(relpath)
214
except errors.PathNotChild:
215
raise errors.FileInWrongBranch(tree.branch, filename)
216
return new_list
217
218
219
288
def _get_view_info_for_change_reporter(tree):
220
289
"""Get the view information from a tree for change reporting."""
221
290
view_info = None
228
297
return view_info
229
298
230
299
300
def _open_directory_or_containing_tree_or_branch(filename, directory):
301
"""Open the tree or branch containing the specified file, unless
302
the --directory option is used to specify a different branch."""
303
if directory is not None:
304
return (None, Branch.open(directory), filename)
305
return controldir.ControlDir.open_containing_tree_or_branch(filename)
306
307
231
308
# TODO: Make sure no commands unconditionally use the working directory as a
232
309
# branch. If a filename argument is used, the first of them should be used to
233
310
# specify the branch. (Perhaps this can be factored out into some kind of
235
312
# opens the branch?)
236
313
237
314
class cmd_status(Command):
238
"""Display status summary.
315
__doc__ = """Display status summary.
239
316
240
317
This reports on versioned and unknown files, reporting them
241
318
grouped by state. Possible states are:
261
338
unknown
262
339
Not versioned and not matching an ignore pattern.
263
340
264
Additionally for directories, symlinks and files with an executable
265
bit, Bazaar indicates their type using a trailing character: '/', '@'
266
or '*' respectively.
341
Additionally for directories, symlinks and files with a changed
342
executable bit, Bazaar indicates their type using a trailing
343
character: '/', '@' or '*' respectively. These decorations can be
344
disabled using the '--no-classify' option.
267
345
268
346
To see ignored files use 'bzr ignored'. For details on the
269
347
changes to file texts, use 'bzr diff'.
282
360
To skip the display of pending merge information altogether, use
283
361
the no-pending option or specify a file/directory.
284
362
285
If a revision argument is given, the status is calculated against
286
that revision, or between two revisions if two are provided.
363
To compare the working directory to a specific revision, pass a
364
single revision to the revision argument.
365
366
To see which files have changed in a specific revision, or between
367
two revisions, pass a revision range to the revision argument.
368
This will produce the same results as calling 'bzr diff --summarize'.
287
369
"""
288
370
289
# TODO: --no-recurse, --recurse options
371
# TODO: --no-recurse/-N, --recurse options
290
372
291
373
takes_args = ['file*']
292
374
takes_options = ['show-ids', 'revision', 'change', 'verbose',
296
378
short_name='V'),
297
379
Option('no-pending', help='Don\'t show pending merges.',
298
380
),
381
Option('no-classify',
382
help='Do not mark object type using indicator.',
383
),
299
384
]
300
385
aliases = ['st', 'stat']
301
386
304
389
305
390
@display_command
306
391
def run(self, show_ids=False, file_list=None, revision=None, short=False,
307
versioned=False, no_pending=False, verbose=False):
392
versioned=False, no_pending=False, verbose=False,
393
no_classify=False):
308
394
from bzrlib.status import show_tree_status
309
395
310
396
if revision and len(revision) > 2:
311
raise errors.BzrCommandError('bzr status --revision takes exactly'
312
' one or two revision specifiers')
397
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
398
' one or two revision specifiers'))
313
399
314
tree, relfile_list = tree_files(file_list)
400
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
315
401
# Avoid asking for specific files when that is not needed.
316
402
if relfile_list == ['']:
317
403
relfile_list = None
324
410
show_tree_status(tree, show_ids=show_ids,
325
411
specific_files=relfile_list, revision=revision,
326
412
to_file=self.outf, short=short, versioned=versioned,
327
show_pending=(not no_pending), verbose=verbose)
413
show_pending=(not no_pending), verbose=verbose,
414
classify=not no_classify)
328
415
329
416
330
417
class cmd_cat_revision(Command):
331
"""Write out metadata for a revision.
418
__doc__ = """Write out metadata for a revision.
332
419
333
420
The revision to print can either be specified by a specific
334
421
revision identifier, or you can use --revision.
336
423
337
424
hidden = True
338
425
takes_args = ['revision_id?']
339
takes_options = ['revision']
426
takes_options = ['directory', 'revision']
340
427
# cat-revision is more for frontends so should be exact
341
428
encoding = 'strict'
342
429
349
436
self.outf.write(revtext.decode('utf-8'))
350
437
351
438
@display_command
352
def run(self, revision_id=None, revision=None):
439
def run(self, revision_id=None, revision=None, directory=u'.'):
353
440
if revision_id is not None and revision is not None:
354
raise errors.BzrCommandError('You can only supply one of'
355
' revision_id or --revision')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
356
443
if revision_id is None and revision is None:
357
raise errors.BzrCommandError('You must supply either'
358
' --revision or a revision_id')
359
b = WorkingTree.open_containing(u'.')[0].branch
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
446
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
360
448
361
449
revisions = b.repository.revisions
362
450
if revisions is None:
363
raise errors.BzrCommandError('Repository %r does not support '
364
'access to raw revision texts')
451
raise errors.BzrCommandError(gettext('Repository %r does not support '
452
'access to raw revision texts'))
365
453
366
454
b.repository.lock_read()
367
455
try:
371
459
try:
372
460
self.print_revision(revisions, revision_id)
373
461
except errors.NoSuchRevision:
374
msg = "The repository %s contains no revision %s." % (
462
msg = gettext("The repository {0} contains no revision {1}.").format(
375
463
b.repository.base, revision_id)
376
464
raise errors.BzrCommandError(msg)
377
465
elif revision is not None:
378
466
for rev in revision:
379
467
if rev is None:
380
468
raise errors.BzrCommandError(
381
'You cannot specify a NULL revision.')
469
gettext('You cannot specify a NULL revision.'))
382
470
rev_id = rev.as_revision_id(b)
383
471
self.print_revision(revisions, rev_id)
384
472
finally:
386
474
387
475
388
476
class cmd_dump_btree(Command):
389
"""Dump the contents of a btree index file to stdout.
477
__doc__ = """Dump the contents of a btree index file to stdout.
390
478
391
479
PATH is a btree index file, it can be any URL. This includes things like
392
480
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
440
528
self.outf.write(page_bytes[:header_end])
441
529
page_bytes = data
442
530
self.outf.write('\nPage %d\n' % (page_idx,))
443
decomp_bytes = zlib.decompress(page_bytes)
444
self.outf.write(decomp_bytes)
445
self.outf.write('\n')
531
if len(page_bytes) == 0:
532
self.outf.write('(empty)\n');
533
else:
534
decomp_bytes = zlib.decompress(page_bytes)
535
self.outf.write(decomp_bytes)
536
self.outf.write('\n')
446
537
447
538
def _dump_entries(self, trans, basename):
448
539
try:
456
547
for node in bt.iter_all_entries():
457
548
# Node is made up of:
458
549
# (index, key, value, [references])
459
refs_as_tuples = static_tuple.as_tuples(node[3])
550
try:
551
refs = node[3]
552
except IndexError:
553
refs_as_tuples = None
554
else:
555
refs_as_tuples = static_tuple.as_tuples(refs)
460
556
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
461
557
self.outf.write('%s\n' % (as_tuple,))
462
558
463
559
464
560
class cmd_remove_tree(Command):
465
"""Remove the working tree from a given branch/checkout.
561
__doc__ = """Remove the working tree from a given branch/checkout.
466
562
467
563
Since a lightweight checkout is little more than a working tree
468
564
this will refuse to run against one.
474
570
takes_options = [
475
571
Option('force',
476
572
help='Remove the working tree even if it has '
477
'uncommitted changes.'),
573
'uncommitted or shelved changes.'),
478
574
]
479
575
480
576
def run(self, location_list, force=False):
482
578
location_list=['.']
483
579
484
580
for location in location_list:
485
d = bzrdir.BzrDir.open(location)
486
581
d = controldir.ControlDir.open(location)
582
487
583
try:
488
584
working = d.open_workingtree()
489
585
except errors.NoWorkingTree:
490
raise errors.BzrCommandError("No working tree to remove")
586
raise errors.BzrCommandError(gettext("No working tree to remove"))
491
587
except errors.NotLocalUrl:
492
raise errors.BzrCommandError("You cannot remove the working tree"
493
" of a remote path")
588
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
" of a remote path"))
494
590
if not force:
495
591
if (working.has_changes()):
496
592
raise errors.UncommittedChanges(working)
593
if working.get_shelf_manager().last_shelf() is not None:
594
raise errors.ShelvedChanges(working)
497
595
498
working_path = working.bzrdir.root_transport.base
499
branch_path = working.branch.bzrdir.root_transport.base
500
if working_path != branch_path:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" from a lightweight checkout")
596
if working.user_url != working.branch.user_url:
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
503
599
504
600
d.destroy_workingtree()
505
601
506
602
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
605
606
This is not meant to be used normally, but more as a way to recover from
607
filesystem corruption, etc. This rebuilds the working inventory back to a
608
'known good' state. Any new modifications (adding a file, renaming, etc)
609
will be lost, though modified files will still be detected as such.
610
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
613
614
By default this attempts to recover the current state by looking at the
615
headers of the state file. If the state file is too corrupted to even do
616
that, you can supply --revision to force the state of the tree.
617
"""
618
619
takes_options = ['revision', 'directory',
620
Option('force',
621
help='Reset the tree even if it doesn\'t appear to be'
622
' corrupted.'),
623
]
624
hidden = True
625
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
629
if not force:
630
try:
631
tree.check_state()
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
634
else:
635
# Refuse
636
raise errors.BzrCommandError(gettext(
637
'The tree does not appear to be corrupt. You probably'
638
' want "bzr revert" instead. Use "--force" if you are'
639
' sure you want to reset the working tree.'))
640
if revision is None:
641
revision_ids = None
642
else:
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
644
try:
645
tree.reset_state(revision_ids)
646
except errors.BzrError, e:
647
if revision_ids is None:
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
650
else:
651
extra = ''
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
653
654
507
655
class cmd_revno(Command):
508
"""Show current revision number.
656
__doc__ = """Show current revision number.
509
657
510
658
This is equal to the number of revisions on this branch.
511
659
"""
513
661
_see_also = ['info']
514
662
takes_args = ['location?']
515
663
takes_options = [
516
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
665
'revision',
517
666
]
518
667
519
668
@display_command
520
def run(self, tree=False, location=u'.'):
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
673
521
674
if tree:
522
675
try:
523
676
wt = WorkingTree.open_containing(location)[0]
524
wt.lock_read()
677
self.add_cleanup(wt.lock_read().unlock)
525
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
526
679
raise errors.NoWorkingTree(location)
527
self.add_cleanup(wt.unlock)
680
b = wt.branch
528
681
revid = wt.last_revision()
529
try:
530
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
531
except errors.NoSuchRevision:
532
revno_t = ('???',)
533
revno = ".".join(str(n) for n in revno_t)
534
682
else:
535
683
b = Branch.open_containing(location)[0]
536
b.lock_read()
537
self.add_cleanup(b.unlock)
538
revno = b.revno()
684
self.add_cleanup(b.lock_read().unlock)
685
if revision:
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Tags can only be placed on a single revision, "
689
"not on a range"))
690
revid = revision[0].as_revision_id(b)
691
else:
692
revid = b.last_revision()
693
try:
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
696
revno_t = ('???',)
697
revno = ".".join(str(n) for n in revno_t)
539
698
self.cleanup_now()
540
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
541
700
542
701
543
702
class cmd_revision_info(Command):
544
"""Show revision number and revision id for a given revision identifier.
703
__doc__ = """Show revision number and revision id for a given revision identifier.
545
704
"""
546
705
hidden = True
547
706
takes_args = ['revision_info*']
548
707
takes_options = [
549
708
'revision',
550
Option('directory',
709
custom_help('directory',
551
710
help='Branch to examine, '
552
'rather than the one containing the working directory.',
553
short_name='d',
554
type=unicode,
555
),
556
Option('tree', help='Show revno of working tree'),
711
'rather than the one containing the working directory.'),
712
Option('tree', help='Show revno of working tree.'),
557
713
]
558
714
559
715
@display_command
563
719
try:
564
720
wt = WorkingTree.open_containing(directory)[0]
565
721
b = wt.branch
566
wt.lock_read()
567
self.add_cleanup(wt.unlock)
722
self.add_cleanup(wt.lock_read().unlock)
568
723
except (errors.NoWorkingTree, errors.NotLocalUrl):
569
724
wt = None
570
725
b = Branch.open_containing(directory)[0]
571
b.lock_read()
572
self.add_cleanup(b.unlock)
726
self.add_cleanup(b.lock_read().unlock)
573
727
revision_ids = []
574
728
if revision is not None:
575
729
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
603
757
604
758
605
759
class cmd_add(Command):
606
"""Add specified files or directories.
760
__doc__ = """Add specified files or directories.
607
761
608
762
In non-recursive mode, all the named items are added, regardless
609
763
of whether they were previously ignored. A warning is given if
617
771
are added. This search proceeds recursively into versioned
618
772
directories. If no names are given '.' is assumed.
619
773
774
A warning will be printed when nested trees are encountered,
775
unless they are explicitly ignored.
776
620
777
Therefore simply saying 'bzr add' will version all files that
621
778
are currently unknown.
622
779
638
795
639
796
Any files matching patterns in the ignore list will not be added
640
797
unless they are explicitly mentioned.
798
799
In recursive mode, files larger than the configuration option
800
add.maximum_file_size will be skipped. Named items are never skipped due
801
to file size.
641
802
"""
642
803
takes_args = ['file*']
643
804
takes_options = [
644
805
Option('no-recurse',
645
help="Don't recursively add the contents of directories."),
806
help="Don't recursively add the contents of directories.",
807
short_name='N'),
646
808
Option('dry-run',
647
809
help="Show what would be done, but don't actually do anything."),
648
810
'verbose',
670
832
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
671
833
to_file=self.outf, should_print=(not is_quiet()))
672
834
else:
673
action = bzrlib.add.AddAction(to_file=self.outf,
835
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
674
836
should_print=(not is_quiet()))
675
837
676
838
if base_tree:
677
base_tree.lock_read()
678
self.add_cleanup(base_tree.unlock)
839
self.add_cleanup(base_tree.lock_read().unlock)
679
840
tree, file_list = tree_files_for_add(file_list)
680
841
added, ignored = tree.smart_add(file_list, not
681
842
no_recurse, action=action, save=not dry_run)
684
845
if verbose:
685
846
for glob in sorted(ignored.keys()):
686
847
for path in ignored[glob]:
687
self.outf.write("ignored %s matching \"%s\"\n"
688
% (path, glob))
848
self.outf.write(
849
gettext("ignored {0} matching \"{1}\"\n").format(
850
path, glob))
689
851
690
852
691
853
class cmd_mkdir(Command):
692
"""Create a new versioned directory.
854
__doc__ = """Create a new versioned directory.
693
855
694
856
This is equivalent to creating the directory and then adding it.
695
857
"""
696
858
697
859
takes_args = ['dir+']
860
takes_options = [
861
Option(
862
'parents',
863
help='No error if existing, make parent directories as needed.',
864
short_name='p'
865
)
866
]
698
867
encoding_type = 'replace'
699
868
700
def run(self, dir_list):
701
for d in dir_list:
702
wt, dd = WorkingTree.open_containing(d)
703
base = os.path.dirname(dd)
704
id = wt.path2id(base)
705
if id != None:
706
os.mkdir(d)
707
wt.add([dd])
708
self.outf.write('added %s\n' % d)
869
@classmethod
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
872
return
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
874
wt.add([relpath])
875
876
@classmethod
877
def add_file_single(cls, wt, relpath):
878
wt.add([relpath])
879
880
def run(self, dir_list, parents=False):
881
if parents:
882
add_file = self.add_file_with_parents
883
else:
884
add_file = self.add_file_single
885
for dir in dir_list:
886
wt, relpath = WorkingTree.open_containing(dir)
887
if parents:
888
try:
889
os.makedirs(dir)
890
except OSError, e:
891
if e.errno != errno.EEXIST:
892
raise
709
893
else:
710
raise errors.NotVersionedError(path=base)
894
os.mkdir(dir)
895
add_file(wt, relpath)
896
if not is_quiet():
897
self.outf.write(gettext('added %s\n') % dir)
711
898
712
899
713
900
class cmd_relpath(Command):
714
"""Show path of a file relative to root"""
901
__doc__ = """Show path of a file relative to root"""
715
902
716
903
takes_args = ['filename']
717
904
hidden = True
726
913
727
914
728
915
class cmd_inventory(Command):
729
"""Show inventory of the current working copy or a revision.
916
__doc__ = """Show inventory of the current working copy or a revision.
730
917
731
918
It is possible to limit the output to a particular entry
732
919
type using the --kind option. For example: --kind file.
749
936
@display_command
750
937
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
751
938
if kind and kind not in ['file', 'directory', 'symlink']:
752
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
939
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
753
940
754
941
revision = _get_one_revision('inventory', revision)
755
work_tree, file_list = tree_files(file_list)
756
work_tree.lock_read()
757
self.add_cleanup(work_tree.unlock)
942
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
943
self.add_cleanup(work_tree.lock_read().unlock)
758
944
if revision is not None:
759
945
tree = revision.as_tree(work_tree.branch)
760
946
761
947
extra_trees = [work_tree]
762
tree.lock_read()
763
self.add_cleanup(tree.unlock)
948
self.add_cleanup(tree.lock_read().unlock)
764
949
else:
765
950
tree = work_tree
766
951
extra_trees = []
767
952
953
self.add_cleanup(tree.lock_read().unlock)
768
954
if file_list is not None:
769
955
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
956
require_versioned=True)
771
957
# find_ids_across_trees may include some paths that don't
772
958
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
959
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
775
960
else:
776
entries = tree.inventory.entries()
961
entries = tree.iter_entries_by_dir()
777
962
778
self.cleanup_now()
779
for path, entry in entries:
963
for path, entry in sorted(entries):
780
964
if kind and kind != entry.kind:
781
965
continue
966
if path == "":
967
continue
782
968
if show_ids:
783
969
self.outf.write('%-50s %s\n' % (path, entry.file_id))
784
970
else:
787
973
788
974
789
975
class cmd_mv(Command):
790
"""Move or rename a file.
976
__doc__ = """Move or rename a file.
791
977
792
978
:Usage:
793
979
bzr mv OLDNAME NEWNAME
820
1006
if auto:
821
1007
return self.run_auto(names_list, after, dry_run)
822
1008
elif dry_run:
823
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
824
1010
if names_list is None:
825
1011
names_list = []
826
1012
if len(names_list) < 2:
827
raise errors.BzrCommandError("missing file argument")
828
tree, rel_names = tree_files(names_list, canonicalize=False)
829
tree.lock_tree_write()
830
self.add_cleanup(tree.unlock)
1013
raise errors.BzrCommandError(gettext("missing file argument"))
1014
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1016
if file_name == '':
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
1018
self.add_cleanup(tree.lock_tree_write().unlock)
831
1019
self._run(tree, names_list, rel_names, after)
832
1020
833
1021
def run_auto(self, names_list, after, dry_run):
834
1022
if names_list is not None and len(names_list) > 1:
835
raise errors.BzrCommandError('Only one path may be specified to'
836
' --auto.')
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
1024
' --auto.'))
837
1025
if after:
838
raise errors.BzrCommandError('--after cannot be specified with'
839
' --auto.')
840
work_tree, file_list = tree_files(names_list, default_branch='.')
841
work_tree.lock_tree_write()
842
self.add_cleanup(work_tree.unlock)
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1027
' --auto.'))
1028
work_tree, file_list = WorkingTree.open_containing_paths(
1029
names_list, default_directory='.')
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
843
1031
rename_map.RenameMap.guess_renames(work_tree, dry_run)
844
1032
845
1033
def _run(self, tree, names_list, rel_names, after):
854
1042
and rel_names[0].lower() == rel_names[1].lower()):
855
1043
into_existing = False
856
1044
else:
857
inv = tree.inventory
858
1045
# 'fix' the case of a potential 'from'
859
1046
from_id = tree.path2id(
860
1047
tree.get_canonical_inventory_path(rel_names[0]))
861
1048
if (not osutils.lexists(names_list[0]) and
862
from_id and inv.get_file_kind(from_id) == "directory"):
1049
from_id and tree.stored_kind(from_id) == "directory"):
863
1050
into_existing = False
864
1051
# move/rename
865
1052
if into_existing:
872
1059
self.outf.write("%s => %s\n" % (src, dest))
873
1060
else:
874
1061
if len(names_list) != 2:
875
raise errors.BzrCommandError('to mv multiple files the'
1062
raise errors.BzrCommandError(gettext('to mv multiple files the'
876
1063
' destination must be a versioned'
877
' directory')
1064
' directory'))
878
1065
879
1066
# for cicp file-systems: the src references an existing inventory
880
1067
# item:
924
1111
925
1112
926
1113
class cmd_pull(Command):
927
"""Turn this branch into a mirror of another branch.
1114
__doc__ = """Turn this branch into a mirror of another branch.
928
1115
929
1116
By default, this command only works on branches that have not diverged.
930
1117
Branches are considered diverged if the destination branch's most recent
939
1126
match the remote one, use pull --overwrite. This will work even if the two
940
1127
branches have diverged.
941
1128
942
If there is no default location set, the first pull will set it. After
943
that, you can omit the location to use the default. To change the
944
default, use --remember. The value will only be saved if the remote
945
location can be accessed.
1129
If there is no default location set, the first pull will set it (use
1130
--no-remember to avoid setting it). After that, you can omit the
1131
location to use the default. To change the default, use --remember. The
1132
value will only be saved if the remote location can be accessed.
1133
1134
The --verbose option will display the revisions pulled using the log_format
1135
configuration option. You can use a different format by overriding it with
1136
-Olog_format=<other_format>.
946
1137
947
1138
Note: The location can be specified either in the form of a branch,
948
1139
or in the form of a path to a file containing a merge directive generated
953
1144
takes_options = ['remember', 'overwrite', 'revision',
954
1145
custom_help('verbose',
955
1146
help='Show logs of pulled revisions.'),
956
Option('directory',
1147
custom_help('directory',
957
1148
help='Branch to pull into, '
958
'rather than the one containing the working directory.',
959
short_name='d',
960
type=unicode,
961
),
1149
'rather than the one containing the working directory.'),
962
1150
Option('local',
963
1151
help="Perform a local pull in a bound "
964
1152
"branch. Local pulls are not applied to "
965
1153
"the master branch."
966
1154
),
1155
Option('show-base',
1156
help="Show base revision text in conflicts.")
967
1157
]
968
1158
takes_args = ['location?']
969
1159
encoding_type = 'replace'
970
1160
971
def run(self, location=None, remember=False, overwrite=False,
1161
def run(self, location=None, remember=None, overwrite=False,
972
1162
revision=None, verbose=False,
973
directory=None, local=False):
1163
directory=None, local=False,
1164
show_base=False):
974
1165
# FIXME: too much stuff is in the command class
975
1166
revision_id = None
976
1167
mergeable = None
979
1170
try:
980
1171
tree_to = WorkingTree.open_containing(directory)[0]
981
1172
branch_to = tree_to.branch
1173
self.add_cleanup(tree_to.lock_write().unlock)
982
1174
except errors.NoWorkingTree:
983
1175
tree_to = None
984
1176
branch_to = Branch.open_containing(directory)[0]
985
1177
self.add_cleanup(branch_to.lock_write().unlock)
1178
1179
if tree_to is None and show_base:
1180
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
1181
986
1182
if local and not branch_to.get_bound_location():
987
1183
raise errors.LocalRequiresBoundBranch()
988
1184
997
1193
stored_loc = branch_to.get_parent()
998
1194
if location is None:
999
1195
if stored_loc is None:
1000
raise errors.BzrCommandError("No pull location known or"
1001
" specified.")
1196
raise errors.BzrCommandError(gettext("No pull location known or"
1197
" specified."))
1002
1198
else:
1003
1199
display_url = urlutils.unescape_for_display(stored_loc,
1004
1200
self.outf.encoding)
1005
1201
if not is_quiet():
1006
self.outf.write("Using saved parent location: %s\n" % display_url)
1202
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1007
1203
location = stored_loc
1008
1204
1009
1205
revision = _get_one_revision('pull', revision)
1010
1206
if mergeable is not None:
1011
1207
if revision is not None:
1012
raise errors.BzrCommandError(
1013
'Cannot use -r with merge directives or bundles')
1208
raise errors.BzrCommandError(gettext(
1209
'Cannot use -r with merge directives or bundles'))
1014
1210
mergeable.install_revisions(branch_to.repository)
1015
1211
base_revision_id, revision_id, verified = \
1016
1212
mergeable.get_merge_request(branch_to.repository)
1018
1214
else:
1019
1215
branch_from = Branch.open(location,
1020
1216
possible_transports=possible_transports)
1021
1022
if branch_to.get_parent() is None or remember:
1217
self.add_cleanup(branch_from.lock_read().unlock)
1218
# Remembers if asked explicitly or no previous location is set
1219
if (remember
1220
or (remember is None and branch_to.get_parent() is None)):
1221
# FIXME: This shouldn't be done before the pull
1222
# succeeds... -- vila 2012-01-02
1023
1223
branch_to.set_parent(branch_from.base)
1024
1224
1025
if branch_from is not branch_to:
1026
branch_from.lock_read()
1027
self.add_cleanup(branch_from.unlock)
1028
1225
if revision is not None:
1029
1226
revision_id = revision.as_revision_id(branch_from)
1030
1227
1031
branch_to.lock_write()
1032
self.add_cleanup(branch_to.unlock)
1033
1228
if tree_to is not None:
1034
1229
view_info = _get_view_info_for_change_reporter(tree_to)
1035
1230
change_reporter = delta._ChangeReporter(
1037
1232
view_info=view_info)
1038
1233
result = tree_to.pull(
1039
1234
branch_from, overwrite, revision_id, change_reporter,
1040
possible_transports=possible_transports, local=local)
1235
local=local, show_base=show_base)
1041
1236
else:
1042
1237
result = branch_to.pull(
1043
1238
branch_from, overwrite, revision_id, local=local)
1047
1242
log.show_branch_change(
1048
1243
branch_to, self.outf, result.old_revno,
1049
1244
result.old_revid)
1245
if getattr(result, 'tag_conflicts', None):
1246
return 1
1247
else:
1248
return 0
1050
1249
1051
1250
1052
1251
class cmd_push(Command):
1053
"""Update a mirror of this branch.
1252
__doc__ = """Update a mirror of this branch.
1054
1253
1055
1254
The target branch will not have its working tree populated because this
1056
1255
is both expensive, and is not supported on remote file systems.
1069
1268
do a merge (see bzr help merge) from the other branch, and commit that.
1070
1269
After that you will be able to do a push without '--overwrite'.
1071
1270
1072
If there is no default push location set, the first push will set it.
1073
After that, you can omit the location to use the default. To change the
1074
default, use --remember. The value will only be saved if the remote
1075
location can be accessed.
1271
If there is no default push location set, the first push will set it (use
1272
--no-remember to avoid setting it). After that, you can omit the
1273
location to use the default. To change the default, use --remember. The
1274
value will only be saved if the remote location can be accessed.
1275
1276
The --verbose option will display the revisions pushed using the log_format
1277
configuration option. You can use a different format by overriding it with
1278
-Olog_format=<other_format>.
1076
1279
"""
1077
1280
1078
1281
_see_also = ['pull', 'update', 'working-trees']
1080
1283
Option('create-prefix',
1081
1284
help='Create the path leading up to the branch '
1082
1285
'if it does not already exist.'),
1083
Option('directory',
1286
custom_help('directory',
1084
1287
help='Branch to push from, '
1085
'rather than the one containing the working directory.',
1086
short_name='d',
1087
type=unicode,
1088
),
1288
'rather than the one containing the working directory.'),
1089
1289
Option('use-existing-dir',
1090
1290
help='By default push will fail if the target'
1091
1291
' directory exists, but does not already'
1102
1302
Option('strict',
1103
1303
help='Refuse to push if there are uncommitted changes in'
1104
1304
' the working tree, --no-strict disables the check.'),
1305
Option('no-tree',
1306
help="Don't populate the working tree, even for protocols"
1307
" that support it."),
1105
1308
]
1106
1309
takes_args = ['location?']
1107
1310
encoding_type = 'replace'
1108
1311
1109
def run(self, location=None, remember=False, overwrite=False,
1312
def run(self, location=None, remember=None, overwrite=False,
1110
1313
create_prefix=False, verbose=False, revision=None,
1111
1314
use_existing_dir=False, directory=None, stacked_on=None,
1112
stacked=False, strict=None):
1315
stacked=False, strict=None, no_tree=False):
1113
1316
from bzrlib.push import _show_push_branch
1114
1317
1115
1318
if directory is None:
1116
1319
directory = '.'
1117
1320
# Get the source branch
1118
1321
(tree, br_from,
1119
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1120
if strict is None:
1121
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1122
if strict is None: strict = True # default value
1322
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1123
1323
# Get the tip's revision_id
1124
1324
revision = _get_one_revision('push', revision)
1125
1325
if revision is not None:
1126
1326
revision_id = revision.in_history(br_from).rev_id
1127
1327
else:
1128
1328
revision_id = None
1129
if strict and tree is not None and revision_id is None:
1130
if (tree.has_changes()):
1131
raise errors.UncommittedChanges(
1132
tree, more='Use --no-strict to force the push.')
1133
if tree.last_revision() != tree.branch.last_revision():
1134
# The tree has lost sync with its branch, there is little
1135
# chance that the user is aware of it but he can still force
1136
# the push with --no-strict
1137
raise errors.OutOfDateTree(
1138
tree, more='Use --no-strict to force the push.')
1139
1329
if tree is not None and revision_id is None:
1330
tree.check_changed_or_out_of_date(
1331
strict, 'push_strict',
1332
more_error='Use --no-strict to force the push.',
1333
more_warning='Uncommitted changes will not be pushed.')
1140
1334
# Get the stacked_on branch, if any
1141
1335
if stacked_on is not None:
1142
1336
stacked_on = urlutils.normalize_url(stacked_on)
1152
1346
# error by the feedback given to them. RBC 20080227.
1153
1347
stacked_on = parent_url
1154
1348
if not stacked_on:
1155
raise errors.BzrCommandError(
1156
"Could not determine branch to refer to.")
1349
raise errors.BzrCommandError(gettext(
1350
"Could not determine branch to refer to."))
1157
1351
1158
1352
# Get the destination location
1159
1353
if location is None:
1160
1354
stored_loc = br_from.get_push_location()
1161
1355
if stored_loc is None:
1162
raise errors.BzrCommandError(
1163
"No push location known or specified.")
1356
parent_loc = br_from.get_parent()
1357
if parent_loc:
1358
raise errors.BzrCommandError(gettext(
1359
"No push location known or specified. To push to the "
1360
"parent branch (at %s), use 'bzr push :parent'." %
1361
urlutils.unescape_for_display(parent_loc,
1362
self.outf.encoding)))
1363
else:
1364
raise errors.BzrCommandError(gettext(
1365
"No push location known or specified."))
1164
1366
else:
1165
1367
display_url = urlutils.unescape_for_display(stored_loc,
1166
1368
self.outf.encoding)
1167
self.outf.write("Using saved push location: %s\n" % display_url)
1369
note(gettext("Using saved push location: %s") % display_url)
1168
1370
location = stored_loc
1169
1371
1170
1372
_show_push_branch(br_from, revision_id, location, self.outf,
1171
1373
verbose=verbose, overwrite=overwrite, remember=remember,
1172
1374
stacked_on=stacked_on, create_prefix=create_prefix,
1173
use_existing_dir=use_existing_dir)
1375
use_existing_dir=use_existing_dir, no_tree=no_tree)
1174
1376
1175
1377
1176
1378
class cmd_branch(Command):
1177
"""Create a new branch that is a copy of an existing branch.
1379
__doc__ = """Create a new branch that is a copy of an existing branch.
1178
1380
1179
1381
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1180
1382
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1185
1387
1186
1388
To retrieve the branch as of a particular revision, supply the --revision
1187
1389
parameter, as in "branch foo/bar -r 5".
1390
1391
The synonyms 'clone' and 'get' for this command are deprecated.
1188
1392
"""
1189
1393
1190
1394
_see_also = ['checkout']
1191
1395
takes_args = ['from_location', 'to_location?']
1192
takes_options = ['revision', Option('hardlink',
1193
help='Hard-link working tree files where possible.'),
1396
takes_options = ['revision',
1397
Option('hardlink', help='Hard-link working tree files where possible.'),
1398
Option('files-from', type=str,
1399
help="Get file contents from this tree."),
1194
1400
Option('no-tree',
1195
1401
help="Create a branch without a working-tree."),
1196
1402
Option('switch',
1214
1420
1215
1421
def run(self, from_location, to_location=None, revision=None,
1216
1422
hardlink=False, stacked=False, standalone=False, no_tree=False,
1217
use_existing_dir=False, switch=False, bind=False):
1423
use_existing_dir=False, switch=False, bind=False,
1424
files_from=None):
1218
1425
from bzrlib import switch as _mod_switch
1219
1426
from bzrlib.tag import _merge_tags_if_possible
1220
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1427
if self.invoked_as in ['get', 'clone']:
1428
ui.ui_factory.show_user_warning(
1429
'deprecated_command',
1430
deprecated_name=self.invoked_as,
1431
recommended_name='branch',
1432
deprecated_in_version='2.4')
1433
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1221
1434
from_location)
1435
if not (hardlink or files_from):
1436
# accelerator_tree is usually slower because you have to read N
1437
# files (no readahead, lots of seeks, etc), but allow the user to
1438
# explicitly request it
1439
accelerator_tree = None
1440
if files_from is not None and files_from != from_location:
1441
accelerator_tree = WorkingTree.open(files_from)
1222
1442
revision = _get_one_revision('branch', revision)
1223
br_from.lock_read()
1224
self.add_cleanup(br_from.unlock)
1443
self.add_cleanup(br_from.lock_read().unlock)
1225
1444
if revision is not None:
1226
1445
revision_id = revision.as_revision_id(br_from)
1227
1446
else:
1230
1449
# RBC 20060209
1231
1450
revision_id = br_from.last_revision()
1232
1451
if to_location is None:
1233
to_location = urlutils.derive_to_location(from_location)
1452
to_location = getattr(br_from, "name", None)
1453
if not to_location:
1454
to_location = urlutils.derive_to_location(from_location)
1234
1455
to_transport = transport.get_transport(to_location)
1235
1456
try:
1236
1457
to_transport.mkdir('.')
1237
1458
except errors.FileExists:
1238
if not use_existing_dir:
1239
raise errors.BzrCommandError('Target directory "%s" '
1240
'already exists.' % to_location)
1459
try:
1460
to_dir = controldir.ControlDir.open_from_transport(
1461
to_transport)
1462
except errors.NotBranchError:
1463
if not use_existing_dir:
1464
raise errors.BzrCommandError(gettext('Target directory "%s" '
1465
'already exists.') % to_location)
1466
else:
1467
to_dir = None
1241
1468
else:
1242
1469
try:
1243
bzrdir.BzrDir.open_from_transport(to_transport)
1470
to_dir.open_branch()
1244
1471
except errors.NotBranchError:
1245
1472
pass
1246
1473
else:
1247
1474
raise errors.AlreadyBranchError(to_location)
1248
1475
except errors.NoSuchFile:
1249
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1476
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1250
1477
% to_location)
1251
try:
1252
# preserve whatever source format we have.
1253
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1254
possible_transports=[to_transport],
1255
accelerator_tree=accelerator_tree,
1256
hardlink=hardlink, stacked=stacked,
1257
force_new_repo=standalone,
1258
create_tree_if_local=not no_tree,
1259
source_branch=br_from)
1260
branch = dir.open_branch()
1261
except errors.NoSuchRevision:
1262
to_transport.delete_tree('.')
1263
msg = "The branch %s has no revision %s." % (from_location,
1264
revision)
1265
raise errors.BzrCommandError(msg)
1478
else:
1479
to_dir = None
1480
if to_dir is None:
1481
try:
1482
# preserve whatever source format we have.
1483
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1484
possible_transports=[to_transport],
1485
accelerator_tree=accelerator_tree,
1486
hardlink=hardlink, stacked=stacked,
1487
force_new_repo=standalone,
1488
create_tree_if_local=not no_tree,
1489
source_branch=br_from)
1490
branch = to_dir.open_branch(
1491
possible_transports=[
1492
br_from.bzrdir.root_transport, to_transport])
1493
except errors.NoSuchRevision:
1494
to_transport.delete_tree('.')
1495
msg = gettext("The branch {0} has no revision {1}.").format(
1496
from_location, revision)
1497
raise errors.BzrCommandError(msg)
1498
else:
1499
try:
1500
to_repo = to_dir.open_repository()
1501
except errors.NoRepositoryPresent:
1502
to_repo = to_dir.create_repository()
1503
to_repo.fetch(br_from.repository, revision_id=revision_id)
1504
branch = br_from.sprout(to_dir, revision_id=revision_id)
1266
1505
_merge_tags_if_possible(br_from, branch)
1267
1506
# If the source branch is stacked, the new branch may
1268
1507
# be stacked whether we asked for that explicitly or not.
1269
1508
# We therefore need a try/except here and not just 'if stacked:'
1270
1509
try:
1271
note('Created new stacked branch referring to %s.' %
1510
note(gettext('Created new stacked branch referring to %s.') %
1272
1511
branch.get_stacked_on_url())
1273
1512
except (errors.NotStacked, errors.UnstackableBranchFormat,
1274
1513
errors.UnstackableRepositoryFormat), e:
1275
note('Branched %d revision(s).' % branch.revno())
1514
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1515
if bind:
1277
1516
# Bind to the parent
1278
1517
parent_branch = Branch.open(from_location)
1279
1518
branch.bind(parent_branch)
1280
note('New branch bound to %s' % from_location)
1519
note(gettext('New branch bound to %s') % from_location)
1281
1520
if switch:
1282
1521
# Switch to the new branch
1283
1522
wt, _ = WorkingTree.open_containing('.')
1284
1523
_mod_switch.switch(wt.bzrdir, branch)
1285
note('Switched to branch: %s',
1524
note(gettext('Switched to branch: %s'),
1286
1525
urlutils.unescape_for_display(branch.base, 'utf-8'))
1287
1526
1288
1527
1528
class cmd_branches(Command):
1529
__doc__ = """List the branches available at the current location.
1530
1531
This command will print the names of all the branches at the current
1532
location.
1533
"""
1534
1535
takes_args = ['location?']
1536
takes_options = [
1537
Option('recursive', short_name='R',
1538
help='Recursively scan for branches rather than '
1539
'just looking in the specified location.')]
1540
1541
def run(self, location=".", recursive=False):
1542
if recursive:
1543
t = transport.get_transport(location)
1544
if not t.listable():
1545
raise errors.BzrCommandError(
1546
"Can't scan this type of location.")
1547
for b in controldir.ControlDir.find_branches(t):
1548
self.outf.write("%s\n" % urlutils.unescape_for_display(
1549
urlutils.relative_url(t.base, b.base),
1550
self.outf.encoding).rstrip("/"))
1551
else:
1552
dir = controldir.ControlDir.open_containing(location)[0]
1553
try:
1554
active_branch = dir.open_branch(name="")
1555
except errors.NotBranchError:
1556
active_branch = None
1557
names = {}
1558
for name, branch in iter_sibling_branches(dir):
1559
if name == "":
1560
continue
1561
active = (active_branch is not None and
1562
active_branch.base == branch.base)
1563
names[name] = active
1564
# Only mention the current branch explicitly if it's not
1565
# one of the colocated branches
1566
if not any(names.values()) and active_branch is not None:
1567
self.outf.write("* %s\n" % gettext("(default)"))
1568
for name in sorted(names.keys()):
1569
active = names[name]
1570
if active:
1571
prefix = "*"
1572
else:
1573
prefix = " "
1574
self.outf.write("%s %s\n" % (
1575
prefix, name.encode(self.outf.encoding)))
1576
1577
1289
1578
class cmd_checkout(Command):
1290
"""Create a new checkout of an existing branch.
1579
__doc__ = """Create a new checkout of an existing branch.
1291
1580
1292
1581
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1293
1582
the branch found in '.'. This is useful if you have removed the working tree
1330
1619
if branch_location is None:
1331
1620
branch_location = osutils.getcwd()
1332
1621
to_location = branch_location
1333
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1622
accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
1334
1623
branch_location)
1624
if not (hardlink or files_from):
1625
# accelerator_tree is usually slower because you have to read N
1626
# files (no readahead, lots of seeks, etc), but allow the user to
1627
# explicitly request it
1628
accelerator_tree = None
1335
1629
revision = _get_one_revision('checkout', revision)
1336
if files_from is not None:
1630
if files_from is not None and files_from != branch_location:
1337
1631
accelerator_tree = WorkingTree.open(files_from)
1338
1632
if revision is not None:
1339
1633
revision_id = revision.as_revision_id(source)
1356
1650
1357
1651
1358
1652
class cmd_renames(Command):
1359
"""Show list of renamed files.
1653
__doc__ = """Show list of renamed files.
1360
1654
"""
1361
1655
# TODO: Option to show renames between two historical versions.
1362
1656
1367
1661
@display_command
1368
1662
def run(self, dir=u'.'):
1369
1663
tree = WorkingTree.open_containing(dir)[0]
1370
tree.lock_read()
1371
self.add_cleanup(tree.unlock)
1372
new_inv = tree.inventory
1664
self.add_cleanup(tree.lock_read().unlock)
1373
1665
old_tree = tree.basis_tree()
1374
old_tree.lock_read()
1375
self.add_cleanup(old_tree.unlock)
1376
old_inv = old_tree.inventory
1666
self.add_cleanup(old_tree.lock_read().unlock)
1377
1667
renames = []
1378
1668
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1379
1669
for f, paths, c, v, p, n, k, e in iterator:
1388
1678
1389
1679
1390
1680
class cmd_update(Command):
1391
"""Update a tree to have the latest code committed to its branch.
1392
1393
This will perform a merge into the working tree, and may generate
1394
conflicts. If you have any local changes, you will still
1395
need to commit them after the update for the update to be complete.
1396
1397
If you want to discard your local changes, you can just do a
1398
'bzr revert' instead of 'bzr commit' after the update.
1399
1400
If the tree's branch is bound to a master branch, it will also update
1681
__doc__ = """Update a working tree to a new revision.
1682
1683
This will perform a merge of the destination revision (the tip of the
1684
branch, or the specified revision) into the working tree, and then make
1685
that revision the basis revision for the working tree.
1686
1687
You can use this to visit an older revision, or to update a working tree
1688
that is out of date from its branch.
1689
1690
If there are any uncommitted changes in the tree, they will be carried
1691
across and remain as uncommitted changes after the update. To discard
1692
these changes, use 'bzr revert'. The uncommitted changes may conflict
1693
with the changes brought in by the change in basis revision.
1694
1695
If the tree's branch is bound to a master branch, bzr will also update
1401
1696
the branch from the master.
1697
1698
You cannot update just a single file or directory, because each Bazaar
1699
working tree has just a single basis revision. If you want to restore a
1700
file that has been removed locally, use 'bzr revert' instead of 'bzr
1701
update'. If you want to restore a file to its state in a previous
1702
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1703
out the old content of that file to a new location.
1704
1705
The 'dir' argument, if given, must be the location of the root of a
1706
working tree to update. By default, the working tree that contains the
1707
current working directory is used.
1402
1708
"""
1403
1709
1404
1710
_see_also = ['pull', 'working-trees', 'status-flags']
1405
1711
takes_args = ['dir?']
1406
takes_options = ['revision']
1712
takes_options = ['revision',
1713
Option('show-base',
1714
help="Show base revision text in conflicts."),
1715
]
1407
1716
aliases = ['up']
1408
1717
1409
def run(self, dir='.', revision=None):
1718
def run(self, dir=None, revision=None, show_base=None):
1410
1719
if revision is not None and len(revision) != 1:
1411
raise errors.BzrCommandError(
1412
"bzr update --revision takes exactly one revision")
1413
tree = WorkingTree.open_containing(dir)[0]
1720
raise errors.BzrCommandError(gettext(
1721
"bzr update --revision takes exactly one revision"))
1722
if dir is None:
1723
tree = WorkingTree.open_containing('.')[0]
1724
else:
1725
tree, relpath = WorkingTree.open_containing(dir)
1726
if relpath:
1727
# See bug 557886.
1728
raise errors.BzrCommandError(gettext(
1729
"bzr update can only update a whole tree, "
1730
"not a file or subdirectory"))
1414
1731
branch = tree.branch
1415
1732
possible_transports = []
1416
1733
master = branch.get_master_branch(
1417
1734
possible_transports=possible_transports)
1418
1735
if master is not None:
1419
tree.lock_write()
1420
1736
branch_location = master.base
1737
tree.lock_write()
1421
1738
else:
1739
branch_location = tree.branch.base
1422
1740
tree.lock_tree_write()
1423
branch_location = tree.branch.base
1424
1741
self.add_cleanup(tree.unlock)
1425
1742
# get rid of the final '/' and be ready for display
1426
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1427
self.outf.encoding)
1743
branch_location = urlutils.unescape_for_display(
1744
branch_location.rstrip('/'),
1745
self.outf.encoding)
1428
1746
existing_pending_merges = tree.get_parent_ids()[1:]
1429
1747
if master is None:
1430
1748
old_tip = None
1438
1756
else:
1439
1757
revision_id = branch.last_revision()
1440
1758
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_revno(revision_id)
1442
note("Tree is up to date at revision %d of branch %s" %
1443
(revno, branch_location))
1759
revno = branch.revision_id_to_dotted_revno(revision_id)
1760
note(gettext("Tree is up to date at revision {0} of branch {1}"
1761
).format('.'.join(map(str, revno)), branch_location))
1444
1762
return 0
1445
1763
view_info = _get_view_info_for_change_reporter(tree)
1446
1764
change_reporter = delta._ChangeReporter(
1451
1769
change_reporter,
1452
1770
possible_transports=possible_transports,
1453
1771
revision=revision_id,
1454
old_tip=old_tip)
1772
old_tip=old_tip,
1773
show_base=show_base)
1455
1774
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1775
raise errors.BzrCommandError(gettext(
1457
1776
"branch has no revision %s\n"
1458
1777
"bzr update --revision only works"
1459
" for a revision in the branch history"
1778
" for a revision in the branch history")
1460
1779
% (e.revision))
1461
revno = tree.branch.revision_id_to_revno(
1780
revno = tree.branch.revision_id_to_dotted_revno(
1462
1781
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %d of branch %s' %
1464
(revno, branch_location))
1465
if tree.get_parent_ids()[1:] != existing_pending_merges:
1466
note('Your local commits will now show as pending merges with '
1467
"'bzr status', and can be committed with 'bzr commit'.")
1782
note(gettext('Updated to revision {0} of branch {1}').format(
1783
'.'.join(map(str, revno)), branch_location))
1784
parent_ids = tree.get_parent_ids()
1785
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1786
note(gettext('Your local commits will now show as pending merges with '
1787
"'bzr status', and can be committed with 'bzr commit'."))
1468
1788
if conflicts != 0:
1469
1789
return 1
1470
1790
else:
1472
1792
1473
1793
1474
1794
class cmd_info(Command):
1475
"""Show information about a working tree, branch or repository.
1795
__doc__ = """Show information about a working tree, branch or repository.
1476
1796
1477
1797
This command will show all known locations and formats associated to the
1478
1798
tree, branch or repository.
1511
1831
else:
1512
1832
noise_level = 0
1513
1833
from bzrlib.info import show_bzrdir_info
1514
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1834
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1515
1835
verbose=noise_level, outfile=self.outf)
1516
1836
1517
1837
1518
1838
class cmd_remove(Command):
1519
"""Remove files or directories.
1839
__doc__ = """Remove files or directories.
1520
1840
1521
This makes bzr stop tracking changes to the specified files. bzr will delete
1522
them if they can easily be recovered using revert. If no options or
1523
parameters are given bzr will scan for files that are being tracked by bzr
1524
but missing in your tree and stop tracking them for you.
1841
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1842
delete them if they can easily be recovered using revert otherwise they
1843
will be backed up (adding an extension of the form .~#~). If no options or
1844
parameters are given Bazaar will scan for files that are being tracked by
1845
Bazaar but missing in your tree and stop tracking them for you.
1525
1846
"""
1526
1847
takes_args = ['file*']
1527
1848
takes_options = ['verbose',
1529
1850
RegistryOption.from_kwargs('file-deletion-strategy',
1530
1851
'The file deletion mode to be used.',
1531
1852
title='Deletion Strategy', value_switches=True, enum_switch=False,
1532
safe='Only delete files if they can be'
1533
' safely recovered (default).',
1853
safe='Backup changed files (default).',
1534
1854
keep='Delete from bzr but leave the working copy.',
1855
no_backup='Don\'t backup changed files.',
1535
1856
force='Delete all the specified files, even if they can not be '
1536
'recovered and even if they are non-empty directories.')]
1857
'recovered and even if they are non-empty directories. '
1858
'(deprecated, use no-backup)')]
1537
1859
aliases = ['rm', 'del']
1538
1860
encoding_type = 'replace'
1539
1861
1540
1862
def run(self, file_list, verbose=False, new=False,
1541
1863
file_deletion_strategy='safe'):
1542
tree, file_list = tree_files(file_list)
1864
if file_deletion_strategy == 'force':
1865
note(gettext("(The --force option is deprecated, rather use --no-backup "
1866
"in future.)"))
1867
file_deletion_strategy = 'no-backup'
1868
1869
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
1870
1544
1871
if file_list is not None:
1545
1872
file_list = [f for f in file_list]
1546
1873
1547
tree.lock_write()
1548
self.add_cleanup(tree.unlock)
1874
self.add_cleanup(tree.lock_write().unlock)
1549
1875
# Heuristics should probably all move into tree.remove_smart or
1550
1876
# some such?
1551
1877
if new:
1553
1879
specific_files=file_list).added
1554
1880
file_list = sorted([f[0] for f in added], reverse=True)
1555
1881
if len(file_list) == 0:
1556
raise errors.BzrCommandError('No matching files.')
1882
raise errors.BzrCommandError(gettext('No matching files.'))
1557
1883
elif file_list is None:
1558
1884
# missing files show up in iter_changes(basis) as
1559
1885
# versioned-with-no-kind.
1566
1892
file_deletion_strategy = 'keep'
1567
1893
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1568
1894
keep_files=file_deletion_strategy=='keep',
1569
force=file_deletion_strategy=='force')
1895
force=(file_deletion_strategy=='no-backup'))
1570
1896
1571
1897
1572
1898
class cmd_file_id(Command):
1573
"""Print file_id of a particular file or directory.
1899
__doc__ = """Print file_id of a particular file or directory.
1574
1900
1575
1901
The file_id is assigned when the file is first added and remains the
1576
1902
same through all revisions where the file exists, even when it is
1592
1918
1593
1919
1594
1920
class cmd_file_path(Command):
1595
"""Print path of file_ids to a file or directory.
1921
__doc__ = """Print path of file_ids to a file or directory.
1596
1922
1597
1923
This prints one line for each directory down to the target,
1598
1924
starting at the branch root.
1614
1940
1615
1941
1616
1942
class cmd_reconcile(Command):
1617
"""Reconcile bzr metadata in a branch.
1943
__doc__ = """Reconcile bzr metadata in a branch.
1618
1944
1619
1945
This can correct data mismatches that may have been caused by
1620
1946
previous ghost operations or bzr upgrades. You should only
1634
1960
1635
1961
_see_also = ['check']
1636
1962
takes_args = ['branch?']
1963
takes_options = [
1964
Option('canonicalize-chks',
1965
help='Make sure CHKs are in canonical form (repairs '
1966
'bug 522637).',
1967
hidden=True),
1968
]
1637
1969
1638
def run(self, branch="."):
1970
def run(self, branch=".", canonicalize_chks=False):
1639
1971
from bzrlib.reconcile import reconcile
1640
dir = bzrdir.BzrDir.open(branch)
1641
reconcile(dir)
1972
dir = controldir.ControlDir.open(branch)
1973
reconcile(dir, canonicalize_chks=canonicalize_chks)
1642
1974
1643
1975
1644
1976
class cmd_revision_history(Command):
1645
"""Display the list of revision ids on a branch."""
1977
__doc__ = """Display the list of revision ids on a branch."""
1646
1978
1647
1979
_see_also = ['log']
1648
1980
takes_args = ['location?']
1652
1984
@display_command
1653
1985
def run(self, location="."):
1654
1986
branch = Branch.open_containing(location)[0]
1655
for revid in branch.revision_history():
1987
self.add_cleanup(branch.lock_read().unlock)
1988
graph = branch.repository.get_graph()
1989
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
1990
[_mod_revision.NULL_REVISION]))
1991
for revid in reversed(history):
1656
1992
self.outf.write(revid)
1657
1993
self.outf.write('\n')
1658
1994
1659
1995
1660
1996
class cmd_ancestry(Command):
1661
"""List all revisions merged into this branch."""
1997
__doc__ = """List all revisions merged into this branch."""
1662
1998
1663
1999
_see_also = ['log', 'revision-history']
1664
2000
takes_args = ['location?']
1676
2012
b = wt.branch
1677
2013
last_revision = wt.last_revision()
1678
2014
1679
revision_ids = b.repository.get_ancestry(last_revision)
1680
revision_ids.pop(0)
1681
for revision_id in revision_ids:
2015
self.add_cleanup(b.repository.lock_read().unlock)
2016
graph = b.repository.get_graph()
2017
revisions = [revid for revid, parents in
2018
graph.iter_ancestry([last_revision])]
2019
for revision_id in reversed(revisions):
2020
if _mod_revision.is_null(revision_id):
2021
continue
1682
2022
self.outf.write(revision_id + '\n')
1683
2023
1684
2024
1685
2025
class cmd_init(Command):
1686
"""Make a directory into a versioned branch.
2026
__doc__ = """Make a directory into a versioned branch.
1687
2027
1688
2028
Use this to create an empty branch, or before importing an
1689
2029
existing project.
1714
2054
RegistryOption('format',
1715
2055
help='Specify a format for this branch. '
1716
2056
'See "help formats".',
1717
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1718
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2057
lazy_registry=('bzrlib.controldir', 'format_registry'),
2058
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1719
2059
value_switches=True,
1720
2060
title="Branch format",
1721
2061
),
1722
2062
Option('append-revisions-only',
1723
2063
help='Never change revnos or the existing log.'
1724
' Append revisions to it only.')
2064
' Append revisions to it only.'),
2065
Option('no-tree',
2066
'Create a branch without a working tree.')
1725
2067
]
1726
2068
def run(self, location=None, format=None, append_revisions_only=False,
1727
create_prefix=False):
2069
create_prefix=False, no_tree=False):
1728
2070
if format is None:
1729
format = bzrdir.format_registry.make_bzrdir('default')
2071
format = controldir.format_registry.make_bzrdir('default')
1730
2072
if location is None:
1731
2073
location = u'.'
1732
2074
1741
2083
to_transport.ensure_base()
1742
2084
except errors.NoSuchFile:
1743
2085
if not create_prefix:
1744
raise errors.BzrCommandError("Parent directory of %s"
2086
raise errors.BzrCommandError(gettext("Parent directory of %s"
1745
2087
" does not exist."
1746
2088
"\nYou may supply --create-prefix to create all"
1747
" leading parent directories."
2089
" leading parent directories.")
1748
2090
% location)
1749
2091
to_transport.create_prefix()
1750
2092
1751
2093
try:
1752
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2094
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1753
2095
except errors.NotBranchError:
1754
2096
# really a NotBzrDir error...
1755
create_branch = bzrdir.BzrDir.create_branch_convenience
2097
create_branch = controldir.ControlDir.create_branch_convenience
2098
if no_tree:
2099
force_new_tree = False
2100
else:
2101
force_new_tree = None
1756
2102
branch = create_branch(to_transport.base, format=format,
1757
possible_transports=[to_transport])
2103
possible_transports=[to_transport],
2104
force_new_tree=force_new_tree)
1758
2105
a_bzrdir = branch.bzrdir
1759
2106
else:
1760
2107
from bzrlib.transport.local import LocalTransport
1764
2111
raise errors.BranchExistsWithoutWorkingTree(location)
1765
2112
raise errors.AlreadyBranchError(location)
1766
2113
branch = a_bzrdir.create_branch()
1767
a_bzrdir.create_workingtree()
2114
if not no_tree and not a_bzrdir.has_workingtree():
2115
a_bzrdir.create_workingtree()
1768
2116
if append_revisions_only:
1769
2117
try:
1770
2118
branch.set_append_revisions_only(True)
1771
2119
except errors.UpgradeRequired:
1772
raise errors.BzrCommandError('This branch format cannot be set'
1773
' to append-revisions-only. Try --default.')
2120
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2121
' to append-revisions-only. Try --default.'))
1774
2122
if not is_quiet():
1775
2123
from bzrlib.info import describe_layout, describe_format
1776
2124
try:
1780
2128
repository = branch.repository
1781
2129
layout = describe_layout(repository, branch, tree).lower()
1782
2130
format = describe_format(a_bzrdir, repository, branch, tree)
1783
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2131
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2132
layout, format))
1784
2133
if repository.is_shared():
1785
2134
#XXX: maybe this can be refactored into transport.path_or_url()
1786
2135
url = repository.bzrdir.root_transport.external_url()
1788
2137
url = urlutils.local_path_from_url(url)
1789
2138
except errors.InvalidURL:
1790
2139
pass
1791
self.outf.write("Using shared repository: %s\n" % url)
2140
self.outf.write(gettext("Using shared repository: %s\n") % url)
1792
2141
1793
2142
1794
2143
class cmd_init_repository(Command):
1795
"""Create a shared repository for branches to share storage space.
2144
__doc__ = """Create a shared repository for branches to share storage space.
1796
2145
1797
2146
New branches created under the repository directory will store their
1798
2147
revisions in the repository, not in the branch directory. For branches
1824
2173
takes_options = [RegistryOption('format',
1825
2174
help='Specify a format for this repository. See'
1826
2175
' "bzr help formats" for details.',
1827
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1828
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2176
lazy_registry=('bzrlib.controldir', 'format_registry'),
2177
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1829
2178
value_switches=True, title='Repository format'),
1830
2179
Option('no-trees',
1831
2180
help='Branches in the repository will default to'
1835
2184
1836
2185
def run(self, location, format=None, no_trees=False):
1837
2186
if format is None:
1838
format = bzrdir.format_registry.make_bzrdir('default')
2187
format = controldir.format_registry.make_bzrdir('default')
1839
2188
1840
2189
if location is None:
1841
2190
location = '.'
1842
2191
1843
2192
to_transport = transport.get_transport(location)
1844
to_transport.ensure_base()
1845
2193
1846
newdir = format.initialize_on_transport(to_transport)
1847
repo = newdir.create_repository(shared=True)
1848
repo.set_make_working_trees(not no_trees)
2194
(repo, newdir, require_stacking, repository_policy) = (
2195
format.initialize_on_transport_ex(to_transport,
2196
create_prefix=True, make_working_trees=not no_trees,
2197
shared_repo=True, force_new_repo=True,
2198
use_existing_dir=True,
2199
repo_format_name=format.repository_format.get_format_string()))
1849
2200
if not is_quiet():
1850
2201
from bzrlib.info import show_bzrdir_info
1851
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2202
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1852
2203
1853
2204
1854
2205
class cmd_diff(Command):
1855
"""Show differences in the working tree, between revisions or branches.
2206
__doc__ = """Show differences in the working tree, between revisions or branches.
1856
2207
1857
2208
If no arguments are given, all changes for the current tree are listed.
1858
2209
If files are given, only the changes in those files are listed.
1864
2215
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1865
2216
produces patches suitable for "patch -p1".
1866
2217
2218
Note that when using the -r argument with a range of revisions, the
2219
differences are computed between the two specified revisions. That
2220
is, the command does not show the changes introduced by the first
2221
revision in the range. This differs from the interpretation of
2222
revision ranges used by "bzr log" which includes the first revision
2223
in the range.
2224
1867
2225
:Exit values:
1868
2226
1 - changed
1869
2227
2 - unrepresentable changes
1887
2245
1888
2246
bzr diff -r1..3 xxx
1889
2247
1890
To see the changes introduced in revision X::
2248
The changes introduced by revision 2 (equivalent to -r1..2)::
2249
2250
bzr diff -c2
2251
2252
To see the changes introduced by revision X::
1891
2253
1892
2254
bzr diff -cX
1893
2255
1897
2259
1898
2260
bzr diff -r<chosen_parent>..X
1899
2261
1900
The changes introduced by revision 2 (equivalent to -r1..2)::
2262
The changes between the current revision and the previous revision
2263
(equivalent to -c-1 and -r-2..-1)
1901
2264
1902
bzr diff -c2
2265
bzr diff -r-2..
1903
2266
1904
2267
Show just the differences for file NEWS::
1905
2268
1920
2283
Same as 'bzr diff' but prefix paths with old/ and new/::
1921
2284
1922
2285
bzr diff --prefix old/:new/
2286
2287
Show the differences using a custom diff program with options::
2288
2289
bzr diff --using /usr/bin/diff --diff-options -wu
1923
2290
"""
1924
2291
_see_also = ['status']
1925
2292
takes_args = ['file*']
1944
2311
help='Use this command to compare files.',
1945
2312
type=unicode,
1946
2313
),
2314
RegistryOption('format',
2315
short_name='F',
2316
help='Diff format to use.',
2317
lazy_registry=('bzrlib.diff', 'format_registry'),
2318
title='Diff format'),
1947
2319
]
1948
2320
aliases = ['di', 'dif']
1949
2321
encoding_type = 'exact'
1950
2322
1951
2323
@display_command
1952
2324
def run(self, revision=None, file_list=None, diff_options=None,
1953
prefix=None, old=None, new=None, using=None):
1954
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
2325
prefix=None, old=None, new=None, using=None, format=None):
2326
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2327
show_diff_trees)
1955
2328
1956
2329
if (prefix is None) or (prefix == '0'):
1957
2330
# diff -p0 format
1963
2336
elif ':' in prefix:
1964
2337
old_label, new_label = prefix.split(":")
1965
2338
else:
1966
raise errors.BzrCommandError(
2339
raise errors.BzrCommandError(gettext(
1967
2340
'--prefix expects two values separated by a colon'
1968
' (eg "old/:new/")')
2341
' (eg "old/:new/")'))
1969
2342
1970
2343
if revision and len(revision) > 2:
1971
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1972
' one or two revision specifiers')
2344
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2345
' one or two revision specifiers'))
2346
2347
if using is not None and format is not None:
2348
raise errors.BzrCommandError(gettext(
2349
'{0} and {1} are mutually exclusive').format(
2350
'--using', '--format'))
1973
2351
1974
2352
(old_tree, new_tree,
1975
2353
old_branch, new_branch,
1976
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1977
file_list, revision, old, new, apply_view=True)
2354
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2355
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2356
# GNU diff on Windows uses ANSI encoding for filenames
2357
path_encoding = osutils.get_diff_header_encoding()
1978
2358
return show_diff_trees(old_tree, new_tree, sys.stdout,
1979
2359
specific_files=specific_files,
1980
2360
external_diff_options=diff_options,
1981
2361
old_label=old_label, new_label=new_label,
1982
extra_trees=extra_trees, using=using)
2362
extra_trees=extra_trees,
2363
path_encoding=path_encoding,
2364
using=using,
2365
format_cls=format)
1983
2366
1984
2367
1985
2368
class cmd_deleted(Command):
1986
"""List files deleted in the working tree.
2369
__doc__ = """List files deleted in the working tree.
1987
2370
"""
1988
2371
# TODO: Show files deleted since a previous revision, or
1989
2372
# between two revisions.
1992
2375
# level of effort but possibly much less IO. (Or possibly not,
1993
2376
# if the directories are very large...)
1994
2377
_see_also = ['status', 'ls']
1995
takes_options = ['show-ids']
2378
takes_options = ['directory', 'show-ids']
1996
2379
1997
2380
@display_command
1998
def run(self, show_ids=False):
1999
tree = WorkingTree.open_containing(u'.')[0]
2000
tree.lock_read()
2001
self.add_cleanup(tree.unlock)
2381
def run(self, show_ids=False, directory=u'.'):
2382
tree = WorkingTree.open_containing(directory)[0]
2383
self.add_cleanup(tree.lock_read().unlock)
2002
2384
old = tree.basis_tree()
2003
old.lock_read()
2004
self.add_cleanup(old.unlock)
2005
for path, ie in old.inventory.iter_entries():
2385
self.add_cleanup(old.lock_read().unlock)
2386
for path, ie in old.iter_entries_by_dir():
2006
2387
if not tree.has_id(ie.file_id):
2007
2388
self.outf.write(path)
2008
2389
if show_ids:
2012
2393
2013
2394
2014
2395
class cmd_modified(Command):
2015
"""List files modified in working tree.
2396
__doc__ = """List files modified in working tree.
2016
2397
"""
2017
2398
2018
2399
hidden = True
2019
2400
_see_also = ['status', 'ls']
2020
takes_options = [
2021
Option('null',
2022
help='Write an ascii NUL (\\0) separator '
2023
'between files rather than a newline.')
2024
]
2401
takes_options = ['directory', 'null']
2025
2402
2026
2403
@display_command
2027
def run(self, null=False):
2028
tree = WorkingTree.open_containing(u'.')[0]
2404
def run(self, null=False, directory=u'.'):
2405
tree = WorkingTree.open_containing(directory)[0]
2406
self.add_cleanup(tree.lock_read().unlock)
2029
2407
td = tree.changes_from(tree.basis_tree())
2408
self.cleanup_now()
2030
2409
for path, id, kind, text_modified, meta_modified in td.modified:
2031
2410
if null:
2032
2411
self.outf.write(path + '\0')
2035
2414
2036
2415
2037
2416
class cmd_added(Command):
2038
"""List files added in working tree.
2417
__doc__ = """List files added in working tree.
2039
2418
"""
2040
2419
2041
2420
hidden = True
2042
2421
_see_also = ['status', 'ls']
2043
takes_options = [
2044
Option('null',
2045
help='Write an ascii NUL (\\0) separator '
2046
'between files rather than a newline.')
2047
]
2422
takes_options = ['directory', 'null']
2048
2423
2049
2424
@display_command
2050
def run(self, null=False):
2051
wt = WorkingTree.open_containing(u'.')[0]
2052
wt.lock_read()
2053
self.add_cleanup(wt.unlock)
2425
def run(self, null=False, directory=u'.'):
2426
wt = WorkingTree.open_containing(directory)[0]
2427
self.add_cleanup(wt.lock_read().unlock)
2054
2428
basis = wt.basis_tree()
2055
basis.lock_read()
2056
self.add_cleanup(basis.unlock)
2057
basis_inv = basis.inventory
2058
inv = wt.inventory
2059
for file_id in inv:
2060
if file_id in basis_inv:
2061
continue
2062
if inv.is_root(file_id) and len(basis_inv) == 0:
2063
continue
2064
path = inv.id2path(file_id)
2065
if not os.access(osutils.abspath(path), os.F_OK):
2429
self.add_cleanup(basis.lock_read().unlock)
2430
root_id = wt.get_root_id()
2431
for file_id in wt.all_file_ids():
2432
if basis.has_id(file_id):
2433
continue
2434
if root_id == file_id:
2435
continue
2436
path = wt.id2path(file_id)
2437
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2066
2438
continue
2067
2439
if null:
2068
2440
self.outf.write(path + '\0')
2071
2443
2072
2444
2073
2445
class cmd_root(Command):
2074
"""Show the tree root directory.
2446
__doc__ = """Show the tree root directory.
2075
2447
2076
2448
The root is the nearest enclosing directory with a .bzr control
2077
2449
directory."""
2088
2460
try:
2089
2461
return int(limitstring)
2090
2462
except ValueError:
2091
msg = "The limit argument must be an integer."
2463
msg = gettext("The limit argument must be an integer.")
2092
2464
raise errors.BzrCommandError(msg)
2093
2465
2094
2466
2096
2468
try:
2097
2469
return int(s)
2098
2470
except ValueError:
2099
msg = "The levels argument must be an integer."
2471
msg = gettext("The levels argument must be an integer.")
2100
2472
raise errors.BzrCommandError(msg)
2101
2473
2102
2474
2103
2475
class cmd_log(Command):
2104
"""Show historical log for a branch or subset of a branch.
2476
__doc__ = """Show historical log for a branch or subset of a branch.
2105
2477
2106
2478
log is bzr's default tool for exploring the history of a branch.
2107
2479
The branch to use is taken from the first parameter. If no parameters
2212
2584
2213
2585
:Other filtering:
2214
2586
2215
The --message option can be used for finding revisions that match a
2216
regular expression in a commit message.
2587
The --match option can be used for finding revisions that match a
2588
regular expression in a commit message, committer, author or bug.
2589
Specifying the option several times will match any of the supplied
2590
expressions. --match-author, --match-bugs, --match-committer and
2591
--match-message can be used to only match a specific field.
2217
2592
2218
2593
:Tips & tricks:
2219
2594
2268
2643
help='Show just the specified revision.'
2269
2644
' See also "help revisionspec".'),
2270
2645
'log-format',
2646
RegistryOption('authors',
2647
'What names to list as authors - first, all or committer.',
2648
title='Authors',
2649
lazy_registry=('bzrlib.log', 'author_list_registry'),
2650
),
2271
2651
Option('levels',
2272
2652
short_name='n',
2273
2653
help='Number of levels to display - 0 for all, 1 for flat.',
2274
2654
argname='N',
2275
2655
type=_parse_levels),
2276
2656
Option('message',
2277
short_name='m',
2278
2657
help='Show revisions whose message matches this '
2279
2658
'regular expression.',
2280
type=str),
2659
type=str,
2660
hidden=True),
2281
2661
Option('limit',
2282
2662
short_name='l',
2283
2663
help='Limit the output to the first N revisions.',
2286
2666
Option('show-diff',
2287
2667
short_name='p',
2288
2668
help='Show changes made in each revision as a patch.'),
2289
Option('include-merges',
2669
Option('include-merged',
2290
2670
help='Show merged revisions like --levels 0 does.'),
2671
Option('include-merges', hidden=True,
2672
help='Historical alias for --include-merged.'),
2673
Option('omit-merges',
2674
help='Do not report commits with more than one parent.'),
2675
Option('exclude-common-ancestry',
2676
help='Display only the revisions that are not part'
2677
' of both ancestries (require -rX..Y).'
2678
),
2679
Option('signatures',
2680
help='Show digital signature validity.'),
2681
ListOption('match',
2682
short_name='m',
2683
help='Show revisions whose properties match this '
2684
'expression.',
2685
type=str),
2686
ListOption('match-message',
2687
help='Show revisions whose message matches this '
2688
'expression.',
2689
type=str),
2690
ListOption('match-committer',
2691
help='Show revisions whose committer matches this '
2692
'expression.',
2693
type=str),
2694
ListOption('match-author',
2695
help='Show revisions whose authors match this '
2696
'expression.',
2697
type=str),
2698
ListOption('match-bugs',
2699
help='Show revisions whose bugs match this '
2700
'expression.',
2701
type=str)
2291
2702
]
2292
2703
encoding_type = 'replace'
2293
2704
2303
2714
message=None,
2304
2715
limit=None,
2305
2716
show_diff=False,
2306
include_merges=False):
2717
include_merged=None,
2718
authors=None,
2719
exclude_common_ancestry=False,
2720
signatures=False,
2721
match=None,
2722
match_message=None,
2723
match_committer=None,
2724
match_author=None,
2725
match_bugs=None,
2726
omit_merges=False,
2727
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2728
):
2307
2729
from bzrlib.log import (
2308
2730
Logger,
2309
2731
make_log_request_dict,
2310
2732
_get_info_for_log_files,
2311
2733
)
2312
2734
direction = (forward and 'forward') or 'reverse'
2313
if include_merges:
2735
if symbol_versioning.deprecated_passed(include_merges):
2736
ui.ui_factory.show_user_warning(
2737
'deprecated_command_option',
2738
deprecated_name='--include-merges',
2739
recommended_name='--include-merged',
2740
deprecated_in_version='2.5',
2741
command=self.invoked_as)
2742
if include_merged is None:
2743
include_merged = include_merges
2744
else:
2745
raise errors.BzrCommandError(gettext(
2746
'{0} and {1} are mutually exclusive').format(
2747
'--include-merges', '--include-merged'))
2748
if include_merged is None:
2749
include_merged = False
2750
if (exclude_common_ancestry
2751
and (revision is None or len(revision) != 2)):
2752
raise errors.BzrCommandError(gettext(
2753
'--exclude-common-ancestry requires -r with two revisions'))
2754
if include_merged:
2314
2755
if levels is None:
2315
2756
levels = 0
2316
2757
else:
2317
raise errors.BzrCommandError(
2318
'--levels and --include-merges are mutually exclusive')
2758
raise errors.BzrCommandError(gettext(
2759
'{0} and {1} are mutually exclusive').format(
2760
'--levels', '--include-merged'))
2319
2761
2320
2762
if change is not None:
2321
2763
if len(change) > 1:
2322
2764
raise errors.RangeInChangeOption()
2323
2765
if revision is not None:
2324
raise errors.BzrCommandError(
2325
'--revision and --change are mutually exclusive')
2766
raise errors.BzrCommandError(gettext(
2767
'{0} and {1} are mutually exclusive').format(
2768
'--revision', '--change'))
2326
2769
else:
2327
2770
revision = change
2328
2771
2331
2774
if file_list:
2332
2775
# find the file ids to log and check for directory filtering
2333
2776
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2334
revision, file_list)
2335
self.add_cleanup(b.unlock)
2777
revision, file_list, self.add_cleanup)
2336
2778
for relpath, file_id, kind in file_info_list:
2337
2779
if file_id is None:
2338
raise errors.BzrCommandError(
2339
"Path unknown at end or start of revision range: %s" %
2780
raise errors.BzrCommandError(gettext(
2781
"Path unknown at end or start of revision range: %s") %
2340
2782
relpath)
2341
2783
# If the relpath is the top of the tree, we log everything
2342
2784
if relpath == '':
2354
2796
location = revision[0].get_branch()
2355
2797
else:
2356
2798
location = '.'
2357
dir, relpath = bzrdir.BzrDir.open_containing(location)
2799
dir, relpath = controldir.ControlDir.open_containing(location)
2358
2800
b = dir.open_branch()
2359
b.lock_read()
2360
self.add_cleanup(b.unlock)
2801
self.add_cleanup(b.lock_read().unlock)
2361
2802
rev1, rev2 = _get_revision_range(revision, b, self.name())
2362
2803
2804
if b.get_config_stack().get('validate_signatures_in_log'):
2805
signatures = True
2806
2807
if signatures:
2808
if not gpg.GPGStrategy.verify_signatures_available():
2809
raise errors.GpgmeNotInstalled(None)
2810
2363
2811
# Decide on the type of delta & diff filtering to use
2364
2812
# TODO: add an --all-files option to make this configurable & consistent
2365
2813
if not verbose:
2383
2831
show_timezone=timezone,
2384
2832
delta_format=get_verbosity_level(),
2385
2833
levels=levels,
2386
show_advice=levels is None)
2834
show_advice=levels is None,
2835
author_list_handler=authors)
2387
2836
2388
2837
# Choose the algorithm for doing the logging. It's annoying
2389
2838
# having multiple code paths like this but necessary until
2401
2850
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2402
2851
or delta_type or partial_history)
2403
2852
2853
match_dict = {}
2854
if match:
2855
match_dict[''] = match
2856
if match_message:
2857
match_dict['message'] = match_message
2858
if match_committer:
2859
match_dict['committer'] = match_committer
2860
if match_author:
2861
match_dict['author'] = match_author
2862
if match_bugs:
2863
match_dict['bugs'] = match_bugs
2864
2404
2865
# Build the LogRequest and execute it
2405
2866
if len(file_ids) == 0:
2406
2867
file_ids = None
2408
2869
direction=direction, specific_fileids=file_ids,
2409
2870
start_revision=rev1, end_revision=rev2, limit=limit,
2410
2871
message_search=message, delta_type=delta_type,
2411
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2872
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2873
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2874
signature=signatures, omit_merges=omit_merges,
2875
)
2412
2876
Logger(b, rqst).show(lf)
2413
2877
2414
2878
2430
2894
# b is taken from revision[0].get_branch(), and
2431
2895
# show_log will use its revision_history. Having
2432
2896
# different branches will lead to weird behaviors.
2433
raise errors.BzrCommandError(
2897
raise errors.BzrCommandError(gettext(
2434
2898
"bzr %s doesn't accept two revisions in different"
2435
" branches." % command_name)
2436
rev1 = start_spec.in_history(branch)
2899
" branches.") % command_name)
2900
if start_spec.spec is None:
2901
# Avoid loading all the history.
2902
rev1 = RevisionInfo(branch, None, None)
2903
else:
2904
rev1 = start_spec.in_history(branch)
2437
2905
# Avoid loading all of history when we know a missing
2438
2906
# end of range means the last revision ...
2439
2907
if end_spec.spec is None:
2442
2910
else:
2443
2911
rev2 = end_spec.in_history(branch)
2444
2912
else:
2445
raise errors.BzrCommandError(
2446
'bzr %s --revision takes one or two values.' % command_name)
2913
raise errors.BzrCommandError(gettext(
2914
'bzr %s --revision takes one or two values.') % command_name)
2447
2915
return rev1, rev2
2448
2916
2449
2917
2468
2936
2469
2937
2470
2938
class cmd_touching_revisions(Command):
2471
"""Return revision-ids which affected a particular file.
2939
__doc__ = """Return revision-ids which affected a particular file.
2472
2940
2473
2941
A more user-friendly interface is "bzr log FILE".
2474
2942
"""
2481
2949
tree, relpath = WorkingTree.open_containing(filename)
2482
2950
file_id = tree.path2id(relpath)
2483
2951
b = tree.branch
2484
b.lock_read()
2485
self.add_cleanup(b.unlock)
2952
self.add_cleanup(b.lock_read().unlock)
2486
2953
touching_revs = log.find_touching_revisions(b, file_id)
2487
2954
for revno, revision_id, what in touching_revs:
2488
2955
self.outf.write("%6d %s\n" % (revno, what))
2489
2956
2490
2957
2491
2958
class cmd_ls(Command):
2492
"""List files in a tree.
2959
__doc__ = """List files in a tree.
2493
2960
"""
2494
2961
2495
2962
_see_also = ['status', 'cat']
2501
2968
help='Recurse into subdirectories.'),
2502
2969
Option('from-root',
2503
2970
help='Print paths relative to the root of the branch.'),
2504
Option('unknown', help='Print unknown files.'),
2971
Option('unknown', short_name='u',
2972
help='Print unknown files.'),
2505
2973
Option('versioned', help='Print versioned files.',
2506
2974
short_name='V'),
2507
Option('ignored', help='Print ignored files.'),
2508
Option('null',
2509
help='Write an ascii NUL (\\0) separator '
2510
'between files rather than a newline.'),
2511
Option('kind',
2975
Option('ignored', short_name='i',
2976
help='Print ignored files.'),
2977
Option('kind', short_name='k',
2512
2978
help='List entries of a particular kind: file, directory, symlink.',
2513
2979
type=unicode),
2980
'null',
2514
2981
'show-ids',
2982
'directory',
2515
2983
]
2516
2984
@display_command
2517
2985
def run(self, revision=None, verbose=False,
2518
2986
recursive=False, from_root=False,
2519
2987
unknown=False, versioned=False, ignored=False,
2520
null=False, kind=None, show_ids=False, path=None):
2988
null=False, kind=None, show_ids=False, path=None, directory=None):
2521
2989
2522
2990
if kind and kind not in ('file', 'directory', 'symlink'):
2523
raise errors.BzrCommandError('invalid kind specified')
2991
raise errors.BzrCommandError(gettext('invalid kind specified'))
2524
2992
2525
2993
if verbose and null:
2526
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2994
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2527
2995
all = not (unknown or versioned or ignored)
2528
2996
2529
2997
selection = {'I':ignored, '?':unknown, 'V':versioned}
2532
3000
fs_path = '.'
2533
3001
else:
2534
3002
if from_root:
2535
raise errors.BzrCommandError('cannot specify both --from-root'
2536
' and PATH')
3003
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
3004
' and PATH'))
2537
3005
fs_path = path
2538
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2539
fs_path)
3006
tree, branch, relpath = \
3007
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2540
3008
2541
3009
# Calculate the prefix to use
2542
3010
prefix = None
2555
3023
if view_files:
2556
3024
apply_view = True
2557
3025
view_str = views.view_display_str(view_files)
2558
note("Ignoring files outside view. View is %s" % view_str)
3026
note(gettext("Ignoring files outside view. View is %s") % view_str)
2559
3027
2560
tree.lock_read()
2561
self.add_cleanup(tree.unlock)
3028
self.add_cleanup(tree.lock_read().unlock)
2562
3029
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2563
3030
from_dir=relpath, recursive=recursive):
2564
3031
# Apply additional masking
2606
3073
2607
3074
2608
3075
class cmd_unknowns(Command):
2609
"""List unknown files.
3076
__doc__ = """List unknown files.
2610
3077
"""
2611
3078
2612
3079
hidden = True
2613
3080
_see_also = ['ls']
3081
takes_options = ['directory']
2614
3082
2615
3083
@display_command
2616
def run(self):
2617
for f in WorkingTree.open_containing(u'.')[0].unknowns():
3084
def run(self, directory=u'.'):
3085
for f in WorkingTree.open_containing(directory)[0].unknowns():
2618
3086
self.outf.write(osutils.quotefn(f) + '\n')
2619
3087
2620
3088
2621
3089
class cmd_ignore(Command):
2622
"""Ignore specified files or patterns.
3090
__doc__ = """Ignore specified files or patterns.
2623
3091
2624
3092
See ``bzr help patterns`` for details on the syntax of patterns.
2625
3093
2634
3102
using this command or directly by using an editor, be sure to commit
2635
3103
it.
2636
3104
3105
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
3106
the global ignore file can be found in the application data directory as
3107
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
3108
Global ignores are not touched by this command. The global ignore file
3109
can be edited directly using an editor.
3110
2637
3111
Patterns prefixed with '!' are exceptions to ignore patterns and take
2638
3112
precedence over regular ignores. Such exceptions are used to specify
2639
3113
files that should be versioned which would otherwise be ignored.
2641
3115
Patterns prefixed with '!!' act as regular ignore patterns, but have
2642
3116
precedence over the '!' exception patterns.
2643
3117
2644
Note: ignore patterns containing shell wildcards must be quoted from
2645
the shell on Unix.
3118
:Notes:
3119
3120
* Ignore patterns containing shell wildcards must be quoted from
3121
the shell on Unix.
3122
3123
* Ignore patterns starting with "#" act as comments in the ignore file.
3124
To ignore patterns that begin with that character, use the "RE:" prefix.
2646
3125
2647
3126
:Examples:
2648
3127
Ignore the top level Makefile::
2657
3136
2658
3137
bzr ignore "!special.class"
2659
3138
3139
Ignore files whose name begins with the "#" character::
3140
3141
bzr ignore "RE:^#"
3142
2660
3143
Ignore .o files under the lib directory::
2661
3144
2662
3145
bzr ignore "lib/**/*.o"
2670
3153
bzr ignore "RE:(?!debian/).*"
2671
3154
2672
3155
Ignore everything except the "local" toplevel directory,
2673
but always ignore "*~" autosave files, even under local/::
3156
but always ignore autosave files ending in ~, even under local/::
2674
3157
2675
3158
bzr ignore "*"
2676
3159
bzr ignore "!./local"
2679
3162
2680
3163
_see_also = ['status', 'ignored', 'patterns']
2681
3164
takes_args = ['name_pattern*']
2682
takes_options = [
2683
Option('old-default-rules',
2684
help='Write out the ignore rules bzr < 0.9 always used.')
3165
takes_options = ['directory',
3166
Option('default-rules',
3167
help='Display the default ignore rules that bzr uses.')
2685
3168
]
2686
3169
2687
def run(self, name_pattern_list=None, old_default_rules=None):
3170
def run(self, name_pattern_list=None, default_rules=None,
3171
directory=u'.'):
2688
3172
from bzrlib import ignores
2689
if old_default_rules is not None:
2690
# dump the rules and exit
2691
for pattern in ignores.OLD_DEFAULTS:
3173
if default_rules is not None:
3174
# dump the default rules and exit
3175
for pattern in ignores.USER_DEFAULTS:
2692
3176
self.outf.write("%s\n" % pattern)
2693
3177
return
2694
3178
if not name_pattern_list:
2695
raise errors.BzrCommandError("ignore requires at least one "
2696
"NAME_PATTERN or --old-default-rules")
3179
raise errors.BzrCommandError(gettext("ignore requires at least one "
3180
"NAME_PATTERN or --default-rules."))
2697
3181
name_pattern_list = [globbing.normalize_pattern(p)
2698
3182
for p in name_pattern_list]
3183
bad_patterns = ''
3184
bad_patterns_count = 0
3185
for p in name_pattern_list:
3186
if not globbing.Globster.is_pattern_valid(p):
3187
bad_patterns_count += 1
3188
bad_patterns += ('\n %s' % p)
3189
if bad_patterns:
3190
msg = (ngettext('Invalid ignore pattern found. %s',
3191
'Invalid ignore patterns found. %s',
3192
bad_patterns_count) % bad_patterns)
3193
ui.ui_factory.show_error(msg)
3194
raise errors.InvalidPattern('')
2699
3195
for name_pattern in name_pattern_list:
2700
3196
if (name_pattern[0] == '/' or
2701
3197
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2702
raise errors.BzrCommandError(
2703
"NAME_PATTERN should not be an absolute path")
2704
tree, relpath = WorkingTree.open_containing(u'.')
3198
raise errors.BzrCommandError(gettext(
3199
"NAME_PATTERN should not be an absolute path"))
3200
tree, relpath = WorkingTree.open_containing(directory)
2705
3201
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2706
3202
ignored = globbing.Globster(name_pattern_list)
2707
3203
matches = []
2708
tree.lock_read()
3204
self.add_cleanup(tree.lock_read().unlock)
2709
3205
for entry in tree.list_files():
2710
3206
id = entry[3]
2711
3207
if id is not None:
2712
3208
filename = entry[0]
2713
3209
if ignored.match(filename):
2714
3210
matches.append(filename)
2715
tree.unlock()
2716
3211
if len(matches) > 0:
2717
self.outf.write("Warning: the following files are version controlled and"
2718
" match your ignore pattern:\n%s"
3212
self.outf.write(gettext("Warning: the following files are version "
3213
"controlled and match your ignore pattern:\n%s"
2719
3214
"\nThese files will continue to be version controlled"
2720
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3215
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2721
3216
2722
3217
2723
3218
class cmd_ignored(Command):
2724
"""List ignored files and the patterns that matched them.
3219
__doc__ = """List ignored files and the patterns that matched them.
2725
3220
2726
3221
List all the ignored files and the ignore pattern that caused the file to
2727
3222
be ignored.
2733
3228
2734
3229
encoding_type = 'replace'
2735
3230
_see_also = ['ignore', 'ls']
3231
takes_options = ['directory']
2736
3232
2737
3233
@display_command
2738
def run(self):
2739
tree = WorkingTree.open_containing(u'.')[0]
2740
tree.lock_read()
2741
self.add_cleanup(tree.unlock)
3234
def run(self, directory=u'.'):
3235
tree = WorkingTree.open_containing(directory)[0]
3236
self.add_cleanup(tree.lock_read().unlock)
2742
3237
for path, file_class, kind, file_id, entry in tree.list_files():
2743
3238
if file_class != 'I':
2744
3239
continue
2748
3243
2749
3244
2750
3245
class cmd_lookup_revision(Command):
2751
"""Lookup the revision-id from a revision-number
3246
__doc__ = """Lookup the revision-id from a revision-number
2752
3247
2753
3248
:Examples:
2754
3249
bzr lookup-revision 33
2755
3250
"""
2756
3251
hidden = True
2757
3252
takes_args = ['revno']
3253
takes_options = ['directory']
2758
3254
2759
3255
@display_command
2760
def run(self, revno):
3256
def run(self, revno, directory=u'.'):
2761
3257
try:
2762
3258
revno = int(revno)
2763
3259
except ValueError:
2764
raise errors.BzrCommandError("not a valid revision-number: %r"
3260
raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
2765
3261
% revno)
2766
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
3262
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2767
3263
self.outf.write("%s\n" % revid)
2768
3264
2769
3265
2770
3266
class cmd_export(Command):
2771
"""Export current or past revision to a destination directory or archive.
3267
__doc__ = """Export current or past revision to a destination directory or archive.
2772
3268
2773
3269
If no revision is specified this exports the last committed revision.
2774
3270
2795
3291
zip .zip
2796
3292
================= =========================
2797
3293
"""
3294
encoding = 'exact'
2798
3295
takes_args = ['dest', 'branch_or_subdir?']
2799
takes_options = [
3296
takes_options = ['directory',
2800
3297
Option('format',
2801
3298
help="Type of file to export to.",
2802
3299
type=unicode),
2806
3303
Option('root',
2807
3304
type=str,
2808
3305
help="Name of the root directory inside the exported file."),
3306
Option('per-file-timestamps',
3307
help='Set modification time of files to that of the last '
3308
'revision in which it was changed.'),
3309
Option('uncommitted',
3310
help='Export the working tree contents rather than that of the '
3311
'last revision.'),
2809
3312
]
2810
3313
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2811
root=None, filters=False):
3314
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3315
directory=u'.'):
2812
3316
from bzrlib.export import export
2813
3317
2814
3318
if branch_or_subdir is None:
2815
tree = WorkingTree.open_containing(u'.')[0]
2816
b = tree.branch
2817
subdir = None
3319
branch_or_subdir = directory
3320
3321
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3322
branch_or_subdir)
3323
if tree is not None:
3324
self.add_cleanup(tree.lock_read().unlock)
3325
3326
if uncommitted:
3327
if tree is None:
3328
raise errors.BzrCommandError(
3329
gettext("--uncommitted requires a working tree"))
3330
export_tree = tree
2818
3331
else:
2819
b, subdir = Branch.open_containing(branch_or_subdir)
2820
tree = None
2821
2822
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3332
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2823
3333
try:
2824
export(rev_tree, dest, format, root, subdir, filtered=filters)
3334
export(export_tree, dest, format, root, subdir, filtered=filters,
3335
per_file_timestamps=per_file_timestamps)
2825
3336
except errors.NoSuchExportFormat, e:
2826
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3337
raise errors.BzrCommandError(
3338
gettext('Unsupported export format: %s') % e.format)
2827
3339
2828
3340
2829
3341
class cmd_cat(Command):
2830
"""Write the contents of a file as of a given revision to standard output.
3342
__doc__ = """Write the contents of a file as of a given revision to standard output.
2831
3343
2832
3344
If no revision is nominated, the last revision is used.
2833
3345
2836
3348
"""
2837
3349
2838
3350
_see_also = ['ls']
2839
takes_options = [
3351
takes_options = ['directory',
2840
3352
Option('name-from-revision', help='The path name in the old tree.'),
2841
3353
Option('filters', help='Apply content filters to display the '
2842
3354
'convenience form.'),
2847
3359
2848
3360
@display_command
2849
3361
def run(self, filename, revision=None, name_from_revision=False,
2850
filters=False):
3362
filters=False, directory=None):
2851
3363
if revision is not None and len(revision) != 1:
2852
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2853
" one revision specifier")
3364
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3365
" one revision specifier"))
2854
3366
tree, branch, relpath = \
2855
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2856
branch.lock_read()
2857
self.add_cleanup(branch.unlock)
3367
_open_directory_or_containing_tree_or_branch(filename, directory)
3368
self.add_cleanup(branch.lock_read().unlock)
2858
3369
return self._run(tree, branch, relpath, filename, revision,
2859
3370
name_from_revision, filters)
2860
3371
2863
3374
if tree is None:
2864
3375
tree = b.basis_tree()
2865
3376
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2866
rev_tree.lock_read()
2867
self.add_cleanup(rev_tree.unlock)
3377
self.add_cleanup(rev_tree.lock_read().unlock)
2868
3378
2869
3379
old_file_id = rev_tree.path2id(relpath)
2870
3380
3381
# TODO: Split out this code to something that generically finds the
3382
# best id for a path across one or more trees; it's like
3383
# find_ids_across_trees but restricted to find just one. -- mbp
3384
# 20110705.
2871
3385
if name_from_revision:
2872
3386
# Try in revision if requested
2873
3387
if old_file_id is None:
2874
raise errors.BzrCommandError(
2875
"%r is not present in revision %s" % (
3388
raise errors.BzrCommandError(gettext(
3389
"{0!r} is not present in revision {1}").format(
2876
3390
filename, rev_tree.get_revision_id()))
2877
3391
else:
2878
content = rev_tree.get_file_text(old_file_id)
3392
actual_file_id = old_file_id
2879
3393
else:
2880
3394
cur_file_id = tree.path2id(relpath)
2881
found = False
2882
if cur_file_id is not None:
2883
# Then try with the actual file id
2884
try:
2885
content = rev_tree.get_file_text(cur_file_id)
2886
found = True
2887
except errors.NoSuchId:
2888
# The actual file id didn't exist at that time
2889
pass
2890
if not found and old_file_id is not None:
2891
# Finally try with the old file id
2892
content = rev_tree.get_file_text(old_file_id)
2893
found = True
2894
if not found:
2895
# Can't be found anywhere
2896
raise errors.BzrCommandError(
2897
"%r is not present in revision %s" % (
3395
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3396
actual_file_id = cur_file_id
3397
elif old_file_id is not None:
3398
actual_file_id = old_file_id
3399
else:
3400
raise errors.BzrCommandError(gettext(
3401
"{0!r} is not present in revision {1}").format(
2898
3402
filename, rev_tree.get_revision_id()))
2899
3403
if filtered:
2900
from bzrlib.filters import (
2901
ContentFilterContext,
2902
filtered_output_bytes,
2903
)
2904
filters = rev_tree._content_filter_stack(relpath)
2905
chunks = content.splitlines(True)
2906
content = filtered_output_bytes(chunks, filters,
2907
ContentFilterContext(relpath, rev_tree))
2908
self.cleanup_now()
2909
self.outf.writelines(content)
3404
from bzrlib.filter_tree import ContentFilterTree
3405
filter_tree = ContentFilterTree(rev_tree,
3406
rev_tree._content_filter_stack)
3407
content = filter_tree.get_file_text(actual_file_id)
2910
3408
else:
2911
self.cleanup_now()
2912
self.outf.write(content)
3409
content = rev_tree.get_file_text(actual_file_id)
3410
self.cleanup_now()
3411
self.outf.write(content)
2913
3412
2914
3413
2915
3414
class cmd_local_time_offset(Command):
2916
"""Show the offset in seconds from GMT to local time."""
3415
__doc__ = """Show the offset in seconds from GMT to local time."""
2917
3416
hidden = True
2918
3417
@display_command
2919
3418
def run(self):
2922
3421
2923
3422
2924
3423
class cmd_commit(Command):
2925
"""Commit changes into a new revision.
3424
__doc__ = """Commit changes into a new revision.
2926
3425
2927
3426
An explanatory message needs to be given for each commit. This is
2928
3427
often done by using the --message option (getting the message from the
2976
3475
to trigger updates to external systems like bug trackers. The --fixes
2977
3476
option can be used to record the association between a revision and
2978
3477
one or more bugs. See ``bzr help bugs`` for details.
2979
2980
A selective commit may fail in some cases where the committed
2981
tree would be invalid. Consider::
2982
2983
bzr init foo
2984
mkdir foo/bar
2985
bzr add foo/bar
2986
bzr commit foo -m "committing foo"
2987
bzr mv foo/bar foo/baz
2988
mkdir foo/bar
2989
bzr add foo/bar
2990
bzr commit foo/bar -m "committing bar but not baz"
2991
2992
In the example above, the last commit will fail by design. This gives
2993
the user the opportunity to decide whether they want to commit the
2994
rename at the same time, separately first, or not at all. (As a general
2995
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2996
3478
"""
2997
# TODO: Run hooks on tree to-be-committed, and after commit.
2998
2999
# TODO: Strict commit that fails if there are deleted files.
3000
# (what does "deleted files" mean ??)
3001
3002
# TODO: Give better message for -s, --summary, used by tla people
3003
3004
# XXX: verbose currently does nothing
3005
3479
3006
3480
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3007
3481
takes_args = ['selected*']
3036
3510
"the master branch until a normal commit "
3037
3511
"is performed."
3038
3512
),
3039
Option('show-diff',
3513
Option('show-diff', short_name='p',
3040
3514
help='When no message is supplied, show the diff along'
3041
3515
' with the status summary in the message editor.'),
3516
Option('lossy',
3517
help='When committing to a foreign version control '
3518
'system do not push data that can not be natively '
3519
'represented.'),
3042
3520
]
3043
3521
aliases = ['ci', 'checkin']
3044
3522
3045
3523
def _iter_bug_fix_urls(self, fixes, branch):
3524
default_bugtracker = None
3046
3525
# Configure the properties for bug fixing attributes.
3047
3526
for fixed_bug in fixes:
3048
3527
tokens = fixed_bug.split(':')
3049
if len(tokens) != 2:
3050
raise errors.BzrCommandError(
3528
if len(tokens) == 1:
3529
if default_bugtracker is None:
3530
branch_config = branch.get_config_stack()
3531
default_bugtracker = branch_config.get(
3532
"bugtracker")
3533
if default_bugtracker is None:
3534
raise errors.BzrCommandError(gettext(
3535
"No tracker specified for bug %s. Use the form "
3536
"'tracker:id' or specify a default bug tracker "
3537
"using the `bugtracker` option.\nSee "
3538
"\"bzr help bugs\" for more information on this "
3539
"feature. Commit refused.") % fixed_bug)
3540
tag = default_bugtracker
3541
bug_id = tokens[0]
3542
elif len(tokens) != 2:
3543
raise errors.BzrCommandError(gettext(
3051
3544
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3052
3545
"See \"bzr help bugs\" for more information on this "
3053
"feature.\nCommit refused." % fixed_bug)
3054
tag, bug_id = tokens
3546
"feature.\nCommit refused.") % fixed_bug)
3547
else:
3548
tag, bug_id = tokens
3055
3549
try:
3056
3550
yield bugtracker.get_bug_url(tag, branch, bug_id)
3057
3551
except errors.UnknownBugTrackerAbbreviation:
3058
raise errors.BzrCommandError(
3059
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3552
raise errors.BzrCommandError(gettext(
3553
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3060
3554
except errors.MalformedBugIdentifier, e:
3061
raise errors.BzrCommandError(
3062
"%s\nCommit refused." % (str(e),))
3555
raise errors.BzrCommandError(gettext(
3556
"%s\nCommit refused.") % (str(e),))
3063
3557
3064
3558
def run(self, message=None, file=None, verbose=False, selected_list=None,
3065
3559
unchanged=False, strict=False, local=False, fixes=None,
3066
author=None, show_diff=False, exclude=None, commit_time=None):
3560
author=None, show_diff=False, exclude=None, commit_time=None,
3561
lossy=False):
3067
3562
from bzrlib.errors import (
3068
3563
PointlessCommit,
3069
3564
ConflictsInTree,
3072
3567
from bzrlib.msgeditor import (
3073
3568
edit_commit_message_encoded,
3074
3569
generate_commit_message_template,
3075
make_commit_message_template_encoded
3570
make_commit_message_template_encoded,
3571
set_commit_message,
3076
3572
)
3077
3573
3078
3574
commit_stamp = offset = None
3080
3576
try:
3081
3577
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3082
3578
except ValueError, e:
3083
raise errors.BzrCommandError(
3084
"Could not parse --commit-time: " + str(e))
3085
3086
# TODO: Need a blackbox test for invoking the external editor; may be
3087
# slightly problematic to run this cross-platform.
3088
3089
# TODO: do more checks that the commit will succeed before
3090
# spending the user's valuable time typing a commit message.
3579
raise errors.BzrCommandError(gettext(
3580
"Could not parse --commit-time: " + str(e)))
3091
3581
3092
3582
properties = {}
3093
3583
3094
tree, selected_list = tree_files(selected_list)
3584
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3095
3585
if selected_list == ['']:
3096
3586
# workaround - commit of root of tree should be exactly the same
3097
3587
# as just default commit in that tree, and succeed even though
3122
3612
'(use --file "%(f)s" to take commit message from that file)'
3123
3613
% { 'f': message })
3124
3614
ui.ui_factory.show_warning(warning_msg)
3615
if '\r' in message:
3616
message = message.replace('\r\n', '\n')
3617
message = message.replace('\r', '\n')
3618
if file:
3619
raise errors.BzrCommandError(gettext(
3620
"please specify either --message or --file"))
3125
3621
3126
3622
def get_message(commit_obj):
3127
3623
"""Callback to get commit message"""
3128
my_message = message
3129
if my_message is not None and '\r' in my_message:
3130
my_message = my_message.replace('\r\n', '\n')
3131
my_message = my_message.replace('\r', '\n')
3132
if my_message is None and not file:
3133
t = make_commit_message_template_encoded(tree,
3624
if file:
3625
f = open(file)
3626
try:
3627
my_message = f.read().decode(osutils.get_user_encoding())
3628
finally:
3629
f.close()
3630
elif message is not None:
3631
my_message = message
3632
else:
3633
# No message supplied: make one up.
3634
# text is the status of the tree
3635
text = make_commit_message_template_encoded(tree,
3134
3636
selected_list, diff=show_diff,
3135
3637
output_encoding=osutils.get_user_encoding())
3136
start_message = generate_commit_message_template(commit_obj)
3137
my_message = edit_commit_message_encoded(t,
3138
start_message=start_message)
3139
if my_message is None:
3140
raise errors.BzrCommandError("please specify a commit"
3141
" message with either --message or --file")
3142
elif my_message and file:
3143
raise errors.BzrCommandError(
3144
"please specify either --message or --file")
3145
if file:
3146
my_message = codecs.open(file, 'rt',
3147
osutils.get_user_encoding()).read()
3148
if my_message == "":
3149
raise errors.BzrCommandError("empty commit message specified")
3638
# start_message is the template generated from hooks
3639
# XXX: Warning - looks like hooks return unicode,
3640
# make_commit_message_template_encoded returns user encoding.
3641
# We probably want to be using edit_commit_message instead to
3642
# avoid this.
3643
my_message = set_commit_message(commit_obj)
3644
if my_message is None:
3645
start_message = generate_commit_message_template(commit_obj)
3646
my_message = edit_commit_message_encoded(text,
3647
start_message=start_message)
3648
if my_message is None:
3649
raise errors.BzrCommandError(gettext("please specify a commit"
3650
" message with either --message or --file"))
3651
if my_message == "":
3652
raise errors.BzrCommandError(gettext("Empty commit message specified."
3653
" Please specify a commit message with either"
3654
" --message or --file or leave a blank message"
3655
" with --message \"\"."))
3150
3656
return my_message
3151
3657
3152
3658
# The API permits a commit with a filter of [] to mean 'select nothing'
3160
3666
reporter=None, verbose=verbose, revprops=properties,
3161
3667
authors=author, timestamp=commit_stamp,
3162
3668
timezone=offset,
3163
exclude=safe_relpath_files(tree, exclude))
3669
exclude=tree.safe_relpath_files(exclude),
3670
lossy=lossy)
3164
3671
except PointlessCommit:
3165
# FIXME: This should really happen before the file is read in;
3166
# perhaps prepare the commit; get the message; then actually commit
3167
raise errors.BzrCommandError("No changes to commit."
3168
" Use --unchanged to commit anyhow.")
3672
raise errors.BzrCommandError(gettext("No changes to commit."
3673
" Please 'bzr add' the files you want to commit, or use"
3674
" --unchanged to force an empty commit."))
3169
3675
except ConflictsInTree:
3170
raise errors.BzrCommandError('Conflicts detected in working '
3676
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3171
3677
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3172
' resolve.')
3678
' resolve.'))
3173
3679
except StrictCommitFailed:
3174
raise errors.BzrCommandError("Commit refused because there are"
3175
" unknown files in the working tree.")
3680
raise errors.BzrCommandError(gettext("Commit refused because there are"
3681
" unknown files in the working tree."))
3176
3682
except errors.BoundBranchOutOfDate, e:
3177
e.extra_help = ("\n"
3683
e.extra_help = (gettext("\n"
3178
3684
'To commit to master branch, run update and then commit.\n'
3179
3685
'You can also pass --local to commit to continue working '
3180
'disconnected.')
3686
'disconnected.'))
3181
3687
raise
3182
3688
3183
3689
3184
3690
class cmd_check(Command):
3185
"""Validate working tree structure, branch consistency and repository history.
3691
__doc__ = """Validate working tree structure, branch consistency and repository history.
3186
3692
3187
3693
This command checks various invariants about branch and repository storage
3188
3694
to detect data corruption or bzr bugs.
3252
3758
3253
3759
3254
3760
class cmd_upgrade(Command):
3255
"""Upgrade branch storage to current format.
3256
3257
The check command or bzr developers may sometimes advise you to run
3258
this command. When the default format has changed you may also be warned
3259
during other operations to upgrade.
3761
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3762
3763
When the default format has changed after a major new release of
3764
Bazaar, you may be informed during certain operations that you
3765
should upgrade. Upgrading to a newer format may improve performance
3766
or make new features available. It may however limit interoperability
3767
with older repositories or with older versions of Bazaar.
3768
3769
If you wish to upgrade to a particular format rather than the
3770
current default, that can be specified using the --format option.
3771
As a consequence, you can use the upgrade command this way to
3772
"downgrade" to an earlier format, though some conversions are
3773
a one way process (e.g. changing from the 1.x default to the
3774
2.x default) so downgrading is not always possible.
3775
3776
A backup.bzr.~#~ directory is created at the start of the conversion
3777
process (where # is a number). By default, this is left there on
3778
completion. If the conversion fails, delete the new .bzr directory
3779
and rename this one back in its place. Use the --clean option to ask
3780
for the backup.bzr directory to be removed on successful conversion.
3781
Alternatively, you can delete it by hand if everything looks good
3782
afterwards.
3783
3784
If the location given is a shared repository, dependent branches
3785
are also converted provided the repository converts successfully.
3786
If the conversion of a branch fails, remaining branches are still
3787
tried.
3788
3789
For more information on upgrades, see the Bazaar Upgrade Guide,
3790
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3260
3791
"""
3261
3792
3262
_see_also = ['check']
3793
_see_also = ['check', 'reconcile', 'formats']
3263
3794
takes_args = ['url?']
3264
3795
takes_options = [
3265
RegistryOption('format',
3266
help='Upgrade to a specific format. See "bzr help'
3267
' formats" for details.',
3268
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3269
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3270
value_switches=True, title='Branch format'),
3271
]
3796
RegistryOption('format',
3797
help='Upgrade to a specific format. See "bzr help'
3798
' formats" for details.',
3799
lazy_registry=('bzrlib.controldir', 'format_registry'),
3800
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3801
value_switches=True, title='Branch format'),
3802
Option('clean',
3803
help='Remove the backup.bzr directory if successful.'),
3804
Option('dry-run',
3805
help="Show what would be done, but don't actually do anything."),
3806
]
3272
3807
3273
def run(self, url='.', format=None):
3808
def run(self, url='.', format=None, clean=False, dry_run=False):
3274
3809
from bzrlib.upgrade import upgrade
3275
upgrade(url, format)
3810
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3811
if exceptions:
3812
if len(exceptions) == 1:
3813
# Compatibility with historical behavior
3814
raise exceptions[0]
3815
else:
3816
return 3
3276
3817
3277
3818
3278
3819
class cmd_whoami(Command):
3279
"""Show or set bzr user id.
3820
__doc__ = """Show or set bzr user id.
3280
3821
3281
3822
:Examples:
3282
3823
Show the email of the current user::
3287
3828
3288
3829
bzr whoami "Frank Chu <fchu@example.com>"
3289
3830
"""
3290
takes_options = [ Option('email',
3831
takes_options = [ 'directory',
3832
Option('email',
3291
3833
help='Display email address only.'),
3292
3834
Option('branch',
3293
3835
help='Set identity for the current branch instead of '
3297
3839
encoding_type = 'replace'
3298
3840
3299
3841
@display_command
3300
def run(self, email=False, branch=False, name=None):
3842
def run(self, email=False, branch=False, name=None, directory=None):
3301
3843
if name is None:
3302
# use branch if we're inside one; otherwise global config
3303
try:
3304
c = Branch.open_containing('.')[0].get_config()
3305
except errors.NotBranchError:
3306
c = config.GlobalConfig()
3844
if directory is None:
3845
# use branch if we're inside one; otherwise global config
3846
try:
3847
c = Branch.open_containing(u'.')[0].get_config_stack()
3848
except errors.NotBranchError:
3849
c = _mod_config.GlobalStack()
3850
else:
3851
c = Branch.open(directory).get_config_stack()
3852
identity = c.get('email')
3307
3853
if email:
3308
self.outf.write(c.user_email() + '\n')
3854
self.outf.write(_mod_config.extract_email_address(identity)
3855
+ '\n')
3309
3856
else:
3310
self.outf.write(c.username() + '\n')
3857
self.outf.write(identity + '\n')
3311
3858
return
3312
3859
3860
if email:
3861
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3862
"identity"))
3863
3313
3864
# display a warning if an email address isn't included in the given name.
3314
3865
try:
3315
config.extract_email_address(name)
3866
_mod_config.extract_email_address(name)
3316
3867
except errors.NoEmailInUsername, e:
3317
3868
warning('"%s" does not seem to contain an email address. '
3318
3869
'This is allowed, but not recommended.', name)
3319
3870
3320
3871
# use global config unless --branch given
3321
3872
if branch:
3322
c = Branch.open_containing('.')[0].get_config()
3873
if directory is None:
3874
c = Branch.open_containing(u'.')[0].get_config_stack()
3875
else:
3876
b = Branch.open(directory)
3877
self.add_cleanup(b.lock_write().unlock)
3878
c = b.get_config_stack()
3323
3879
else:
3324
c = config.GlobalConfig()
3325
c.set_user_option('email', name)
3880
c = _mod_config.GlobalStack()
3881
c.set('email', name)
3326
3882
3327
3883
3328
3884
class cmd_nick(Command):
3329
"""Print or set the branch nickname.
3885
__doc__ = """Print or set the branch nickname.
3330
3886
3331
If unset, the tree root directory name is used as the nickname.
3332
To print the current nickname, execute with no argument.
3887
If unset, the colocated branch name is used for colocated branches, and
3888
the branch directory name is used for other branches. To print the
3889
current nickname, execute with no argument.
3333
3890
3334
3891
Bound branches use the nickname of its master branch unless it is set
3335
3892
locally.
3337
3894
3338
3895
_see_also = ['info']
3339
3896
takes_args = ['nickname?']
3340
def run(self, nickname=None):
3341
branch = Branch.open_containing(u'.')[0]
3897
takes_options = ['directory']
3898
def run(self, nickname=None, directory=u'.'):
3899
branch = Branch.open_containing(directory)[0]
3342
3900
if nickname is None:
3343
3901
self.printme(branch)
3344
3902
else:
3350
3908
3351
3909
3352
3910
class cmd_alias(Command):
3353
"""Set/unset and display aliases.
3911
__doc__ = """Set/unset and display aliases.
3354
3912
3355
3913
:Examples:
3356
3914
Show the current aliases::
3389
3947
3390
3948
def remove_alias(self, alias_name):
3391
3949
if alias_name is None:
3392
raise errors.BzrCommandError(
3393
'bzr alias --remove expects an alias to remove.')
3950
raise errors.BzrCommandError(gettext(
3951
'bzr alias --remove expects an alias to remove.'))
3394
3952
# If alias is not found, print something like:
3395
3953
# unalias: foo: not found
3396
c = config.GlobalConfig()
3954
c = _mod_config.GlobalConfig()
3397
3955
c.unset_alias(alias_name)
3398
3956
3399
3957
@display_command
3400
3958
def print_aliases(self):
3401
3959
"""Print out the defined aliases in a similar format to bash."""
3402
aliases = config.GlobalConfig().get_aliases()
3960
aliases = _mod_config.GlobalConfig().get_aliases()
3403
3961
for key, value in sorted(aliases.iteritems()):
3404
3962
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3405
3963
3415
3973
3416
3974
def set_alias(self, alias_name, alias_command):
3417
3975
"""Save the alias in the global config."""
3418
c = config.GlobalConfig()
3976
c = _mod_config.GlobalConfig()
3419
3977
c.set_alias(alias_name, alias_command)
3420
3978
3421
3979
3422
3980
class cmd_selftest(Command):
3423
"""Run internal test suite.
3981
__doc__ = """Run internal test suite.
3424
3982
3425
3983
If arguments are given, they are regular expressions that say which tests
3426
3984
should run. Tests matching any expression are run, and other tests are
3456
4014
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3457
4015
into a pdb postmortem session.
3458
4016
4017
The --coverage=DIRNAME global option produces a report with covered code
4018
indicated.
4019
3459
4020
:Examples:
3460
4021
Run only tests relating to 'ignore'::
3461
4022
3472
4033
if typestring == "sftp":
3473
4034
from bzrlib.tests import stub_sftp
3474
4035
return stub_sftp.SFTPAbsoluteServer
3475
if typestring == "memory":
4036
elif typestring == "memory":
3476
4037
from bzrlib.tests import test_server
3477
4038
return memory.MemoryServer
3478
if typestring == "fakenfs":
4039
elif typestring == "fakenfs":
3479
4040
from bzrlib.tests import test_server
3480
4041
return test_server.FakeNFSServer
3481
4042
msg = "No known transport type %s. Supported types are: sftp\n" %\
3494
4055
'throughout the test suite.',
3495
4056
type=get_transport_type),
3496
4057
Option('benchmark',
3497
help='Run the benchmarks rather than selftests.'),
4058
help='Run the benchmarks rather than selftests.',
4059
hidden=True),
3498
4060
Option('lsprof-timed',
3499
4061
help='Generate lsprof output for benchmarked'
3500
4062
' sections of code.'),
3501
4063
Option('lsprof-tests',
3502
4064
help='Generate lsprof output for each test.'),
3503
Option('cache-dir', type=str,
3504
help='Cache intermediate benchmark output in this '
3505
'directory.'),
3506
4065
Option('first',
3507
4066
help='Run all tests, but run specified tests first.',
3508
4067
short_name='f',
3517
4076
Option('randomize', type=str, argname="SEED",
3518
4077
help='Randomize the order of tests using the given'
3519
4078
' seed or "now" for the current time.'),
3520
Option('exclude', type=str, argname="PATTERN",
3521
short_name='x',
3522
help='Exclude tests that match this regular'
3523
' expression.'),
4079
ListOption('exclude', type=str, argname="PATTERN",
4080
short_name='x',
4081
help='Exclude tests that match this regular'
4082
' expression.'),
3524
4083
Option('subunit',
3525
4084
help='Output test progress via subunit.'),
3526
4085
Option('strict', help='Fail on missing dependencies or '
3533
4092
param_name='starting_with', short_name='s',
3534
4093
help=
3535
4094
'Load only the tests starting with TESTID.'),
4095
Option('sync',
4096
help="By default we disable fsync and fdatasync"
4097
" while running the test suite.")
3536
4098
]
3537
4099
encoding_type = 'replace'
3538
4100
3542
4104
3543
4105
def run(self, testspecs_list=None, verbose=False, one=False,
3544
4106
transport=None, benchmark=None,
3545
lsprof_timed=None, cache_dir=None,
4107
lsprof_timed=None,
3546
4108
first=False, list_only=False,
3547
4109
randomize=None, exclude=None, strict=False,
3548
4110
load_list=None, debugflag=None, starting_with=None, subunit=False,
3549
parallel=None, lsprof_tests=False):
3550
from bzrlib.tests import selftest
3551
import bzrlib.benchmarks as benchmarks
3552
from bzrlib.benchmarks import tree_creator
3553
3554
# Make deprecation warnings visible, unless -Werror is set
3555
symbol_versioning.activate_deprecation_warnings(override=False)
3556
3557
if cache_dir is not None:
3558
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4111
parallel=None, lsprof_tests=False,
4112
sync=False):
4113
4114
# During selftest, disallow proxying, as it can cause severe
4115
# performance penalties and is only needed for thread
4116
# safety. The selftest command is assumed to not use threads
4117
# too heavily. The call should be as early as possible, as
4118
# error reporting for past duplicate imports won't have useful
4119
# backtraces.
4120
lazy_import.disallow_proxying()
4121
4122
from bzrlib import tests
4123
3559
4124
if testspecs_list is not None:
3560
4125
pattern = '|'.join(testspecs_list)
3561
4126
else:
3564
4129
try:
3565
4130
from bzrlib.tests import SubUnitBzrRunner
3566
4131
except ImportError:
3567
raise errors.BzrCommandError("subunit not available. subunit "
3568
"needs to be installed to use --subunit.")
4132
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4133
"needs to be installed to use --subunit."))
3569
4134
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4135
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4136
# stdout, which would corrupt the subunit stream.
4137
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4138
# following code can be deleted when it's sufficiently deployed
4139
# -- vila/mgz 20100514
4140
if (sys.platform == "win32"
4141
and getattr(sys.stdout, 'fileno', None) is not None):
4142
import msvcrt
4143
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3570
4144
if parallel:
3571
4145
self.additional_selftest_args.setdefault(
3572
4146
'suite_decorators', []).append(parallel)
3573
4147
if benchmark:
3574
test_suite_factory = benchmarks.test_suite
3575
# Unless user explicitly asks for quiet, be verbose in benchmarks
3576
verbose = not is_quiet()
3577
# TODO: should possibly lock the history file...
3578
benchfile = open(".perf_history", "at", buffering=1)
3579
self.add_cleanup(benchfile.close)
4148
raise errors.BzrCommandError(gettext(
4149
"--benchmark is no longer supported from bzr 2.2; "
4150
"use bzr-usertest instead"))
4151
test_suite_factory = None
4152
if not exclude:
4153
exclude_pattern = None
3580
4154
else:
3581
test_suite_factory = None
3582
benchfile = None
4155
exclude_pattern = '(' + '|'.join(exclude) + ')'
4156
if not sync:
4157
self._disable_fsync()
3583
4158
selftest_kwargs = {"verbose": verbose,
3584
4159
"pattern": pattern,
3585
4160
"stop_on_failure": one,
3587
4162
"test_suite_factory": test_suite_factory,
3588
4163
"lsprof_timed": lsprof_timed,
3589
4164
"lsprof_tests": lsprof_tests,
3590
"bench_history": benchfile,
3591
4165
"matching_tests_first": first,
3592
4166
"list_only": list_only,
3593
4167
"random_seed": randomize,
3594
"exclude_pattern": exclude,
4168
"exclude_pattern": exclude_pattern,
3595
4169
"strict": strict,
3596
4170
"load_list": load_list,
3597
4171
"debug_flags": debugflag,
3598
4172
"starting_with": starting_with
3599
4173
}
3600
4174
selftest_kwargs.update(self.additional_selftest_args)
3601
result = selftest(**selftest_kwargs)
4175
4176
# Make deprecation warnings visible, unless -Werror is set
4177
cleanup = symbol_versioning.activate_deprecation_warnings(
4178
override=False)
4179
try:
4180
result = tests.selftest(**selftest_kwargs)
4181
finally:
4182
cleanup()
3602
4183
return int(not result)
3603
4184
4185
def _disable_fsync(self):
4186
"""Change the 'os' functionality to not synchronize."""
4187
self._orig_fsync = getattr(os, 'fsync', None)
4188
if self._orig_fsync is not None:
4189
os.fsync = lambda filedes: None
4190
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4191
if self._orig_fdatasync is not None:
4192
os.fdatasync = lambda filedes: None
4193
3604
4194
3605
4195
class cmd_version(Command):
3606
"""Show version of bzr."""
4196
__doc__ = """Show version of bzr."""
3607
4197
3608
4198
encoding_type = 'replace'
3609
4199
takes_options = [
3620
4210
3621
4211
3622
4212
class cmd_rocks(Command):
3623
"""Statement of optimism."""
4213
__doc__ = """Statement of optimism."""
3624
4214
3625
4215
hidden = True
3626
4216
3627
4217
@display_command
3628
4218
def run(self):
3629
self.outf.write("It sure does!\n")
4219
self.outf.write(gettext("It sure does!\n"))
3630
4220
3631
4221
3632
4222
class cmd_find_merge_base(Command):
3633
"""Find and print a base revision for merging two branches."""
4223
__doc__ = """Find and print a base revision for merging two branches."""
3634
4224
# TODO: Options to specify revisions on either side, as if
3635
4225
# merging only part of the history.
3636
4226
takes_args = ['branch', 'other']
3642
4232
3643
4233
branch1 = Branch.open_containing(branch)[0]
3644
4234
branch2 = Branch.open_containing(other)[0]
3645
branch1.lock_read()
3646
self.add_cleanup(branch1.unlock)
3647
branch2.lock_read()
3648
self.add_cleanup(branch2.unlock)
4235
self.add_cleanup(branch1.lock_read().unlock)
4236
self.add_cleanup(branch2.lock_read().unlock)
3649
4237
last1 = ensure_null(branch1.last_revision())
3650
4238
last2 = ensure_null(branch2.last_revision())
3651
4239
3652
4240
graph = branch1.repository.get_graph(branch2.repository)
3653
4241
base_rev_id = graph.find_unique_lca(last1, last2)
3654
4242
3655
self.outf.write('merge base is revision %s\n' % base_rev_id)
4243
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3656
4244
3657
4245
3658
4246
class cmd_merge(Command):
3659
"""Perform a three-way merge.
4247
__doc__ = """Perform a three-way merge.
3660
4248
3661
4249
The source of the merge can be specified either in the form of a branch,
3662
4250
or in the form of a path to a file containing a merge directive generated
3663
4251
with bzr send. If neither is specified, the default is the upstream branch
3664
or the branch most recently merged using --remember.
3665
3666
When merging a branch, by default the tip will be merged. To pick a different
3667
revision, pass --revision. If you specify two values, the first will be used as
3668
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3669
available revisions, like this is commonly referred to as "cherrypicking".
3670
3671
Revision numbers are always relative to the branch being merged.
3672
3673
By default, bzr will try to merge in all new work from the other
3674
branch, automatically determining an appropriate base. If this
3675
fails, you may need to give an explicit base.
4252
or the branch most recently merged using --remember. The source of the
4253
merge may also be specified in the form of a path to a file in another
4254
branch: in this case, only the modifications to that file are merged into
4255
the current working tree.
4256
4257
When merging from a branch, by default bzr will try to merge in all new
4258
work from the other branch, automatically determining an appropriate base
4259
revision. If this fails, you may need to give an explicit base.
4260
4261
To pick a different ending revision, pass "--revision OTHER". bzr will
4262
try to merge in all new work up to and including revision OTHER.
4263
4264
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4265
through OTHER, excluding BASE but including OTHER, will be merged. If this
4266
causes some revisions to be skipped, i.e. if the destination branch does
4267
not already contain revision BASE, such a merge is commonly referred to as
4268
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4269
cherrypicks. The changes look like a normal commit, and the history of the
4270
changes from the other branch is not stored in the commit.
4271
4272
Revision numbers are always relative to the source branch.
3676
4273
3677
4274
Merge will do its best to combine the changes in two branches, but there
3678
4275
are some kinds of problems only a human can fix. When it encounters those,
3679
4276
it will mark a conflict. A conflict means that you need to fix something,
3680
before you should commit.
4277
before you can commit.
3681
4278
3682
4279
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3683
4280
3684
If there is no default branch set, the first merge will set it. After
3685
that, you can omit the branch to use the default. To change the
3686
default, use --remember. The value will only be saved if the remote
3687
location can be accessed.
4281
If there is no default branch set, the first merge will set it (use
4282
--no-remember to avoid setting it). After that, you can omit the branch
4283
to use the default. To change the default, use --remember. The value will
4284
only be saved if the remote location can be accessed.
3688
4285
3689
4286
The results of the merge are placed into the destination working
3690
4287
directory, where they can be reviewed (with bzr diff), tested, and then
3691
4288
committed to record the result of the merge.
3692
4289
3693
4290
merge refuses to run if there are any uncommitted changes, unless
3694
--force is given. The --force option can also be used to create a
4291
--force is given. If --force is given, then the changes from the source
4292
will be merged with the current working tree, including any uncommitted
4293
changes in the tree. The --force option can also be used to create a
3695
4294
merge revision which has more than two parents.
3696
4295
3697
4296
If one would like to merge changes from the working tree of the other
3702
4301
you to apply each diff hunk and file change, similar to "shelve".
3703
4302
3704
4303
:Examples:
3705
To merge the latest revision from bzr.dev::
4304
To merge all new revisions from bzr.dev::
3706
4305
3707
4306
bzr merge ../bzr.dev
3708
4307
3745
4344
' completely merged into the source, pull from the'
3746
4345
' source rather than merging. When this happens,'
3747
4346
' you do not need to commit the result.'),
3748
Option('directory',
4347
custom_help('directory',
3749
4348
help='Branch to merge into, '
3750
'rather than the one containing the working directory.',
3751
short_name='d',
3752
type=unicode,
3753
),
4349
'rather than the one containing the working directory.'),
3754
4350
Option('preview', help='Instead of merging, show a diff of the'
3755
4351
' merge.'),
3756
4352
Option('interactive', help='Select changes interactively.',
3758
4354
]
3759
4355
3760
4356
def run(self, location=None, revision=None, force=False,
3761
merge_type=None, show_base=False, reprocess=None, remember=False,
4357
merge_type=None, show_base=False, reprocess=None, remember=None,
3762
4358
uncommitted=False, pull=False,
3763
4359
directory=None,
3764
4360
preview=False,
3772
4368
merger = None
3773
4369
allow_pending = True
3774
4370
verified = 'inapplicable'
4371
3775
4372
tree = WorkingTree.open_containing(directory)[0]
4373
if tree.branch.revno() == 0:
4374
raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4375
'https://bugs.launchpad.net/bzr/+bug/308562'))
3776
4376
3777
4377
try:
3778
4378
basis_tree = tree.revision_tree(tree.last_revision())
3789
4389
unversioned_filter=tree.is_ignored, view_info=view_info)
3790
4390
pb = ui.ui_factory.nested_progress_bar()
3791
4391
self.add_cleanup(pb.finished)
3792
tree.lock_write()
3793
self.add_cleanup(tree.unlock)
4392
self.add_cleanup(tree.lock_write().unlock)
3794
4393
if location is not None:
3795
4394
try:
3796
4395
mergeable = bundle.read_mergeable_from_url(location,
3799
4398
mergeable = None
3800
4399
else:
3801
4400
if uncommitted:
3802
raise errors.BzrCommandError('Cannot use --uncommitted'
3803
' with bundles or merge directives.')
4401
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4402
' with bundles or merge directives.'))
3804
4403
3805
4404
if revision is not None:
3806
raise errors.BzrCommandError(
3807
'Cannot use -r with merge directives or bundles')
4405
raise errors.BzrCommandError(gettext(
4406
'Cannot use -r with merge directives or bundles'))
3808
4407
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3809
4408
mergeable, None)
3810
4409
3811
4410
if merger is None and uncommitted:
3812
4411
if revision is not None and len(revision) > 0:
3813
raise errors.BzrCommandError('Cannot use --uncommitted and'
3814
' --revision at the same time.')
4412
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4413
' --revision at the same time.'))
3815
4414
merger = self.get_merger_from_uncommitted(tree, location, None)
3816
4415
allow_pending = False
3817
4416
3825
4424
self.sanity_check_merger(merger)
3826
4425
if (merger.base_rev_id == merger.other_rev_id and
3827
4426
merger.other_rev_id is not None):
3828
note('Nothing to do.')
4427
# check if location is a nonexistent file (and not a branch) to
4428
# disambiguate the 'Nothing to do'
4429
if merger.interesting_files:
4430
if not merger.other_tree.has_filename(
4431
merger.interesting_files[0]):
4432
note(gettext("merger: ") + str(merger))
4433
raise errors.PathsDoNotExist([location])
4434
note(gettext('Nothing to do.'))
3829
4435
return 0
3830
if pull:
4436
if pull and not preview:
3831
4437
if merger.interesting_files is not None:
3832
raise errors.BzrCommandError('Cannot pull individual files')
4438
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3833
4439
if (merger.base_rev_id == tree.last_revision()):
3834
4440
result = tree.pull(merger.other_branch, False,
3835
4441
merger.other_rev_id)
3836
4442
result.report(self.outf)
3837
4443
return 0
3838
4444
if merger.this_basis is None:
3839
raise errors.BzrCommandError(
4445
raise errors.BzrCommandError(gettext(
3840
4446
"This branch has no commits."
3841
" (perhaps you would prefer 'bzr pull')")
4447
" (perhaps you would prefer 'bzr pull')"))
3842
4448
if preview:
3843
4449
return self._do_preview(merger)
3844
4450
elif interactive:
3857
4463
def _do_preview(self, merger):
3858
4464
from bzrlib.diff import show_diff_trees
3859
4465
result_tree = self._get_preview(merger)
4466
path_encoding = osutils.get_diff_header_encoding()
3860
4467
show_diff_trees(merger.this_tree, result_tree, self.outf,
3861
old_label='', new_label='')
4468
old_label='', new_label='',
4469
path_encoding=path_encoding)
3862
4470
3863
4471
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3864
4472
merger.change_reporter = change_reporter
3893
4501
def sanity_check_merger(self, merger):
3894
4502
if (merger.show_base and
3895
4503
not merger.merge_type is _mod_merge.Merge3Merger):
3896
raise errors.BzrCommandError("Show-base is not supported for this"
3897
" merge type. %s" % merger.merge_type)
4504
raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4505
" merge type. %s") % merger.merge_type)
3898
4506
if merger.reprocess is None:
3899
4507
if merger.show_base:
3900
4508
merger.reprocess = False
3902
4510
# Use reprocess if the merger supports it
3903
4511
merger.reprocess = merger.merge_type.supports_reprocess
3904
4512
if merger.reprocess and not merger.merge_type.supports_reprocess:
3905
raise errors.BzrCommandError("Conflict reduction is not supported"
3906
" for merge type %s." %
4513
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4514
" for merge type %s.") %
3907
4515
merger.merge_type)
3908
4516
if merger.reprocess and merger.show_base:
3909
raise errors.BzrCommandError("Cannot do conflict reduction and"
3910
" show base.")
4517
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4518
" show base."))
3911
4519
3912
4520
def _get_merger_from_branch(self, tree, location, revision, remember,
3913
4521
possible_transports, pb):
3940
4548
if other_revision_id is None:
3941
4549
other_revision_id = _mod_revision.ensure_null(
3942
4550
other_branch.last_revision())
3943
# Remember where we merge from
3944
if ((remember or tree.branch.get_submit_branch() is None) and
3945
user_location is not None):
4551
# Remember where we merge from. We need to remember if:
4552
# - user specify a location (and we don't merge from the parent
4553
# branch)
4554
# - user ask to remember or there is no previous location set to merge
4555
# from and user didn't ask to *not* remember
4556
if (user_location is not None
4557
and ((remember
4558
or (remember is None
4559
and tree.branch.get_submit_branch() is None)))):
3946
4560
tree.branch.set_submit_branch(other_branch.base)
3947
_merge_tags_if_possible(other_branch, tree.branch)
4561
# Merge tags (but don't set them in the master branch yet, the user
4562
# might revert this merge). Commit will propagate them.
4563
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3948
4564
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3949
4565
other_revision_id, base_revision_id, other_branch, base_branch)
3950
4566
if other_path != '':
4009
4625
stored_location_type = "parent"
4010
4626
mutter("%s", stored_location)
4011
4627
if stored_location is None:
4012
raise errors.BzrCommandError("No location specified or remembered")
4628
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4013
4629
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4014
note(u"%s remembered %s location %s", verb_string,
4015
stored_location_type, display_url)
4630
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4631
stored_location_type, display_url))
4016
4632
return stored_location
4017
4633
4018
4634
4019
4635
class cmd_remerge(Command):
4020
"""Redo a merge.
4636
__doc__ = """Redo a merge.
4021
4637
4022
4638
Use this if you want to try a different merge technique while resolving
4023
4639
conflicts. Some merge techniques are better than others, and remerge
4048
4664
4049
4665
def run(self, file_list=None, merge_type=None, show_base=False,
4050
4666
reprocess=False):
4667
from bzrlib.conflicts import restore
4051
4668
if merge_type is None:
4052
4669
merge_type = _mod_merge.Merge3Merger
4053
tree, file_list = tree_files(file_list)
4054
tree.lock_write()
4055
self.add_cleanup(tree.unlock)
4670
tree, file_list = WorkingTree.open_containing_paths(file_list)
4671
self.add_cleanup(tree.lock_write().unlock)
4056
4672
parents = tree.get_parent_ids()
4057
4673
if len(parents) != 2:
4058
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4674
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4059
4675
" merges. Not cherrypicking or"
4060
" multi-merges.")
4676
" multi-merges."))
4061
4677
repository = tree.branch.repository
4062
4678
interesting_ids = None
4063
4679
new_conflicts = []
4072
4688
if tree.kind(file_id) != "directory":
4073
4689
continue
4074
4690
4075
for name, ie in tree.inventory.iter_entries(file_id):
4691
# FIXME: Support nested trees
4692
for name, ie in tree.root_inventory.iter_entries(file_id):
4076
4693
interesting_ids.add(ie.file_id)
4077
4694
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4078
4695
else:
4111
4728
4112
4729
4113
4730
class cmd_revert(Command):
4114
"""Revert files to a previous revision.
4731
__doc__ = """Revert files to a previous revision.
4115
4732
4116
4733
Giving a list of files will revert only those files. Otherwise, all files
4117
4734
will be reverted. If the revision is not specified with '--revision', the
4118
4735
last committed revision is used.
4119
4736
4120
4737
To remove only some changes, without reverting to a prior version, use
4121
merge instead. For example, "merge . --revision -2..-3" will remove the
4122
changes introduced by -2, without affecting the changes introduced by -1.
4123
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4738
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4739
will remove the changes introduced by the second last commit (-2), without
4740
affecting the changes introduced by the last commit (-1). To remove
4741
certain changes on a hunk-by-hunk basis, see the shelve command.
4124
4742
4125
4743
By default, any files that have been manually changed will be backed up
4126
4744
first. (Files changed only by merge are not backed up.) Backup files have
4156
4774
target branches.
4157
4775
"""
4158
4776
4159
_see_also = ['cat', 'export']
4777
_see_also = ['cat', 'export', 'merge', 'shelve']
4160
4778
takes_options = [
4161
4779
'revision',
4162
4780
Option('no-backup', "Do not save backups of reverted files."),
4167
4785
4168
4786
def run(self, revision=None, no_backup=False, file_list=None,
4169
4787
forget_merges=None):
4170
tree, file_list = tree_files(file_list)
4171
tree.lock_write()
4172
self.add_cleanup(tree.unlock)
4788
tree, file_list = WorkingTree.open_containing_paths(file_list)
4789
self.add_cleanup(tree.lock_tree_write().unlock)
4173
4790
if forget_merges:
4174
4791
tree.set_parent_ids(tree.get_parent_ids()[:1])
4175
4792
else:
4183
4800
4184
4801
4185
4802
class cmd_assert_fail(Command):
4186
"""Test reporting of assertion failures"""
4803
__doc__ = """Test reporting of assertion failures"""
4187
4804
# intended just for use in testing
4188
4805
4189
4806
hidden = True
4193
4810
4194
4811
4195
4812
class cmd_help(Command):
4196
"""Show help on a command or other topic.
4813
__doc__ = """Show help on a command or other topic.
4197
4814
"""
4198
4815
4199
4816
_see_also = ['topics']
4212
4829
4213
4830
4214
4831
class cmd_shell_complete(Command):
4215
"""Show appropriate completions for context.
4832
__doc__ = """Show appropriate completions for context.
4216
4833
4217
4834
For a list of all available commands, say 'bzr shell-complete'.
4218
4835
"""
4222
4839
4223
4840
@display_command
4224
4841
def run(self, context=None):
4225
import shellcomplete
4842
from bzrlib import shellcomplete
4226
4843
shellcomplete.shellcomplete(context)
4227
4844
4228
4845
4229
4846
class cmd_missing(Command):
4230
"""Show unmerged/unpulled revisions between two branches.
4847
__doc__ = """Show unmerged/unpulled revisions between two branches.
4231
4848
4232
4849
OTHER_BRANCH may be local or remote.
4233
4850
4264
4881
_see_also = ['merge', 'pull']
4265
4882
takes_args = ['other_branch?']
4266
4883
takes_options = [
4884
'directory',
4267
4885
Option('reverse', 'Reverse the order of revisions.'),
4268
4886
Option('mine-only',
4269
4887
'Display changes in the local branch only.'),
4281
4899
type=_parse_revision_str,
4282
4900
help='Filter on local branch revisions (inclusive). '
4283
4901
'See "help revisionspec" for details.'),
4284
Option('include-merges',
4902
Option('include-merged',
4285
4903
'Show all revisions in addition to the mainline ones.'),
4904
Option('include-merges', hidden=True,
4905
help='Historical alias for --include-merged.'),
4286
4906
]
4287
4907
encoding_type = 'replace'
4288
4908
4291
4911
theirs_only=False,
4292
4912
log_format=None, long=False, short=False, line=False,
4293
4913
show_ids=False, verbose=False, this=False, other=False,
4294
include_merges=False, revision=None, my_revision=None):
4914
include_merged=None, revision=None, my_revision=None,
4915
directory=u'.',
4916
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4295
4917
from bzrlib.missing import find_unmerged, iter_log_revisions
4296
4918
def message(s):
4297
4919
if not is_quiet():
4298
4920
self.outf.write(s)
4299
4921
4922
if symbol_versioning.deprecated_passed(include_merges):
4923
ui.ui_factory.show_user_warning(
4924
'deprecated_command_option',
4925
deprecated_name='--include-merges',
4926
recommended_name='--include-merged',
4927
deprecated_in_version='2.5',
4928
command=self.invoked_as)
4929
if include_merged is None:
4930
include_merged = include_merges
4931
else:
4932
raise errors.BzrCommandError(gettext(
4933
'{0} and {1} are mutually exclusive').format(
4934
'--include-merges', '--include-merged'))
4935
if include_merged is None:
4936
include_merged = False
4300
4937
if this:
4301
4938
mine_only = this
4302
4939
if other:
4310
4947
elif theirs_only:
4311
4948
restrict = 'remote'
4312
4949
4313
local_branch = Branch.open_containing(u".")[0]
4950
local_branch = Branch.open_containing(directory)[0]
4951
self.add_cleanup(local_branch.lock_read().unlock)
4952
4314
4953
parent = local_branch.get_parent()
4315
4954
if other_branch is None:
4316
4955
other_branch = parent
4317
4956
if other_branch is None:
4318
raise errors.BzrCommandError("No peer location known"
4319
" or specified.")
4957
raise errors.BzrCommandError(gettext("No peer location known"
4958
" or specified."))
4320
4959
display_url = urlutils.unescape_for_display(parent,
4321
4960
self.outf.encoding)
4322
message("Using saved parent location: "
4323
+ display_url + "\n")
4961
message(gettext("Using saved parent location: {0}\n").format(
4962
display_url))
4324
4963
4325
4964
remote_branch = Branch.open(other_branch)
4326
4965
if remote_branch.base == local_branch.base:
4327
4966
remote_branch = local_branch
4967
else:
4968
self.add_cleanup(remote_branch.lock_read().unlock)
4328
4969
4329
local_branch.lock_read()
4330
self.add_cleanup(local_branch.unlock)
4331
4970
local_revid_range = _revision_range_to_revid_range(
4332
4971
_get_revision_range(my_revision, local_branch,
4333
4972
self.name()))
4334
4973
4335
remote_branch.lock_read()
4336
self.add_cleanup(remote_branch.unlock)
4337
4974
remote_revid_range = _revision_range_to_revid_range(
4338
4975
_get_revision_range(revision,
4339
4976
remote_branch, self.name()))
4341
4978
local_extra, remote_extra = find_unmerged(
4342
4979
local_branch, remote_branch, restrict,
4343
4980
backward=not reverse,
4344
include_merges=include_merges,
4981
include_merged=include_merged,
4345
4982
local_revid_range=local_revid_range,
4346
4983
remote_revid_range=remote_revid_range)
4347
4984
4354
4991
4355
4992
status_code = 0
4356
4993
if local_extra and not theirs_only:
4357
message("You have %d extra revision(s):\n" %
4994
message(ngettext("You have %d extra revision:\n",
4995
"You have %d extra revisions:\n",
4996
len(local_extra)) %
4358
4997
len(local_extra))
4359
4998
for revision in iter_log_revisions(local_extra,
4360
4999
local_branch.repository,
4368
5007
if remote_extra and not mine_only:
4369
5008
if printed_local is True:
4370
5009
message("\n\n\n")
4371
message("You are missing %d revision(s):\n" %
5010
message(ngettext("You are missing %d revision:\n",
5011
"You are missing %d revisions:\n",
5012
len(remote_extra)) %
4372
5013
len(remote_extra))
4373
5014
for revision in iter_log_revisions(remote_extra,
4374
5015
remote_branch.repository,
4378
5019
4379
5020
if mine_only and not local_extra:
4380
5021
# We checked local, and found nothing extra
4381
message('This branch is up to date.\n')
5022
message(gettext('This branch has no new revisions.\n'))
4382
5023
elif theirs_only and not remote_extra:
4383
5024
# We checked remote, and found nothing extra
4384
message('Other branch is up to date.\n')
5025
message(gettext('Other branch has no new revisions.\n'))
4385
5026
elif not (mine_only or theirs_only or local_extra or
4386
5027
remote_extra):
4387
5028
# We checked both branches, and neither one had extra
4388
5029
# revisions
4389
message("Branches are up to date.\n")
5030
message(gettext("Branches are up to date.\n"))
4390
5031
self.cleanup_now()
4391
5032
if not status_code and parent is None and other_branch is not None:
4392
local_branch.lock_write()
4393
self.add_cleanup(local_branch.unlock)
5033
self.add_cleanup(local_branch.lock_write().unlock)
4394
5034
# handle race conditions - a parent might be set while we run.
4395
5035
if local_branch.get_parent() is None:
4396
5036
local_branch.set_parent(remote_branch.base)
4398
5038
4399
5039
4400
5040
class cmd_pack(Command):
4401
"""Compress the data within a repository."""
5041
__doc__ = """Compress the data within a repository.
5042
5043
This operation compresses the data within a bazaar repository. As
5044
bazaar supports automatic packing of repository, this operation is
5045
normally not required to be done manually.
5046
5047
During the pack operation, bazaar takes a backup of existing repository
5048
data, i.e. pack files. This backup is eventually removed by bazaar
5049
automatically when it is safe to do so. To save disk space by removing
5050
the backed up pack files, the --clean-obsolete-packs option may be
5051
used.
5052
5053
Warning: If you use --clean-obsolete-packs and your machine crashes
5054
during or immediately after repacking, you may be left with a state
5055
where the deletion has been written to disk but the new packs have not
5056
been. In this case the repository may be unusable.
5057
"""
4402
5058
4403
5059
_see_also = ['repositories']
4404
5060
takes_args = ['branch_or_repo?']
5061
takes_options = [
5062
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
5063
]
4405
5064
4406
def run(self, branch_or_repo='.'):
4407
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
5065
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
5066
dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
4408
5067
try:
4409
5068
branch = dir.open_branch()
4410
5069
repository = branch.repository
4411
5070
except errors.NotBranchError:
4412
5071
repository = dir.open_repository()
4413
repository.pack()
5072
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4414
5073
4415
5074
4416
5075
class cmd_plugins(Command):
4417
"""List the installed plugins.
5076
__doc__ = """List the installed plugins.
4418
5077
4419
5078
This command displays the list of installed plugins including
4420
5079
version of plugin and a short description of each.
4436
5095
4437
5096
@display_command
4438
5097
def run(self, verbose=False):
4439
import bzrlib.plugin
4440
from inspect import getdoc
4441
result = []
4442
for name, plugin in bzrlib.plugin.plugins().items():
4443
version = plugin.__version__
4444
if version == 'unknown':
4445
version = ''
4446
name_ver = '%s %s' % (name, version)
4447
d = getdoc(plugin.module)
4448
if d:
4449
doc = d.split('\n')[0]
4450
else:
4451
doc = '(no description)'
4452
result.append((name_ver, doc, plugin.path()))
4453
for name_ver, doc, path in sorted(result):
4454
self.outf.write("%s\n" % name_ver)
4455
self.outf.write(" %s\n" % doc)
4456
if verbose:
4457
self.outf.write(" %s\n" % path)
4458
self.outf.write("\n")
5098
from bzrlib import plugin
5099
# Don't give writelines a generator as some codecs don't like that
5100
self.outf.writelines(
5101
list(plugin.describe_plugins(show_paths=verbose)))
4459
5102
4460
5103
4461
5104
class cmd_testament(Command):
4462
"""Show testament (signing-form) of a revision."""
5105
__doc__ = """Show testament (signing-form) of a revision."""
4463
5106
takes_options = [
4464
5107
'revision',
4465
5108
Option('long', help='Produce long-format testament.'),
4477
5120
b = Branch.open_containing(branch)[0]
4478
5121
else:
4479
5122
b = Branch.open(branch)
4480
b.lock_read()
4481
self.add_cleanup(b.unlock)
5123
self.add_cleanup(b.lock_read().unlock)
4482
5124
if revision is None:
4483
5125
rev_id = b.last_revision()
4484
5126
else:
4491
5133
4492
5134
4493
5135
class cmd_annotate(Command):
4494
"""Show the origin of each line in a file.
5136
__doc__ = """Show the origin of each line in a file.
4495
5137
4496
5138
This prints out the given file with an annotation on the left side
4497
5139
indicating which revision, author and date introduced the change.
4508
5150
Option('long', help='Show commit date in annotations.'),
4509
5151
'revision',
4510
5152
'show-ids',
5153
'directory',
4511
5154
]
4512
5155
encoding_type = 'exact'
4513
5156
4514
5157
@display_command
4515
5158
def run(self, filename, all=False, long=False, revision=None,
4516
show_ids=False):
4517
from bzrlib.annotate import annotate_file, annotate_file_tree
5159
show_ids=False, directory=None):
5160
from bzrlib.annotate import (
5161
annotate_file_tree,
5162
)
4518
5163
wt, branch, relpath = \
4519
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5164
_open_directory_or_containing_tree_or_branch(filename, directory)
4520
5165
if wt is not None:
4521
wt.lock_read()
4522
self.add_cleanup(wt.unlock)
5166
self.add_cleanup(wt.lock_read().unlock)
4523
5167
else:
4524
branch.lock_read()
4525
self.add_cleanup(branch.unlock)
5168
self.add_cleanup(branch.lock_read().unlock)
4526
5169
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4527
tree.lock_read()
4528
self.add_cleanup(tree.unlock)
4529
if wt is not None:
5170
self.add_cleanup(tree.lock_read().unlock)
5171
if wt is not None and revision is None:
4530
5172
file_id = wt.path2id(relpath)
4531
5173
else:
4532
5174
file_id = tree.path2id(relpath)
4533
5175
if file_id is None:
4534
5176
raise errors.NotVersionedError(filename)
4535
file_version = tree.inventory[file_id].revision
4536
5177
if wt is not None and revision is None:
4537
5178
# If there is a tree and we're not annotating historical
4538
5179
# versions, annotate the working tree's content.
4539
5180
annotate_file_tree(wt, file_id, self.outf, long, all,
4540
5181
show_ids=show_ids)
4541
5182
else:
4542
annotate_file(branch, file_version, file_id, long, all, self.outf,
4543
show_ids=show_ids)
5183
annotate_file_tree(tree, file_id, self.outf, long, all,
5184
show_ids=show_ids, branch=branch)
4544
5185
4545
5186
4546
5187
class cmd_re_sign(Command):
4547
"""Create a digital signature for an existing revision."""
5188
__doc__ = """Create a digital signature for an existing revision."""
4548
5189
# TODO be able to replace existing ones.
4549
5190
4550
5191
hidden = True # is this right ?
4551
5192
takes_args = ['revision_id*']
4552
takes_options = ['revision']
5193
takes_options = ['directory', 'revision']
4553
5194
4554
def run(self, revision_id_list=None, revision=None):
5195
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4555
5196
if revision_id_list is not None and revision is not None:
4556
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5197
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4557
5198
if revision_id_list is None and revision is None:
4558
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4559
b = WorkingTree.open_containing(u'.')[0].branch
4560
b.lock_write()
4561
self.add_cleanup(b.unlock)
5199
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5200
b = WorkingTree.open_containing(directory)[0].branch
5201
self.add_cleanup(b.lock_write().unlock)
4562
5202
return self._run(b, revision_id_list, revision)
4563
5203
4564
5204
def _run(self, b, revision_id_list, revision):
4565
5205
import bzrlib.gpg as gpg
4566
gpg_strategy = gpg.GPGStrategy(b.get_config())
5206
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4567
5207
if revision_id_list is not None:
4568
5208
b.repository.start_write_group()
4569
5209
try:
4594
5234
if to_revid is None:
4595
5235
to_revno = b.revno()
4596
5236
if from_revno is None or to_revno is None:
4597
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
5237
raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
4598
5238
b.repository.start_write_group()
4599
5239
try:
4600
5240
for revno in range(from_revno, to_revno + 1):
4606
5246
else:
4607
5247
b.repository.commit_write_group()
4608
5248
else:
4609
raise errors.BzrCommandError('Please supply either one revision, or a range.')
5249
raise errors.BzrCommandError(gettext('Please supply either one revision, or a range.'))
4610
5250
4611
5251
4612
5252
class cmd_bind(Command):
4613
"""Convert the current branch into a checkout of the supplied branch.
5253
__doc__ = """Convert the current branch into a checkout of the supplied branch.
5254
If no branch is supplied, rebind to the last bound location.
4614
5255
4615
5256
Once converted into a checkout, commits must succeed on the master branch
4616
5257
before they will be applied to the local branch.
4622
5263
4623
5264
_see_also = ['checkouts', 'unbind']
4624
5265
takes_args = ['location?']
4625
takes_options = []
5266
takes_options = ['directory']
4626
5267
4627
def run(self, location=None):
4628
b, relpath = Branch.open_containing(u'.')
5268
def run(self, location=None, directory=u'.'):
5269
b, relpath = Branch.open_containing(directory)
4629
5270
if location is None:
4630
5271
try:
4631
5272
location = b.get_old_bound_location()
4632
5273
except errors.UpgradeRequired:
4633
raise errors.BzrCommandError('No location supplied. '
4634
'This format does not remember old locations.')
5274
raise errors.BzrCommandError(gettext('No location supplied. '
5275
'This format does not remember old locations.'))
4635
5276
else:
4636
5277
if location is None:
4637
5278
if b.get_bound_location() is not None:
4638
raise errors.BzrCommandError('Branch is already bound')
5279
raise errors.BzrCommandError(
5280
gettext('Branch is already bound'))
4639
5281
else:
4640
raise errors.BzrCommandError('No location supplied '
4641
'and no previous location known')
5282
raise errors.BzrCommandError(
5283
gettext('No location supplied'
5284
' and no previous location known'))
4642
5285
b_other = Branch.open(location)
4643
5286
try:
4644
5287
b.bind(b_other)
4645
5288
except errors.DivergedBranches:
4646
raise errors.BzrCommandError('These branches have diverged.'
4647
' Try merging, and then bind again.')
5289
raise errors.BzrCommandError(gettext('These branches have diverged.'
5290
' Try merging, and then bind again.'))
4648
5291
if b.get_config().has_explicit_nickname():
4649
5292
b.nick = b_other.nick
4650
5293
4651
5294
4652
5295
class cmd_unbind(Command):
4653
"""Convert the current checkout into a regular branch.
5296
__doc__ = """Convert the current checkout into a regular branch.
4654
5297
4655
5298
After unbinding, the local branch is considered independent and subsequent
4656
5299
commits will be local only.
4658
5301
4659
5302
_see_also = ['checkouts', 'bind']
4660
5303
takes_args = []
4661
takes_options = []
5304
takes_options = ['directory']
4662
5305
4663
def run(self):
4664
b, relpath = Branch.open_containing(u'.')
5306
def run(self, directory=u'.'):
5307
b, relpath = Branch.open_containing(directory)
4665
5308
if not b.unbind():
4666
raise errors.BzrCommandError('Local branch is not bound')
5309
raise errors.BzrCommandError(gettext('Local branch is not bound'))
4667
5310
4668
5311
4669
5312
class cmd_uncommit(Command):
4670
"""Remove the last committed revision.
5313
__doc__ = """Remove the last committed revision.
4671
5314
4672
5315
--verbose will print out what is being removed.
4673
5316
--dry-run will go through all the motions, but not actually
4690
5333
takes_options = ['verbose', 'revision',
4691
5334
Option('dry-run', help='Don\'t actually make changes.'),
4692
5335
Option('force', help='Say yes to all questions.'),
5336
Option('keep-tags',
5337
help='Keep tags that point to removed revisions.'),
4693
5338
Option('local',
4694
5339
help="Only remove the commits from the local branch"
4695
5340
" when in a checkout."
4699
5344
aliases = []
4700
5345
encoding_type = 'replace'
4701
5346
4702
def run(self, location=None,
4703
dry_run=False, verbose=False,
4704
revision=None, force=False, local=False):
5347
def run(self, location=None, dry_run=False, verbose=False,
5348
revision=None, force=False, local=False, keep_tags=False):
4705
5349
if location is None:
4706
5350
location = u'.'
4707
control, relpath = bzrdir.BzrDir.open_containing(location)
5351
control, relpath = controldir.ControlDir.open_containing(location)
4708
5352
try:
4709
5353
tree = control.open_workingtree()
4710
5354
b = tree.branch
4713
5357
b = control.open_branch()
4714
5358
4715
5359
if tree is not None:
4716
tree.lock_write()
4717
self.add_cleanup(tree.unlock)
5360
self.add_cleanup(tree.lock_write().unlock)
4718
5361
else:
4719
b.lock_write()
4720
self.add_cleanup(b.unlock)
4721
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5362
self.add_cleanup(b.lock_write().unlock)
5363
return self._run(b, tree, dry_run, verbose, revision, force,
5364
local, keep_tags)
4722
5365
4723
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5366
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5367
keep_tags):
4724
5368
from bzrlib.log import log_formatter, show_log
4725
5369
from bzrlib.uncommit import uncommit
4726
5370
4741
5385
rev_id = b.get_rev_id(revno)
4742
5386
4743
5387
if rev_id is None or _mod_revision.is_null(rev_id):
4744
self.outf.write('No revisions to uncommit.\n')
5388
self.outf.write(gettext('No revisions to uncommit.\n'))
4745
5389
return 1
4746
5390
4747
5391
lf = log_formatter('short',
4756
5400
end_revision=last_revno)
4757
5401
4758
5402
if dry_run:
4759
self.outf.write('Dry-run, pretending to remove'
4760
' the above revisions.\n')
5403
self.outf.write(gettext('Dry-run, pretending to remove'
5404
' the above revisions.\n'))
4761
5405
else:
4762
self.outf.write('The above revision(s) will be removed.\n')
5406
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4763
5407
4764
5408
if not force:
4765
if not ui.ui_factory.get_boolean('Are you sure'):
4766
self.outf.write('Canceled')
5409
if not ui.ui_factory.confirm_action(
5410
gettext(u'Uncommit these revisions'),
5411
'bzrlib.builtins.uncommit',
5412
{}):
5413
self.outf.write(gettext('Canceled\n'))
4767
5414
return 0
4768
5415
4769
5416
mutter('Uncommitting from {%s} to {%s}',
4770
5417
last_rev_id, rev_id)
4771
5418
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4772
revno=revno, local=local)
4773
self.outf.write('You can restore the old tip by running:\n'
4774
' bzr pull . -r revid:%s\n' % last_rev_id)
5419
revno=revno, local=local, keep_tags=keep_tags)
5420
self.outf.write(gettext('You can restore the old tip by running:\n'
5421
' bzr pull . -r revid:%s\n') % last_rev_id)
4775
5422
4776
5423
4777
5424
class cmd_break_lock(Command):
4778
"""Break a dead lock on a repository, branch or working directory.
5425
__doc__ = """Break a dead lock.
5426
5427
This command breaks a lock on a repository, branch, working directory or
5428
config file.
4779
5429
4780
5430
CAUTION: Locks should only be broken when you are sure that the process
4781
5431
holding the lock has been stopped.
4786
5436
:Examples:
4787
5437
bzr break-lock
4788
5438
bzr break-lock bzr+ssh://example.com/bzr/foo
5439
bzr break-lock --conf ~/.bazaar
4789
5440
"""
5441
4790
5442
takes_args = ['location?']
5443
takes_options = [
5444
Option('config',
5445
help='LOCATION is the directory where the config lock is.'),
5446
Option('force',
5447
help='Do not ask for confirmation before breaking the lock.'),
5448
]
4791
5449
4792
def run(self, location=None, show=False):
5450
def run(self, location=None, config=False, force=False):
4793
5451
if location is None:
4794
5452
location = u'.'
4795
control, relpath = bzrdir.BzrDir.open_containing(location)
4796
try:
4797
control.break_lock()
4798
except NotImplementedError:
4799
pass
5453
if force:
5454
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5455
None,
5456
{'bzrlib.lockdir.break': True})
5457
if config:
5458
conf = _mod_config.LockableConfig(file_name=location)
5459
conf.break_lock()
5460
else:
5461
control, relpath = controldir.ControlDir.open_containing(location)
5462
try:
5463
control.break_lock()
5464
except NotImplementedError:
5465
pass
4800
5466
4801
5467
4802
5468
class cmd_wait_until_signalled(Command):
4803
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5469
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4804
5470
4805
5471
This just prints a line to signal when it is ready, then blocks on stdin.
4806
5472
"""
4814
5480
4815
5481
4816
5482
class cmd_serve(Command):
4817
"""Run the bzr server."""
5483
__doc__ = """Run the bzr server."""
4818
5484
4819
5485
aliases = ['server']
4820
5486
4825
5491
help="Protocol to serve.",
4826
5492
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4827
5493
value_switches=True),
5494
Option('listen',
5495
help='Listen for connections on nominated address.', type=str),
4828
5496
Option('port',
4829
help='Listen for connections on nominated port of the form '
4830
'[hostname:]portnumber. Passing 0 as the port number will '
4831
'result in a dynamically allocated port. The default port '
4832
'depends on the protocol.',
4833
type=str),
4834
Option('directory',
4835
help='Serve contents of this directory.',
4836
type=unicode),
5497
help='Listen for connections on nominated port. Passing 0 as '
5498
'the port number will result in a dynamically allocated '
5499
'port. The default port depends on the protocol.',
5500
type=int),
5501
custom_help('directory',
5502
help='Serve contents of this directory.'),
4837
5503
Option('allow-writes',
4838
5504
help='By default the server is a readonly server. Supplying '
4839
5505
'--allow-writes enables write access to the contents of '
4843
5509
'option leads to global uncontrolled write access to your '
4844
5510
'file system.'
4845
5511
),
5512
Option('client-timeout', type=float,
5513
help='Override the default idle client timeout (5min).'),
4846
5514
]
4847
5515
4848
def get_host_and_port(self, port):
4849
"""Return the host and port to run the smart server on.
4850
4851
If 'port' is None, None will be returned for the host and port.
4852
4853
If 'port' has a colon in it, the string before the colon will be
4854
interpreted as the host.
4855
4856
:param port: A string of the port to run the server on.
4857
:return: A tuple of (host, port), where 'host' is a host name or IP,
4858
and port is an integer TCP/IP port.
4859
"""
4860
host = None
4861
if port is not None:
4862
if ':' in port:
4863
host, port = port.split(':')
4864
port = int(port)
4865
return host, port
4866
4867
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4868
protocol=None):
4869
from bzrlib.transport import get_transport, transport_server_registry
5516
def run(self, listen=None, port=None, inet=False, directory=None,
5517
allow_writes=False, protocol=None, client_timeout=None):
5518
from bzrlib import transport
4870
5519
if directory is None:
4871
5520
directory = os.getcwd()
4872
5521
if protocol is None:
4873
protocol = transport_server_registry.get()
4874
host, port = self.get_host_and_port(port)
4875
url = urlutils.local_path_to_url(directory)
5522
protocol = transport.transport_server_registry.get()
5523
url = transport.location_to_url(directory)
4876
5524
if not allow_writes:
4877
5525
url = 'readonly+' + url
4878
transport = get_transport(url)
4879
protocol(transport, host, port, inet)
5526
t = transport.get_transport_from_url(url)
5527
protocol(t, listen, port, inet, client_timeout)
4880
5528
4881
5529
4882
5530
class cmd_join(Command):
4883
"""Combine a tree into its containing tree.
5531
__doc__ = """Combine a tree into its containing tree.
4884
5532
4885
5533
This command requires the target tree to be in a rich-root format.
4886
5534
4888
5536
not part of it. (Such trees can be produced by "bzr split", but also by
4889
5537
running "bzr branch" with the target inside a tree.)
4890
5538
4891
The result is a combined tree, with the subtree no longer an independant
5539
The result is a combined tree, with the subtree no longer an independent
4892
5540
part. This is marked as a merge of the subtree into the containing tree,
4893
5541
and all history is preserved.
4894
5542
"""
4905
5553
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4906
5554
repo = containing_tree.branch.repository
4907
5555
if not repo.supports_rich_root():
4908
raise errors.BzrCommandError(
5556
raise errors.BzrCommandError(gettext(
4909
5557
"Can't join trees because %s doesn't support rich root data.\n"
4910
"You can use bzr upgrade on the repository."
5558
"You can use bzr upgrade on the repository.")
4911
5559
% (repo,))
4912
5560
if reference:
4913
5561
try:
4915
5563
except errors.BadReferenceTarget, e:
4916
5564
# XXX: Would be better to just raise a nicely printable
4917
5565
# exception from the real origin. Also below. mbp 20070306
4918
raise errors.BzrCommandError("Cannot join %s. %s" %
4919
(tree, e.reason))
5566
raise errors.BzrCommandError(
5567
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4920
5568
else:
4921
5569
try:
4922
5570
containing_tree.subsume(sub_tree)
4923
5571
except errors.BadSubsumeSource, e:
4924
raise errors.BzrCommandError("Cannot join %s. %s" %
4925
(tree, e.reason))
5572
raise errors.BzrCommandError(
5573
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4926
5574
4927
5575
4928
5576
class cmd_split(Command):
4929
"""Split a subdirectory of a tree into a separate tree.
5577
__doc__ = """Split a subdirectory of a tree into a separate tree.
4930
5578
4931
5579
This command will produce a target tree in a format that supports
4932
5580
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4952
5600
4953
5601
4954
5602
class cmd_merge_directive(Command):
4955
"""Generate a merge directive for auto-merge tools.
5603
__doc__ = """Generate a merge directive for auto-merge tools.
4956
5604
4957
5605
A directive requests a merge to be performed, and also provides all the
4958
5606
information necessary to do so. This means it must either include a
4975
5623
_see_also = ['send']
4976
5624
4977
5625
takes_options = [
5626
'directory',
4978
5627
RegistryOption.from_kwargs('patch-type',
4979
5628
'The type of patch to include in the directive.',
4980
5629
title='Patch type',
4993
5642
encoding_type = 'exact'
4994
5643
4995
5644
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
4996
sign=False, revision=None, mail_to=None, message=None):
5645
sign=False, revision=None, mail_to=None, message=None,
5646
directory=u'.'):
4997
5647
from bzrlib.revision import ensure_null, NULL_REVISION
4998
5648
include_patch, include_bundle = {
4999
5649
'plain': (False, False),
5000
5650
'diff': (True, False),
5001
5651
'bundle': (True, True),
5002
5652
}[patch_type]
5003
branch = Branch.open('.')
5653
branch = Branch.open(directory)
5004
5654
stored_submit_branch = branch.get_submit_branch()
5005
5655
if submit_branch is None:
5006
5656
submit_branch = stored_submit_branch
5010
5660
if submit_branch is None:
5011
5661
submit_branch = branch.get_parent()
5012
5662
if submit_branch is None:
5013
raise errors.BzrCommandError('No submit branch specified or known')
5663
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5014
5664
5015
5665
stored_public_branch = branch.get_public_branch()
5016
5666
if public_branch is None:
5017
5667
public_branch = stored_public_branch
5018
5668
elif stored_public_branch is None:
5669
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5019
5670
branch.set_public_branch(public_branch)
5020
5671
if not include_bundle and public_branch is None:
5021
raise errors.BzrCommandError('No public branch specified or'
5022
' known')
5672
raise errors.BzrCommandError(gettext('No public branch specified or'
5673
' known'))
5023
5674
base_revision_id = None
5024
5675
if revision is not None:
5025
5676
if len(revision) > 2:
5026
raise errors.BzrCommandError('bzr merge-directive takes '
5027
'at most two one revision identifiers')
5677
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5678
'at most two one revision identifiers'))
5028
5679
revision_id = revision[-1].as_revision_id(branch)
5029
5680
if len(revision) == 2:
5030
5681
base_revision_id = revision[0].as_revision_id(branch)
5032
5683
revision_id = branch.last_revision()
5033
5684
revision_id = ensure_null(revision_id)
5034
5685
if revision_id == NULL_REVISION:
5035
raise errors.BzrCommandError('No revisions to bundle.')
5686
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5036
5687
directive = merge_directive.MergeDirective2.from_objects(
5037
5688
branch.repository, revision_id, time.time(),
5038
5689
osutils.local_time_offset(), submit_branch,
5046
5697
self.outf.writelines(directive.to_lines())
5047
5698
else:
5048
5699
message = directive.to_email(mail_to, branch, sign)
5049
s = SMTPConnection(branch.get_config())
5700
s = SMTPConnection(branch.get_config_stack())
5050
5701
s.send_email(message)
5051
5702
5052
5703
5053
5704
class cmd_send(Command):
5054
"""Mail or create a merge-directive for submitting changes.
5705
__doc__ = """Mail or create a merge-directive for submitting changes.
5055
5706
5056
5707
A merge directive provides many things needed for requesting merges:
5057
5708
5082
5733
source branch defaults to that containing the working directory, but can
5083
5734
be changed using --from.
5084
5735
5736
Both the submit branch and the public branch follow the usual behavior with
5737
respect to --remember: If there is no default location set, the first send
5738
will set it (use --no-remember to avoid setting it). After that, you can
5739
omit the location to use the default. To change the default, use
5740
--remember. The value will only be saved if the location can be accessed.
5741
5085
5742
In order to calculate those changes, bzr must analyse the submit branch.
5086
5743
Therefore it is most efficient for the submit branch to be a local mirror.
5087
5744
If a public location is known for the submit_branch, that location is used
5091
5748
given, in which case it is sent to a file.
5092
5749
5093
5750
Mail is sent using your preferred mail program. This should be transparent
5094
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5751
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5095
5752
If the preferred client can't be found (or used), your editor will be used.
5096
5753
5097
5754
To use a specific mail program, set the mail_client configuration option.
5139
5796
short_name='f',
5140
5797
type=unicode),
5141
5798
Option('output', short_name='o',
5142
help='Write merge directive to this file; '
5799
help='Write merge directive to this file or directory; '
5143
5800
'use - for stdout.',
5144
5801
type=unicode),
5145
5802
Option('strict',
5156
5813
]
5157
5814
5158
5815
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5159
no_patch=False, revision=None, remember=False, output=None,
5816
no_patch=False, revision=None, remember=None, output=None,
5160
5817
format=None, mail_to=None, message=None, body=None,
5161
5818
strict=None, **kwargs):
5162
5819
from bzrlib.send import send
5168
5825
5169
5826
5170
5827
class cmd_bundle_revisions(cmd_send):
5171
"""Create a merge-directive for submitting changes.
5828
__doc__ = """Create a merge-directive for submitting changes.
5172
5829
5173
5830
A merge directive provides many things needed for requesting merges:
5174
5831
5241
5898
5242
5899
5243
5900
class cmd_tag(Command):
5244
"""Create, remove or modify a tag naming a revision.
5901
__doc__ = """Create, remove or modify a tag naming a revision.
5245
5902
5246
5903
Tags give human-meaningful names to revisions. Commands that take a -r
5247
5904
(--revision) option can be given -rtag:X, where X is any previously
5255
5912
5256
5913
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5257
5914
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5915
5916
If no tag name is specified it will be determined through the
5917
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5918
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5919
details.
5258
5920
"""
5259
5921
5260
5922
_see_also = ['commit', 'tags']
5261
takes_args = ['tag_name']
5923
takes_args = ['tag_name?']
5262
5924
takes_options = [
5263
5925
Option('delete',
5264
5926
help='Delete this tag rather than placing it.',
5265
5927
),
5266
Option('directory',
5267
help='Branch in which to place the tag.',
5268
short_name='d',
5269
type=unicode,
5270
),
5928
custom_help('directory',
5929
help='Branch in which to place the tag.'),
5271
5930
Option('force',
5272
5931
help='Replace existing tags.',
5273
5932
),
5274
5933
'revision',
5275
5934
]
5276
5935
5277
def run(self, tag_name,
5936
def run(self, tag_name=None,
5278
5937
delete=None,
5279
5938
directory='.',
5280
5939
force=None,
5281
5940
revision=None,
5282
5941
):
5283
5942
branch, relpath = Branch.open_containing(directory)
5284
branch.lock_write()
5285
self.add_cleanup(branch.unlock)
5943
self.add_cleanup(branch.lock_write().unlock)
5286
5944
if delete:
5945
if tag_name is None:
5946
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5287
5947
branch.tags.delete_tag(tag_name)
5288
self.outf.write('Deleted tag %s.\n' % tag_name)
5948
note(gettext('Deleted tag %s.') % tag_name)
5289
5949
else:
5290
5950
if revision:
5291
5951
if len(revision) != 1:
5292
raise errors.BzrCommandError(
5952
raise errors.BzrCommandError(gettext(
5293
5953
"Tags can only be placed on a single revision, "
5294
"not on a range")
5954
"not on a range"))
5295
5955
revision_id = revision[0].as_revision_id(branch)
5296
5956
else:
5297
5957
revision_id = branch.last_revision()
5298
if (not force) and branch.tags.has_tag(tag_name):
5958
if tag_name is None:
5959
tag_name = branch.automatic_tag_name(revision_id)
5960
if tag_name is None:
5961
raise errors.BzrCommandError(gettext(
5962
"Please specify a tag name."))
5963
try:
5964
existing_target = branch.tags.lookup_tag(tag_name)
5965
except errors.NoSuchTag:
5966
existing_target = None
5967
if not force and existing_target not in (None, revision_id):
5299
5968
raise errors.TagAlreadyExists(tag_name)
5300
branch.tags.set_tag(tag_name, revision_id)
5301
self.outf.write('Created tag %s.\n' % tag_name)
5969
if existing_target == revision_id:
5970
note(gettext('Tag %s already exists for that revision.') % tag_name)
5971
else:
5972
branch.tags.set_tag(tag_name, revision_id)
5973
if existing_target is None:
5974
note(gettext('Created tag %s.') % tag_name)
5975
else:
5976
note(gettext('Updated tag %s.') % tag_name)
5302
5977
5303
5978
5304
5979
class cmd_tags(Command):
5305
"""List tags.
5980
__doc__ = """List tags.
5306
5981
5307
5982
This command shows a table of tag names and the revisions they reference.
5308
5983
"""
5309
5984
5310
5985
_see_also = ['tag']
5311
5986
takes_options = [
5312
Option('directory',
5313
help='Branch whose tags should be displayed.',
5314
short_name='d',
5315
type=unicode,
5316
),
5317
RegistryOption.from_kwargs('sort',
5987
custom_help('directory',
5988
help='Branch whose tags should be displayed.'),
5989
RegistryOption('sort',
5318
5990
'Sort tags by different criteria.', title='Sorting',
5319
alpha='Sort tags lexicographically (default).',
5320
time='Sort tags chronologically.',
5991
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5321
5992
),
5322
5993
'show-ids',
5323
5994
'revision',
5324
5995
]
5325
5996
5326
5997
@display_command
5327
def run(self,
5328
directory='.',
5329
sort='alpha',
5330
show_ids=False,
5331
revision=None,
5332
):
5998
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5999
from bzrlib.tag import tag_sort_methods
5333
6000
branch, relpath = Branch.open_containing(directory)
5334
6001
5335
6002
tags = branch.tags.get_tag_dict().items()
5336
6003
if not tags:
5337
6004
return
5338
6005
5339
branch.lock_read()
5340
self.add_cleanup(branch.unlock)
6006
self.add_cleanup(branch.lock_read().unlock)
5341
6007
if revision:
5342
graph = branch.repository.get_graph()
5343
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5344
revid1, revid2 = rev1.rev_id, rev2.rev_id
5345
# only show revisions between revid1 and revid2 (inclusive)
5346
tags = [(tag, revid) for tag, revid in tags if
5347
graph.is_between(revid, revid1, revid2)]
5348
if sort == 'alpha':
5349
tags.sort()
5350
elif sort == 'time':
5351
timestamps = {}
5352
for tag, revid in tags:
5353
try:
5354
revobj = branch.repository.get_revision(revid)
5355
except errors.NoSuchRevision:
5356
timestamp = sys.maxint # place them at the end
5357
else:
5358
timestamp = revobj.timestamp
5359
timestamps[revid] = timestamp
5360
tags.sort(key=lambda x: timestamps[x[1]])
6008
# Restrict to the specified range
6009
tags = self._tags_for_range(branch, revision)
6010
if sort is None:
6011
sort = tag_sort_methods.get()
6012
sort(branch, tags)
5361
6013
if not show_ids:
5362
6014
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5363
6015
for index, (tag, revid) in enumerate(tags):
5365
6017
revno = branch.revision_id_to_dotted_revno(revid)
5366
6018
if isinstance(revno, tuple):
5367
6019
revno = '.'.join(map(str, revno))
5368
except errors.NoSuchRevision:
6020
except (errors.NoSuchRevision,
6021
errors.GhostRevisionsHaveNoRevno,
6022
errors.UnsupportedOperation):
5369
6023
# Bad tag data/merges can lead to tagged revisions
5370
6024
# which are not in this branch. Fail gracefully ...
5371
6025
revno = '?'
5374
6028
for tag, revspec in tags:
5375
6029
self.outf.write('%-20s %s\n' % (tag, revspec))
5376
6030
6031
def _tags_for_range(self, branch, revision):
6032
range_valid = True
6033
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6034
revid1, revid2 = rev1.rev_id, rev2.rev_id
6035
# _get_revision_range will always set revid2 if it's not specified.
6036
# If revid1 is None, it means we want to start from the branch
6037
# origin which is always a valid ancestor. If revid1 == revid2, the
6038
# ancestry check is useless.
6039
if revid1 and revid1 != revid2:
6040
# FIXME: We really want to use the same graph than
6041
# branch.iter_merge_sorted_revisions below, but this is not
6042
# easily available -- vila 2011-09-23
6043
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6044
# We don't want to output anything in this case...
6045
return []
6046
# only show revisions between revid1 and revid2 (inclusive)
6047
tagged_revids = branch.tags.get_reverse_tag_dict()
6048
found = []
6049
for r in branch.iter_merge_sorted_revisions(
6050
start_revision_id=revid2, stop_revision_id=revid1,
6051
stop_rule='include'):
6052
revid_tags = tagged_revids.get(r[0], None)
6053
if revid_tags:
6054
found.extend([(tag, r[0]) for tag in revid_tags])
6055
return found
6056
5377
6057
5378
6058
class cmd_reconfigure(Command):
5379
"""Reconfigure the type of a bzr directory.
6059
__doc__ = """Reconfigure the type of a bzr directory.
5380
6060
5381
6061
A target configuration must be specified.
5382
6062
5393
6073
takes_args = ['location?']
5394
6074
takes_options = [
5395
6075
RegistryOption.from_kwargs(
5396
'target_type',
5397
title='Target type',
5398
help='The type to reconfigure the directory to.',
6076
'tree_type',
6077
title='Tree type',
6078
help='The relation between branch and tree.',
5399
6079
value_switches=True, enum_switch=False,
5400
6080
branch='Reconfigure to be an unbound branch with no working tree.',
5401
6081
tree='Reconfigure to be an unbound branch with a working tree.',
5402
6082
checkout='Reconfigure to be a bound branch with a working tree.',
5403
6083
lightweight_checkout='Reconfigure to be a lightweight'
5404
6084
' checkout (with no local history).',
6085
),
6086
RegistryOption.from_kwargs(
6087
'repository_type',
6088
title='Repository type',
6089
help='Location fo the repository.',
6090
value_switches=True, enum_switch=False,
5405
6091
standalone='Reconfigure to be a standalone branch '
5406
6092
'(i.e. stop using shared repository).',
5407
6093
use_shared='Reconfigure to use a shared repository.',
6094
),
6095
RegistryOption.from_kwargs(
6096
'repository_trees',
6097
title='Trees in Repository',
6098
help='Whether new branches in the repository have trees.',
6099
value_switches=True, enum_switch=False,
5408
6100
with_trees='Reconfigure repository to create '
5409
6101
'working trees on branches by default.',
5410
6102
with_no_trees='Reconfigure repository to not create '
5424
6116
),
5425
6117
]
5426
6118
5427
def run(self, location=None, target_type=None, bind_to=None, force=False,
5428
stacked_on=None,
5429
unstacked=None):
5430
directory = bzrdir.BzrDir.open(location)
6119
def run(self, location=None, bind_to=None, force=False,
6120
tree_type=None, repository_type=None, repository_trees=None,
6121
stacked_on=None, unstacked=None):
6122
directory = controldir.ControlDir.open(location)
5431
6123
if stacked_on and unstacked:
5432
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6124
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5433
6125
elif stacked_on is not None:
5434
6126
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5435
6127
elif unstacked:
5437
6129
# At the moment you can use --stacked-on and a different
5438
6130
# reconfiguration shape at the same time; there seems no good reason
5439
6131
# to ban it.
5440
if target_type is None:
6132
if (tree_type is None and
6133
repository_type is None and
6134
repository_trees is None):
5441
6135
if stacked_on or unstacked:
5442
6136
return
5443
6137
else:
5444
raise errors.BzrCommandError('No target configuration '
5445
'specified')
5446
elif target_type == 'branch':
6138
raise errors.BzrCommandError(gettext('No target configuration '
6139
'specified'))
6140
reconfiguration = None
6141
if tree_type == 'branch':
5447
6142
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5448
elif target_type == 'tree':
6143
elif tree_type == 'tree':
5449
6144
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5450
elif target_type == 'checkout':
6145
elif tree_type == 'checkout':
5451
6146
reconfiguration = reconfigure.Reconfigure.to_checkout(
5452
6147
directory, bind_to)
5453
elif target_type == 'lightweight-checkout':
6148
elif tree_type == 'lightweight-checkout':
5454
6149
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5455
6150
directory, bind_to)
5456
elif target_type == 'use-shared':
6151
if reconfiguration:
6152
reconfiguration.apply(force)
6153
reconfiguration = None
6154
if repository_type == 'use-shared':
5457
6155
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5458
elif target_type == 'standalone':
6156
elif repository_type == 'standalone':
5459
6157
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5460
elif target_type == 'with-trees':
6158
if reconfiguration:
6159
reconfiguration.apply(force)
6160
reconfiguration = None
6161
if repository_trees == 'with-trees':
5461
6162
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5462
6163
directory, True)
5463
elif target_type == 'with-no-trees':
6164
elif repository_trees == 'with-no-trees':
5464
6165
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5465
6166
directory, False)
5466
reconfiguration.apply(force)
6167
if reconfiguration:
6168
reconfiguration.apply(force)
6169
reconfiguration = None
5467
6170
5468
6171
5469
6172
class cmd_switch(Command):
5470
"""Set the branch of a checkout and update.
6173
__doc__ = """Set the branch of a checkout and update.
5471
6174
5472
6175
For lightweight checkouts, this changes the branch being referenced.
5473
6176
For heavyweight checkouts, this checks that there are no local commits
5490
6193
"""
5491
6194
5492
6195
takes_args = ['to_location?']
5493
takes_options = [Option('force',
6196
takes_options = ['directory',
6197
Option('force',
5494
6198
help='Switch even if local commits will be lost.'),
5495
6199
'revision',
5496
6200
Option('create-branch', short_name='b',
5499
6203
]
5500
6204
5501
6205
def run(self, to_location=None, force=False, create_branch=False,
5502
revision=None):
6206
revision=None, directory=u'.'):
5503
6207
from bzrlib import switch
5504
tree_location = '.'
6208
tree_location = directory
5505
6209
revision = _get_one_revision('switch', revision)
5506
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6210
possible_transports = []
6211
control_dir = controldir.ControlDir.open_containing(tree_location,
6212
possible_transports=possible_transports)[0]
5507
6213
if to_location is None:
5508
6214
if revision is None:
5509
raise errors.BzrCommandError('You must supply either a'
5510
' revision or a location')
5511
to_location = '.'
6215
raise errors.BzrCommandError(gettext('You must supply either a'
6216
' revision or a location'))
6217
to_location = tree_location
5512
6218
try:
5513
branch = control_dir.open_branch()
6219
branch = control_dir.open_branch(
6220
possible_transports=possible_transports)
5514
6221
had_explicit_nick = branch.get_config().has_explicit_nickname()
5515
6222
except errors.NotBranchError:
5516
6223
branch = None
5517
6224
had_explicit_nick = False
5518
6225
if create_branch:
5519
6226
if branch is None:
5520
raise errors.BzrCommandError('cannot create branch without'
5521
' source branch')
5522
to_location = directory_service.directories.dereference(
5523
to_location)
5524
if '/' not in to_location and '\\' not in to_location:
5525
# This path is meant to be relative to the existing branch
5526
this_url = self._get_branch_location(control_dir)
5527
to_location = urlutils.join(this_url, '..', to_location)
6227
raise errors.BzrCommandError(
6228
gettext('cannot create branch without source branch'))
6229
to_location = lookup_new_sibling_branch(control_dir, to_location,
6230
possible_transports=possible_transports)
5528
6231
to_branch = branch.bzrdir.sprout(to_location,
5529
possible_transports=[branch.bzrdir.root_transport],
5530
source_branch=branch).open_branch()
6232
possible_transports=possible_transports,
6233
source_branch=branch).open_branch()
5531
6234
else:
5532
6235
try:
5533
to_branch = Branch.open(to_location)
6236
to_branch = Branch.open(to_location,
6237
possible_transports=possible_transports)
5534
6238
except errors.NotBranchError:
5535
this_url = self._get_branch_location(control_dir)
5536
to_branch = Branch.open(
5537
urlutils.join(this_url, '..', to_location))
6239
to_branch = open_sibling_branch(control_dir, to_location,
6240
possible_transports=possible_transports)
5538
6241
if revision is not None:
5539
6242
revision = revision.as_revision_id(to_branch)
5540
6243
switch.switch(control_dir, to_branch, force, revision_id=revision)
5541
6244
if had_explicit_nick:
5542
6245
branch = control_dir.open_branch() #get the new branch!
5543
6246
branch.nick = to_branch.nick
5544
note('Switched to branch: %s',
6247
note(gettext('Switched to branch: %s'),
5545
6248
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5546
6249
5547
def _get_branch_location(self, control_dir):
5548
"""Return location of branch for this control dir."""
5549
try:
5550
this_branch = control_dir.open_branch()
5551
# This may be a heavy checkout, where we want the master branch
5552
master_location = this_branch.get_bound_location()
5553
if master_location is not None:
5554
return master_location
5555
# If not, use a local sibling
5556
return this_branch.base
5557
except errors.NotBranchError:
5558
format = control_dir.find_branch_format()
5559
if getattr(format, 'get_reference', None) is not None:
5560
return format.get_reference(control_dir)
5561
else:
5562
return control_dir.root_transport.base
5563
6250
5564
6251
5565
6252
class cmd_view(Command):
5566
"""Manage filtered views.
6253
__doc__ = """Manage filtered views.
5567
6254
5568
6255
Views provide a mask over the tree so that users can focus on
5569
6256
a subset of a tree when doing their work. After creating a view,
5649
6336
name=None,
5650
6337
switch=None,
5651
6338
):
5652
tree, file_list = tree_files(file_list, apply_view=False)
6339
tree, file_list = WorkingTree.open_containing_paths(file_list,
6340
apply_view=False)
5653
6341
current_view, view_dict = tree.views.get_view_info()
5654
6342
if name is None:
5655
6343
name = current_view
5656
6344
if delete:
5657
6345
if file_list:
5658
raise errors.BzrCommandError(
5659
"Both --delete and a file list specified")
6346
raise errors.BzrCommandError(gettext(
6347
"Both --delete and a file list specified"))
5660
6348
elif switch:
5661
raise errors.BzrCommandError(
5662
"Both --delete and --switch specified")
6349
raise errors.BzrCommandError(gettext(
6350
"Both --delete and --switch specified"))
5663
6351
elif all:
5664
6352
tree.views.set_view_info(None, {})
5665
self.outf.write("Deleted all views.\n")
6353
self.outf.write(gettext("Deleted all views.\n"))
5666
6354
elif name is None:
5667
raise errors.BzrCommandError("No current view to delete")
6355
raise errors.BzrCommandError(gettext("No current view to delete"))
5668
6356
else:
5669
6357
tree.views.delete_view(name)
5670
self.outf.write("Deleted '%s' view.\n" % name)
6358
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5671
6359
elif switch:
5672
6360
if file_list:
5673
raise errors.BzrCommandError(
5674
"Both --switch and a file list specified")
6361
raise errors.BzrCommandError(gettext(
6362
"Both --switch and a file list specified"))
5675
6363
elif all:
5676
raise errors.BzrCommandError(
5677
"Both --switch and --all specified")
6364
raise errors.BzrCommandError(gettext(
6365
"Both --switch and --all specified"))
5678
6366
elif switch == 'off':
5679
6367
if current_view is None:
5680
raise errors.BzrCommandError("No current view to disable")
6368
raise errors.BzrCommandError(gettext("No current view to disable"))
5681
6369
tree.views.set_view_info(None, view_dict)
5682
self.outf.write("Disabled '%s' view.\n" % (current_view))
6370
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5683
6371
else:
5684
6372
tree.views.set_view_info(switch, view_dict)
5685
6373
view_str = views.view_display_str(tree.views.lookup_view())
5686
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6374
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5687
6375
elif all:
5688
6376
if view_dict:
5689
self.outf.write('Views defined:\n')
6377
self.outf.write(gettext('Views defined:\n'))
5690
6378
for view in sorted(view_dict):
5691
6379
if view == current_view:
5692
6380
active = "=>"
5695
6383
view_str = views.view_display_str(view_dict[view])
5696
6384
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5697
6385
else:
5698
self.outf.write('No views defined.\n')
6386
self.outf.write(gettext('No views defined.\n'))
5699
6387
elif file_list:
5700
6388
if name is None:
5701
6389
# No name given and no current view set
5702
6390
name = 'my'
5703
6391
elif name == 'off':
5704
raise errors.BzrCommandError(
5705
"Cannot change the 'off' pseudo view")
6392
raise errors.BzrCommandError(gettext(
6393
"Cannot change the 'off' pseudo view"))
5706
6394
tree.views.set_view(name, sorted(file_list))
5707
6395
view_str = views.view_display_str(tree.views.lookup_view())
5708
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6396
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5709
6397
else:
5710
6398
# list the files
5711
6399
if name is None:
5712
6400
# No name given and no current view set
5713
self.outf.write('No current view.\n')
6401
self.outf.write(gettext('No current view.\n'))
5714
6402
else:
5715
6403
view_str = views.view_display_str(tree.views.lookup_view(name))
5716
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6404
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5717
6405
5718
6406
5719
6407
class cmd_hooks(Command):
5720
"""Show hooks."""
6408
__doc__ = """Show hooks."""
5721
6409
5722
6410
hidden = True
5723
6411
5733
6421
self.outf.write(" %s\n" %
5734
6422
(some_hooks.get_hook_name(hook),))
5735
6423
else:
5736
self.outf.write(" <no hooks installed>\n")
6424
self.outf.write(gettext(" <no hooks installed>\n"))
6425
6426
6427
class cmd_remove_branch(Command):
6428
__doc__ = """Remove a branch.
6429
6430
This will remove the branch from the specified location but
6431
will keep any working tree or repository in place.
6432
6433
:Examples:
6434
6435
Remove the branch at repo/trunk::
6436
6437
bzr remove-branch repo/trunk
6438
6439
"""
6440
6441
takes_args = ["location?"]
6442
6443
takes_options = ['directory',
6444
Option('force', help='Remove branch even if it is the active branch.')]
6445
6446
aliases = ["rmbranch"]
6447
6448
def run(self, directory=None, location=None, force=False):
6449
br = open_nearby_branch(near=directory, location=location)
6450
if not force and br.bzrdir.has_workingtree():
6451
try:
6452
active_branch = br.bzrdir.open_branch(name="")
6453
except errors.NotBranchError:
6454
active_branch = None
6455
if (active_branch is not None and
6456
br.control_url == active_branch.control_url):
6457
raise errors.BzrCommandError(
6458
gettext("Branch is active. Use --force to remove it."))
6459
br.bzrdir.destroy_branch(br.name)
5737
6460
5738
6461
5739
6462
class cmd_shelve(Command):
5740
"""Temporarily set aside some changes from the current tree.
6463
__doc__ = """Temporarily set aside some changes from the current tree.
5741
6464
5742
6465
Shelve allows you to temporarily put changes you've made "on the shelf",
5743
6466
ie. out of the way, until a later time when you can bring them back from
5759
6482
5760
6483
You can put multiple items on the shelf, and by default, 'unshelve' will
5761
6484
restore the most recently shelved changes.
6485
6486
For complicated changes, it is possible to edit the changes in a separate
6487
editor program to decide what the file remaining in the working copy
6488
should look like. To do this, add the configuration option
6489
6490
change_editor = PROGRAM @new_path @old_path
6491
6492
where @new_path is replaced with the path of the new version of the
6493
file and @old_path is replaced with the path of the old version of
6494
the file. The PROGRAM should save the new file with the desired
6495
contents of the file in the working tree.
6496
5762
6497
"""
5763
6498
5764
6499
takes_args = ['file*']
5765
6500
5766
6501
takes_options = [
6502
'directory',
5767
6503
'revision',
5768
6504
Option('all', help='Shelve all changes.'),
5769
6505
'message',
5775
6511
Option('destroy',
5776
6512
help='Destroy removed changes instead of shelving them.'),
5777
6513
]
5778
_see_also = ['unshelve']
6514
_see_also = ['unshelve', 'configuration']
5779
6515
5780
6516
def run(self, revision=None, all=False, file_list=None, message=None,
5781
writer=None, list=False, destroy=False):
6517
writer=None, list=False, destroy=False, directory=None):
5782
6518
if list:
5783
return self.run_for_list()
6519
return self.run_for_list(directory=directory)
5784
6520
from bzrlib.shelf_ui import Shelver
5785
6521
if writer is None:
5786
6522
writer = bzrlib.option.diff_writer_registry.get()
5787
6523
try:
5788
6524
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5789
file_list, message, destroy=destroy)
6525
file_list, message, destroy=destroy, directory=directory)
5790
6526
try:
5791
6527
shelver.run()
5792
6528
finally:
5794
6530
except errors.UserAbort:
5795
6531
return 0
5796
6532
5797
def run_for_list(self):
5798
tree = WorkingTree.open_containing('.')[0]
5799
tree.lock_read()
5800
self.add_cleanup(tree.unlock)
6533
def run_for_list(self, directory=None):
6534
if directory is None:
6535
directory = u'.'
6536
tree = WorkingTree.open_containing(directory)[0]
6537
self.add_cleanup(tree.lock_read().unlock)
5801
6538
manager = tree.get_shelf_manager()
5802
6539
shelves = manager.active_shelves()
5803
6540
if len(shelves) == 0:
5804
note('No shelved changes.')
6541
note(gettext('No shelved changes.'))
5805
6542
return 0
5806
6543
for shelf_id in reversed(shelves):
5807
6544
message = manager.get_metadata(shelf_id).get('message')
5812
6549
5813
6550
5814
6551
class cmd_unshelve(Command):
5815
"""Restore shelved changes.
6552
__doc__ = """Restore shelved changes.
5816
6553
5817
6554
By default, the most recently shelved changes are restored. However if you
5818
6555
specify a shelf by id those changes will be restored instead. This works
5821
6558
5822
6559
takes_args = ['shelf_id?']
5823
6560
takes_options = [
6561
'directory',
5824
6562
RegistryOption.from_kwargs(
5825
6563
'action', help="The action to perform.",
5826
6564
enum_switch=False, value_switches=True,
5834
6572
]
5835
6573
_see_also = ['shelve']
5836
6574
5837
def run(self, shelf_id=None, action='apply'):
6575
def run(self, shelf_id=None, action='apply', directory=u'.'):
5838
6576
from bzrlib.shelf_ui import Unshelver
5839
unshelver = Unshelver.from_args(shelf_id, action)
6577
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5840
6578
try:
5841
6579
unshelver.run()
5842
6580
finally:
5844
6582
5845
6583
5846
6584
class cmd_clean_tree(Command):
5847
"""Remove unwanted files from working tree.
6585
__doc__ = """Remove unwanted files from working tree.
5848
6586
5849
6587
By default, only unknown files, not ignored files, are deleted. Versioned
5850
6588
files are never deleted.
5858
6596
5859
6597
To check what clean-tree will do, use --dry-run.
5860
6598
"""
5861
takes_options = [Option('ignored', help='Delete all ignored files.'),
5862
Option('detritus', help='Delete conflict files, merge'
6599
takes_options = ['directory',
6600
Option('ignored', help='Delete all ignored files.'),
6601
Option('detritus', help='Delete conflict files, merge and revert'
5863
6602
' backups, and failed selftest dirs.'),
5864
6603
Option('unknown',
5865
6604
help='Delete files unknown to bzr (default).'),
5867
6606
' deleting them.'),
5868
6607
Option('force', help='Do not prompt before deleting.')]
5869
6608
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5870
force=False):
6609
force=False, directory=u'.'):
5871
6610
from bzrlib.clean_tree import clean_tree
5872
6611
if not (unknown or ignored or detritus):
5873
6612
unknown = True
5874
6613
if dry_run:
5875
6614
force = True
5876
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5877
dry_run=dry_run, no_prompt=force)
6615
clean_tree(directory, unknown=unknown, ignored=ignored,
6616
detritus=detritus, dry_run=dry_run, no_prompt=force)
5878
6617
5879
6618
5880
6619
class cmd_reference(Command):
5881
"""list, view and set branch locations for nested trees.
6620
__doc__ = """list, view and set branch locations for nested trees.
5882
6621
5883
6622
If no arguments are provided, lists the branch locations for nested trees.
5884
6623
If one argument is provided, display the branch location for that tree.
5894
6633
if path is not None:
5895
6634
branchdir = path
5896
6635
tree, branch, relpath =(
5897
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6636
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
5898
6637
if path is not None:
5899
6638
path = relpath
5900
6639
if tree is None:
5924
6663
self.outf.write('%s %s\n' % (path, location))
5925
6664
5926
6665
5927
# these get imported and then picked up by the scan for cmd_*
5928
# TODO: Some more consistent way to split command definitions across files;
5929
# we do need to load at least some information about them to know of
5930
# aliases. ideally we would avoid loading the implementation until the
5931
# details were needed.
5932
from bzrlib.cmd_version_info import cmd_version_info
5933
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5934
from bzrlib.bundle.commands import (
5935
cmd_bundle_info,
5936
)
5937
from bzrlib.foreign import cmd_dpush
5938
from bzrlib.sign_my_commits import cmd_sign_my_commits
6666
class cmd_export_pot(Command):
6667
__doc__ = """Export command helps and error messages in po format."""
6668
6669
hidden = True
6670
takes_options = [Option('plugin',
6671
help='Export help text from named command '\
6672
'(defaults to all built in commands).',
6673
type=str),
6674
Option('include-duplicates',
6675
help='Output multiple copies of the same msgid '
6676
'string if it appears more than once.'),
6677
]
6678
6679
def run(self, plugin=None, include_duplicates=False):
6680
from bzrlib.export_pot import export_pot
6681
export_pot(self.outf, plugin, include_duplicates)
6682
6683
6684
def _register_lazy_builtins():
6685
# register lazy builtins from other modules; called at startup and should
6686
# be only called once.
6687
for (name, aliases, module_name) in [
6688
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6689
('cmd_config', [], 'bzrlib.config'),
6690
('cmd_dpush', [], 'bzrlib.foreign'),
6691
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6692
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6693
('cmd_conflicts', [], 'bzrlib.conflicts'),
6694
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6695
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6696
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6697
]:
6698
builtin_command_registry.register_lazy(name, aliases, module_name)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1