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