29
33
from bzrlib import (
40
config as _mod_config,
39
45
merge as _mod_merge,
43
50
revision as _mod_revision,
50
59
from bzrlib.branch import Branch
51
60
from bzrlib.conflicts import ConflictList
52
from bzrlib.revisionspec import RevisionSpec
61
from bzrlib.transport import memory
62
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
53
63
from bzrlib.smtp_connection import SMTPConnection
54
64
from bzrlib.workingtree import WorkingTree
65
from bzrlib.i18n import gettext, ngettext
57
from bzrlib.commands import Command, display_command
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
62
def tree_files(file_list, default_branch=u'.'):
64
return internal_tree_files(file_list, default_branch)
65
except errors.FileInWrongBranch, e:
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
67
(e.path, file_list[0]))
70
# XXX: Bad function name; should possibly also be a class method of
71
# WorkingTree rather than a function.
72
def internal_tree_files(file_list, default_branch=u'.'):
73
"""Convert command-line paths to a WorkingTree and relative paths.
75
This is typically used for command-line processors that take one or
76
more filenames, and infer the workingtree that contains them.
78
The filenames given are not required to exist.
80
:param file_list: Filenames to convert.
82
:param default_branch: Fallback tree path to use if file_list is empty or
85
:return: workingtree, [relative_paths]
87
if file_list is None or len(file_list) == 0:
88
return WorkingTree.open_containing(default_branch)[0], file_list
89
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
90
return tree, safe_relpath_files(tree, file_list)
93
def safe_relpath_files(tree, file_list):
94
"""Convert file_list into a list of relpaths in tree.
96
:param tree: A tree to operate on.
97
:param file_list: A list of user provided paths or None.
98
:return: A list of relative paths.
99
:raises errors.PathNotChild: When a provided path is in a different tree
102
if file_list is None:
68
from bzrlib.commands import (
70
builtin_command_registry,
73
from bzrlib.option import (
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
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
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
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
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?
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
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
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)
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
147
return urlutils.join(this_url, '..', urlutils.escape(location))
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
154
:param control_dir: Control directory relative to which to lookup the
156
:param location: Location to look up
157
:return: branch to open
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)
167
this_url, '..', urlutils.escape(location)))
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
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():
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
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():
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("/")
223
def tree_files_for_add(file_list):
225
Return a tree and list of absolute paths from a file list.
227
Similar to tree_files, but add handles files a bit differently, so it a
228
custom implementation. In particular, MutableTreeTree.smart_add expects
229
absolute paths, which it immediately converts to relative paths.
231
# FIXME Would be nice to just return the relative paths like
232
# internal_tree_files does, but there are a large number of unit tests
233
# that assume the current interface to mutabletree.smart_add
235
tree, relpath = WorkingTree.open_containing(file_list[0])
236
if tree.supports_views():
237
view_files = tree.views.lookup_view()
239
for filename in file_list:
240
if not osutils.is_inside_any(view_files, filename):
241
raise errors.FileOutsideView(filename, view_files)
242
file_list = file_list[:]
243
file_list[0] = tree.abspath(relpath)
245
tree = WorkingTree.open_containing(u'.')[0]
246
if tree.supports_views():
247
view_files = tree.views.lookup_view()
249
file_list = view_files
250
view_str = views.view_display_str(view_files)
251
note(gettext("Ignoring files outside view. View is %s") % view_str)
252
return tree, file_list
255
def _get_one_revision(command_name, revisions):
256
if revisions is None:
105
for filename in file_list:
107
new_list.append(tree.relpath(osutils.dereference_path(filename)))
108
except errors.PathNotChild:
109
raise errors.FileInWrongBranch(tree.branch, filename)
258
if len(revisions) != 1:
259
raise errors.BzrCommandError(gettext(
260
'bzr %s --revision takes exactly one revision identifier') % (
265
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
266
"""Get a revision tree. Not suitable for commands that change the tree.
268
Specifically, the basis tree in dirstate trees is coupled to the dirstate
269
and doing a commit/uncommit/pull will at best fail due to changing the
272
If tree is passed in, it should be already locked, for lifetime management
273
of the trees internal cached state.
277
if revisions is None:
279
rev_tree = tree.basis_tree()
281
rev_tree = branch.basis_tree()
283
revision = _get_one_revision(command_name, revisions)
284
rev_tree = revision.as_tree(branch)
288
def _get_view_info_for_change_reporter(tree):
289
"""Get the view information from a tree for change reporting."""
292
current_view = tree.views.get_view_info()[0]
293
if current_view is not None:
294
view_info = (current_view, tree.views.lookup_view())
295
except errors.ViewsNotSupported:
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)
113
308
# TODO: Make sure no commands unconditionally use the working directory as a
197
410
show_tree_status(tree, show_ids=show_ids,
198
411
specific_files=relfile_list, revision=revision,
199
412
to_file=self.outf, short=short, versioned=versioned,
200
show_pending=(not no_pending))
413
show_pending=(not no_pending), verbose=verbose,
414
classify=not no_classify)
203
417
class cmd_cat_revision(Command):
204
"""Write out metadata for a revision.
418
__doc__ = """Write out metadata for a revision.
206
420
The revision to print can either be specified by a specific
207
421
revision identifier, or you can use --revision.
211
425
takes_args = ['revision_id?']
212
takes_options = ['revision']
426
takes_options = ['directory', 'revision']
213
427
# cat-revision is more for frontends so should be exact
214
428
encoding = 'strict'
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'))
217
def run(self, revision_id=None, revision=None):
439
def run(self, revision_id=None, revision=None, directory=u'.'):
218
440
if revision_id is not None and revision is not None:
219
raise errors.BzrCommandError('You can only supply one of'
220
' revision_id or --revision')
441
raise errors.BzrCommandError(gettext('You can only supply one of'
442
' revision_id or --revision'))
221
443
if revision_id is None and revision is None:
222
raise errors.BzrCommandError('You must supply either'
223
' --revision or a revision_id')
224
b = WorkingTree.open_containing(u'.')[0].branch
226
# TODO: jam 20060112 should cat-revision always output utf-8?
227
if revision_id is not None:
228
revision_id = osutils.safe_revision_id(revision_id, warn=False)
444
raise errors.BzrCommandError(gettext('You must supply either'
445
' --revision or a revision_id'))
447
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
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'))
454
b.repository.lock_read()
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)
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:
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)
473
b.repository.unlock()
476
class cmd_dump_btree(Command):
477
__doc__ = """Dump the contents of a btree index file to stdout.
479
PATH is a btree index file, it can be any URL. This includes things like
480
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
482
By default, the tuples stored in the index file will be displayed. With
483
--raw, we will uncompress the pages, but otherwise display the raw bytes
487
# TODO: Do we want to dump the internal nodes as well?
488
# TODO: It would be nice to be able to dump the un-parsed information,
489
# rather than only going through iter_all_entries. However, this is
490
# good enough for a start
492
encoding_type = 'exact'
493
takes_args = ['path']
494
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
495
' rather than the parsed tuples.'),
498
def run(self, path, raw=False):
499
dirname, basename = osutils.split(path)
500
t = transport.get_transport(dirname)
502
self._dump_raw_bytes(t, basename)
504
self._dump_entries(t, basename)
506
def _get_index_and_bytes(self, trans, basename):
507
"""Create a BTreeGraphIndex and raw bytes."""
508
bt = btree_index.BTreeGraphIndex(trans, basename, None)
509
bytes = trans.get_bytes(basename)
510
bt._file = cStringIO.StringIO(bytes)
511
bt._size = len(bytes)
514
def _dump_raw_bytes(self, trans, basename):
517
# We need to parse at least the root node.
518
# This is because the first page of every row starts with an
519
# uncompressed header.
520
bt, bytes = self._get_index_and_bytes(trans, basename)
521
for page_idx, page_start in enumerate(xrange(0, len(bytes),
522
btree_index._PAGE_SIZE)):
523
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
524
page_bytes = bytes[page_start:page_end]
526
self.outf.write('Root node:\n')
527
header_end, data = bt._parse_header_from_bytes(page_bytes)
528
self.outf.write(page_bytes[:header_end])
530
self.outf.write('\nPage %d\n' % (page_idx,))
531
if len(page_bytes) == 0:
532
self.outf.write('(empty)\n');
534
decomp_bytes = zlib.decompress(page_bytes)
535
self.outf.write(decomp_bytes)
536
self.outf.write('\n')
538
def _dump_entries(self, trans, basename):
540
st = trans.stat(basename)
541
except errors.TransportNotPossible:
542
# We can't stat, so we'll fake it because we have to do the 'get()'
544
bt, _ = self._get_index_and_bytes(trans, basename)
546
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
547
for node in bt.iter_all_entries():
548
# Node is made up of:
549
# (index, key, value, [references])
230
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
231
except errors.NoSuchRevision:
232
msg = "The repository %s contains no revision %s." % (b.repository.base,
234
raise errors.BzrCommandError(msg)
235
elif revision is not None:
238
raise errors.BzrCommandError('You cannot specify a NULL'
240
rev_id = rev.as_revision_id(b)
241
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
553
refs_as_tuples = None
555
refs_as_tuples = static_tuple.as_tuples(refs)
556
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
557
self.outf.write('%s\n' % (as_tuple,))
244
560
class cmd_remove_tree(Command):
245
"""Remove the working tree from a given branch/checkout.
561
__doc__ = """Remove the working tree from a given branch/checkout.
247
563
Since a lightweight checkout is little more than a working tree
248
564
this will refuse to run against one.
250
566
To re-create the working tree, use "bzr checkout".
252
568
_see_also = ['checkout', 'working-trees']
254
takes_args = ['location?']
256
def run(self, location='.'):
257
d = bzrdir.BzrDir.open(location)
569
takes_args = ['location*']
572
help='Remove the working tree even if it has '
573
'uncommitted or shelved changes.'),
576
def run(self, location_list, force=False):
577
if not location_list:
580
for location in location_list:
581
d = controldir.ControlDir.open(location)
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"))
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)
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"))
600
d.destroy_workingtree()
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
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.
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
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.
619
takes_options = ['revision', 'directory',
621
help='Reset the tree even if it doesn\'t appear to be'
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
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.'))
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
260
working = d.open_workingtree()
261
except errors.NoWorkingTree:
262
raise errors.BzrCommandError("No working tree to remove")
263
except errors.NotLocalUrl:
264
raise errors.BzrCommandError("You cannot remove the working tree of a "
267
working_path = working.bzrdir.root_transport.base
268
branch_path = working.branch.bzrdir.root_transport.base
269
if working_path != branch_path:
270
raise errors.BzrCommandError("You cannot remove the working tree from "
271
"a lightweight checkout")
273
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'))
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
276
655
class cmd_revno(Command):
277
"""Show current revision number.
656
__doc__ = """Show current revision number.
279
658
This is equal to the number of revisions on this branch.
282
661
_see_also = ['info']
283
662
takes_args = ['location?']
664
Option('tree', help='Show revno of working tree.'),
286
def run(self, location=u'.'):
287
self.outf.write(str(Branch.open_containing(location)[0].revno()))
288
self.outf.write('\n')
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"))
676
wt = WorkingTree.open_containing(location)[0]
677
self.add_cleanup(wt.lock_read().unlock)
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
679
raise errors.NoWorkingTree(location)
681
revid = wt.last_revision()
683
b = Branch.open_containing(location)[0]
684
self.add_cleanup(b.lock_read().unlock)
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)
692
revid = b.last_revision()
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
697
revno = ".".join(str(n) for n in revno_t)
699
self.outf.write(revno + '\n')
291
702
class cmd_revision_info(Command):
292
"""Show revision number and revision id for a given revision identifier.
703
__doc__ = """Show revision number and revision id for a given revision identifier.
295
706
takes_args = ['revision_info*']
296
takes_options = ['revision']
709
custom_help('directory',
710
help='Branch to examine, '
711
'rather than the one containing the working directory.'),
712
Option('tree', help='Show revno of working tree.'),
299
def run(self, revision=None, revision_info_list=[]):
716
def run(self, revision=None, directory=u'.', tree=False,
717
revision_info_list=[]):
720
wt = WorkingTree.open_containing(directory)[0]
722
self.add_cleanup(wt.lock_read().unlock)
723
except (errors.NoWorkingTree, errors.NotLocalUrl):
725
b = Branch.open_containing(directory)[0]
726
self.add_cleanup(b.lock_read().unlock)
302
728
if revision is not None:
303
revs.extend(revision)
729
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
304
730
if revision_info_list is not None:
305
for rev in revision_info_list:
306
revs.append(RevisionSpec.from_string(rev))
308
b = Branch.open_containing(u'.')[0]
311
revs.append(RevisionSpec.from_string('-1'))
314
revision_id = rev.as_revision_id(b)
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:
738
raise errors.NoWorkingTree(directory)
739
revision_ids.append(wt.last_revision())
741
revision_ids.append(b.last_revision())
745
for revision_id in revision_ids:
316
revno = '%4d' % (b.revision_id_to_revno(revision_id))
747
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
748
revno = '.'.join(str(i) for i in dotted_revno)
317
749
except errors.NoSuchRevision:
318
dotted_map = b.get_revision_id_to_revno_map()
319
revno = '.'.join(str(i) for i in dotted_map[revision_id])
320
print '%s %s' % (revno, revision_id)
751
maxlen = max(maxlen, len(revno))
752
revinfos.append([revno, revision_id])
756
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
323
759
class cmd_add(Command):
324
"""Add specified files or directories.
760
__doc__ = """Add specified files or directories.
326
762
In non-recursive mode, all the named items are added, regardless
327
763
of whether they were previously ignored. A warning is given if
568
1042
and rel_names[0].lower() == rel_names[1].lower()):
569
1043
into_existing = False
572
from_id = tree.path2id(rel_names[0])
1045
# 'fix' the case of a potential 'from'
1046
from_id = tree.path2id(
1047
tree.get_canonical_inventory_path(rel_names[0]))
573
1048
if (not osutils.lexists(names_list[0]) and
574
from_id and inv.get_file_kind(from_id) == "directory"):
1049
from_id and tree.stored_kind(from_id) == "directory"):
575
1050
into_existing = False
577
1052
if into_existing:
578
1053
# move into existing directory
579
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
580
self.outf.write("%s => %s\n" % pair)
1054
# All entries reference existing inventory items, so fix them up
1055
# for cicp file-systems.
1056
rel_names = tree.get_canonical_inventory_paths(rel_names)
1057
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
1059
self.outf.write("%s => %s\n" % (src, dest))
582
1061
if len(names_list) != 2:
583
raise errors.BzrCommandError('to mv multiple files the'
1062
raise errors.BzrCommandError(gettext('to mv multiple files the'
584
1063
' destination must be a versioned'
586
tree.rename_one(rel_names[0], rel_names[1], after=after)
587
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
1066
# for cicp file-systems: the src references an existing inventory
1068
src = tree.get_canonical_inventory_path(rel_names[0])
1069
# Find the canonical version of the destination: In all cases, the
1070
# parent of the target must be in the inventory, so we fetch the
1071
# canonical version from there (we do not always *use* the
1072
# canonicalized tail portion - we may be attempting to rename the
1074
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
1075
dest_parent = osutils.dirname(canon_dest)
1076
spec_tail = osutils.basename(rel_names[1])
1077
# For a CICP file-system, we need to avoid creating 2 inventory
1078
# entries that differ only by case. So regardless of the case
1079
# we *want* to use (ie, specified by the user or the file-system),
1080
# we must always choose to use the case of any existing inventory
1081
# items. The only exception to this is when we are attempting a
1082
# case-only rename (ie, canonical versions of src and dest are
1084
dest_id = tree.path2id(canon_dest)
1085
if dest_id is None or tree.path2id(src) == dest_id:
1086
# No existing item we care about, so work out what case we
1087
# are actually going to use.
1089
# If 'after' is specified, the tail must refer to a file on disk.
1091
dest_parent_fq = osutils.pathjoin(tree.basedir, dest_parent)
1093
# pathjoin with an empty tail adds a slash, which breaks
1095
dest_parent_fq = tree.basedir
1097
dest_tail = osutils.canonical_relpath(
1099
osutils.pathjoin(dest_parent_fq, spec_tail))
1101
# not 'after', so case as specified is used
1102
dest_tail = spec_tail
1104
# Use the existing item so 'mv' fails with AlreadyVersioned.
1105
dest_tail = os.path.basename(canon_dest)
1106
dest = osutils.pathjoin(dest_parent, dest_tail)
1107
mutter("attempting to move %s => %s", src, dest)
1108
tree.rename_one(src, dest, after=after)
1110
self.outf.write("%s => %s\n" % (src, dest))
590
1113
class cmd_pull(Command):
591
"""Turn this branch into a mirror of another branch.
1114
__doc__ = """Turn this branch into a mirror of another branch.
593
This command only works on branches that have not diverged. Branches are
594
considered diverged if the destination branch's most recent commit is one
595
that has not been merged (directly or indirectly) into the parent.
1116
By default, this command only works on branches that have not diverged.
1117
Branches are considered diverged if the destination branch's most recent
1118
commit is one that has not been merged (directly or indirectly) into the
597
1121
If branches have diverged, you can use 'bzr merge' to integrate the changes
598
1122
from one into the other. Once one branch has merged, the other should
599
1123
be able to pull it again.
601
If you want to forget your local changes and just update your branch to
602
match the remote one, use pull --overwrite.
604
If there is no default location set, the first pull will set it. After
605
that, you can omit the location to use the default. To change the
606
default, use --remember. The value will only be saved if the remote
607
location can be accessed.
1125
If you want to replace your local changes and just want your branch to
1126
match the remote one, use pull --overwrite. This will work even if the two
1127
branches have diverged.
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.
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>.
609
1138
Note: The location can be specified either in the form of a branch,
610
1139
or in the form of a path to a file containing a merge directive generated
614
_see_also = ['push', 'update', 'status-flags']
1143
_see_also = ['push', 'update', 'status-flags', 'send']
615
1144
takes_options = ['remember', 'overwrite', 'revision',
616
1145
custom_help('verbose',
617
1146
help='Show logs of pulled revisions.'),
1147
custom_help('directory',
619
1148
help='Branch to pull into, '
620
'rather than the one containing the working directory.',
1149
'rather than the one containing the working directory.'),
1151
help="Perform a local pull in a bound "
1152
"branch. Local pulls are not applied to "
1153
"the master branch."
1156
help="Show base revision text in conflicts."),
1157
Option('overwrite-tags',
1158
help="Overwrite tags only."),
625
1160
takes_args = ['location?']
626
1161
encoding_type = 'replace'
628
def run(self, location=None, remember=False, overwrite=False,
1163
def run(self, location=None, remember=None, overwrite=False,
629
1164
revision=None, verbose=False,
1165
directory=None, local=False,
1166
show_base=False, overwrite_tags=False):
1169
overwrite = ["history", "tags"]
1170
elif overwrite_tags:
1171
overwrite = ["tags"]
631
1174
# FIXME: too much stuff is in the command class
632
1175
revision_id = None
633
1176
mergeable = None
828
1406
To retrieve the branch as of a particular revision, supply the --revision
829
1407
parameter, as in "branch foo/bar -r 5".
1409
The synonyms 'clone' and 'get' for this command are deprecated.
832
1412
_see_also = ['checkout']
833
1413
takes_args = ['from_location', 'to_location?']
834
takes_options = ['revision', Option('hardlink',
835
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."),
1419
help="Create a branch without a working-tree."),
1421
help="Switch the checkout in the current directory "
1422
"to the new branch."),
836
1423
Option('stacked',
837
1424
help='Create a stacked branch referring to the source branch. '
838
1425
'The new branch will depend on the availability of the source '
839
1426
'branch for all operations.'),
1427
Option('standalone',
1428
help='Do not use a shared repository, even if available.'),
1429
Option('use-existing-dir',
1430
help='By default branch will fail if the target'
1431
' directory exists, but does not already'
1432
' have a control directory. This flag will'
1433
' allow branch to proceed.'),
1435
help="Bind new branch to from location."),
841
1437
aliases = ['get', 'clone']
843
1439
def run(self, from_location, to_location=None, revision=None,
844
hardlink=False, stacked=False):
1440
hardlink=False, stacked=False, standalone=False, no_tree=False,
1441
use_existing_dir=False, switch=False, bind=False,
1443
from bzrlib import switch as _mod_switch
845
1444
from bzrlib.tag import _merge_tags_if_possible
848
elif len(revision) > 1:
849
raise errors.BzrCommandError(
850
'bzr branch --revision takes exactly 1 revision value')
852
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(
856
if len(revision) == 1 and revision[0] is not None:
857
revision_id = revision[0].as_revision_id(br_from)
859
# FIXME - wt.last_revision, fallback to branch, fall back to
860
# None or perhaps NULL_REVISION to mean copy nothing
862
revision_id = br_from.last_revision()
863
if to_location is None:
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)
1460
revision = _get_one_revision('branch', revision)
1461
self.add_cleanup(br_from.lock_read().unlock)
1462
if revision is not None:
1463
revision_id = revision.as_revision_id(br_from)
1465
# FIXME - wt.last_revision, fallback to branch, fall back to
1466
# None or perhaps NULL_REVISION to mean copy nothing
1468
revision_id = br_from.last_revision()
1469
if to_location is None:
1470
to_location = getattr(br_from, "name", None)
864
1472
to_location = urlutils.derive_to_location(from_location)
865
to_transport = transport.get_transport(to_location)
1473
to_transport = transport.get_transport(to_location)
1475
to_transport.mkdir('.')
1476
except errors.FileExists:
867
to_transport.mkdir('.')
868
except errors.FileExists:
869
raise errors.BzrCommandError('Target directory "%s" already'
870
' exists.' % to_location)
871
except errors.NoSuchFile:
872
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1478
to_dir = controldir.ControlDir.open_from_transport(
1480
except errors.NotBranchError:
1481
if not use_existing_dir:
1482
raise errors.BzrCommandError(gettext('Target directory "%s" '
1483
'already exists.') % to_location)
1488
to_dir.open_branch()
1489
except errors.NotBranchError:
1492
raise errors.AlreadyBranchError(to_location)
1493
except errors.NoSuchFile:
1494
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
875
1500
# preserve whatever source format we have.
876
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1501
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
877
1502
possible_transports=[to_transport],
878
1503
accelerator_tree=accelerator_tree,
879
hardlink=hardlink, stacked=stacked)
880
branch = dir.open_branch()
1504
hardlink=hardlink, stacked=stacked,
1505
force_new_repo=standalone,
1506
create_tree_if_local=not no_tree,
1507
source_branch=br_from)
1508
branch = to_dir.open_branch(
1509
possible_transports=[
1510
br_from.bzrdir.root_transport, to_transport])
881
1511
except errors.NoSuchRevision:
882
1512
to_transport.delete_tree('.')
883
msg = "The branch %s has no revision %s." % (from_location,
1513
msg = gettext("The branch {0} has no revision {1}.").format(
1514
from_location, revision)
885
1515
raise errors.BzrCommandError(msg)
886
_merge_tags_if_possible(br_from, branch)
887
# If the source branch is stacked, the new branch may
888
# be stacked whether we asked for that explicitly or not.
889
# We therefore need a try/except here and not just 'if stacked:'
891
note('Created new stacked branch referring to %s.' %
892
branch.get_stacked_on_url())
893
except (errors.NotStacked, errors.UnstackableBranchFormat,
894
errors.UnstackableRepositoryFormat), e:
895
note('Branched %d revision(s).' % branch.revno())
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:'
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())
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)
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'))
1546
class cmd_branches(Command):
1547
__doc__ = """List the branches available at the current location.
1549
This command will print the names of all the branches at the current
1553
takes_args = ['location?']
1555
Option('recursive', short_name='R',
1556
help='Recursively scan for branches rather than '
1557
'just looking in the specified location.')]
1559
def run(self, location=".", recursive=False):
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("/"))
1570
dir = controldir.ControlDir.open_containing(location)[0]
1572
active_branch = dir.open_branch(name="")
1573
except errors.NotBranchError:
1574
active_branch = None
1576
for name, branch in iter_sibling_branches(dir):
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]
1592
self.outf.write("%s %s\n" % (
1593
prefix, name.encode(self.outf.encoding)))
900
1596
class cmd_checkout(Command):
901
"""Create a new checkout of an existing branch.
1597
__doc__ = """Create a new checkout of an existing branch.
903
1599
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
904
1600
the branch found in '.'. This is useful if you have removed the working tree
905
1601
or if it was never created - i.e. if you pushed the branch to its current
906
1602
location using SFTP.
908
1604
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
909
1605
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
910
1606
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
982
1679
@display_command
983
1680
def run(self, dir=u'.'):
984
1681
tree = WorkingTree.open_containing(dir)[0]
987
new_inv = tree.inventory
988
old_tree = tree.basis_tree()
991
old_inv = old_tree.inventory
992
renames = list(_mod_tree.find_renames(old_inv, new_inv))
994
for old_name, new_name in renames:
995
self.outf.write("%s => %s\n" % (old_name, new_name))
1682
self.add_cleanup(tree.lock_read().unlock)
1683
old_tree = tree.basis_tree()
1684
self.add_cleanup(old_tree.lock_read().unlock)
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]:
1692
renames.append(paths)
1694
for old_name, new_name in renames:
1695
self.outf.write("%s => %s\n" % (old_name, new_name))
1002
1698
class cmd_update(Command):
1003
"""Update a tree to have the latest code committed to its branch.
1005
This will perform a merge into the working tree, and may generate
1006
conflicts. If you have any local changes, you will still
1007
need to commit them after the update for the update to be complete.
1009
If you want to discard your local changes, you can just do a
1010
'bzr revert' instead of 'bzr commit' after the update.
1699
__doc__ = """Update a working tree to a new revision.
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.
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.
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.
1713
If the tree's branch is bound to a master branch, bzr will also update
1714
the branch from the master.
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.
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.
1013
1728
_see_also = ['pull', 'working-trees', 'status-flags']
1014
1729
takes_args = ['dir?']
1730
takes_options = ['revision',
1732
help="Show base revision text in conflicts."),
1015
1734
aliases = ['up']
1017
def run(self, dir='.'):
1018
tree = WorkingTree.open_containing(dir)[0]
1736
def run(self, dir=None, revision=None, show_base=None):
1737
if revision is not None and len(revision) != 1:
1738
raise errors.BzrCommandError(gettext(
1739
"bzr update --revision takes exactly one revision"))
1741
tree = WorkingTree.open_containing('.')[0]
1743
tree, relpath = WorkingTree.open_containing(dir)
1746
raise errors.BzrCommandError(gettext(
1747
"bzr update can only update a whole tree, "
1748
"not a file or subdirectory"))
1749
branch = tree.branch
1019
1750
possible_transports = []
1020
master = tree.branch.get_master_branch(
1751
master = branch.get_master_branch(
1021
1752
possible_transports=possible_transports)
1022
1753
if master is not None:
1754
branch_location = master.base
1023
1755
tree.lock_write()
1757
branch_location = tree.branch.base
1025
1758
tree.lock_tree_write()
1759
self.add_cleanup(tree.unlock)
1760
# get rid of the final '/' and be ready for display
1761
branch_location = urlutils.unescape_for_display(
1762
branch_location.rstrip('/'),
1764
existing_pending_merges = tree.get_parent_ids()[1:]
1768
# may need to fetch data into a heavyweight checkout
1769
# XXX: this may take some time, maybe we should display a
1771
old_tip = branch.update(possible_transports)
1772
if revision is not None:
1773
revision_id = revision[0].as_revision_id(branch)
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))
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)
1027
existing_pending_merges = tree.get_parent_ids()[1:]
1028
last_rev = _mod_revision.ensure_null(tree.last_revision())
1029
if last_rev == _mod_revision.ensure_null(
1030
tree.branch.last_revision()):
1031
# may be up to date, check master too.
1032
if master is None or last_rev == _mod_revision.ensure_null(
1033
master.last_revision()):
1034
revno = tree.branch.revision_id_to_revno(last_rev)
1035
note("Tree is up to date at revision %d." % (revno,))
1037
1786
conflicts = tree.update(
1038
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1039
possible_transports=possible_transports)
1040
revno = tree.branch.revision_id_to_revno(
1041
_mod_revision.ensure_null(tree.last_revision()))
1042
note('Updated to revision %d.' % (revno,))
1043
if tree.get_parent_ids()[1:] != existing_pending_merges:
1044
note('Your local commits will now show as pending merges with '
1045
"'bzr status', and can be committed with 'bzr commit'.")
1788
possible_transports=possible_transports,
1789
revision=revision_id,
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")
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'."))
1054
1812
class cmd_info(Command):
1055
"""Show information about a working tree, branch or repository.
1813
__doc__ = """Show information about a working tree, branch or repository.
1057
1815
This command will show all known locations and formats associated to the
1058
tree, branch or repository. Statistical information is included with
1816
tree, branch or repository.
1818
In verbose mode, statistical information is included with each report.
1819
To see extended statistic information, use a verbosity level of 2 or
1820
higher by specifying the verbose option multiple times, e.g. -vv.
1061
1822
Branches and working trees will also report any missing revisions.
1826
Display information on the format and related locations:
1830
Display the above together with extended format information and
1831
basic statistics (like the number of files in the working tree and
1832
number of revisions in the branch and repository):
1836
Display the above together with number of committers to the branch:
1063
1840
_see_also = ['revno', 'working-trees', 'repositories']
1064
1841
takes_args = ['location?']
1304
2095
to_transport.ensure_base()
1305
2096
except errors.NoSuchFile:
1306
2097
if not create_prefix:
1307
raise errors.BzrCommandError("Parent directory of %s"
2098
raise errors.BzrCommandError(gettext("Parent directory of %s"
1308
2099
" does not exist."
1309
2100
"\nYou may supply --create-prefix to create all"
1310
" leading parent directories."
2101
" leading parent directories.")
1312
_create_prefix(to_transport)
2103
to_transport.create_prefix()
1315
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2106
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1316
2107
except errors.NotBranchError:
1317
2108
# really a NotBzrDir error...
1318
create_branch = bzrdir.BzrDir.create_branch_convenience
2109
create_branch = controldir.ControlDir.create_branch_convenience
2111
force_new_tree = False
2113
force_new_tree = None
1319
2114
branch = create_branch(to_transport.base, format=format,
1320
possible_transports=[to_transport])
2115
possible_transports=[to_transport],
2116
force_new_tree=force_new_tree)
2117
a_bzrdir = branch.bzrdir
1322
2119
from bzrlib.transport.local import LocalTransport
1323
if existing_bzrdir.has_branch():
2120
if a_bzrdir.has_branch():
1324
2121
if (isinstance(to_transport, LocalTransport)
1325
and not existing_bzrdir.has_workingtree()):
2122
and not a_bzrdir.has_workingtree()):
1326
2123
raise errors.BranchExistsWithoutWorkingTree(location)
1327
2124
raise errors.AlreadyBranchError(location)
1329
branch = existing_bzrdir.create_branch()
1330
existing_bzrdir.create_workingtree()
2125
branch = a_bzrdir.create_branch()
2126
if not no_tree and not a_bzrdir.has_workingtree():
2127
a_bzrdir.create_workingtree()
1331
2128
if append_revisions_only:
1333
2130
branch.set_append_revisions_only(True)
1334
2131
except errors.UpgradeRequired:
1335
raise errors.BzrCommandError('This branch format cannot be set'
1336
' to append-revisions-only. Try --experimental-branch6')
2132
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2133
' to append-revisions-only. Try --default.'))
1337
2134
if not is_quiet():
1338
from bzrlib.info import show_bzrdir_info
1339
show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
1340
to_transport)[0], verbose=0, outfile=self.outf)
2135
from bzrlib.info import describe_layout, describe_format
2137
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2138
except (errors.NoWorkingTree, errors.NotLocalUrl):
2140
repository = branch.repository
2141
layout = describe_layout(repository, branch, tree).lower()
2142
format = describe_format(a_bzrdir, repository, branch, tree)
2143
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2145
if repository.is_shared():
2146
#XXX: maybe this can be refactored into transport.path_or_url()
2147
url = repository.bzrdir.root_transport.external_url()
2149
url = urlutils.local_path_from_url(url)
2150
except errors.InvalidURL:
2152
self.outf.write(gettext("Using shared repository: %s\n") % url)
1343
2155
class cmd_init_repository(Command):
1344
"""Create a shared repository to hold branches.
2156
__doc__ = """Create a shared repository for branches to share storage space.
1346
2158
New branches created under the repository directory will store their
1347
revisions in the repository, not in the branch directory.
2159
revisions in the repository, not in the branch directory. For branches
2160
with shared history, this reduces the amount of storage needed and
2161
speeds up the creation of new branches.
1349
If the --no-trees option is used then the branches in the repository
1350
will not have working trees by default.
2163
If the --no-trees option is given then the branches in the repository
2164
will not have working trees by default. They will still exist as
2165
directories on disk, but they will not have separate copies of the
2166
files at a certain revision. This can be useful for repositories that
2167
store branches which are interacted with through checkouts or remote
2168
branches, such as on a server.
1353
Create a shared repositories holding just branches::
2171
Create a shared repository holding just branches::
1355
2173
bzr init-repo --no-trees repo
1356
2174
bzr init repo/trunk
1625
2478
return int(limitstring)
1626
2479
except ValueError:
1627
msg = "The limit argument must be an integer."
2480
msg = gettext("The limit argument must be an integer.")
2481
raise errors.BzrCommandError(msg)
2484
def _parse_levels(s):
2488
msg = gettext("The levels argument must be an integer.")
1628
2489
raise errors.BzrCommandError(msg)
1631
2492
class cmd_log(Command):
1632
"""Show log of a branch, file, or directory.
1634
By default show the log of the branch containing the working directory.
1636
To request a range of logs, you can use the command -r begin..end
1637
-r revision requests a specific revision, -r ..end or -r begin.. are
1641
Log the current branch::
1649
Log the last 10 revisions of a branch::
1651
bzr log -r -10.. http://server/branch
2493
__doc__ = """Show historical log for a branch or subset of a branch.
2495
log is bzr's default tool for exploring the history of a branch.
2496
The branch to use is taken from the first parameter. If no parameters
2497
are given, the branch containing the working directory is logged.
2498
Here are some simple examples::
2500
bzr log log the current branch
2501
bzr log foo.py log a file in its branch
2502
bzr log http://server/branch log a branch on a server
2504
The filtering, ordering and information shown for each revision can
2505
be controlled as explained below. By default, all revisions are
2506
shown sorted (topologically) so that newer revisions appear before
2507
older ones and descendants always appear before ancestors. If displayed,
2508
merged revisions are shown indented under the revision in which they
2513
The log format controls how information about each revision is
2514
displayed. The standard log formats are called ``long``, ``short``
2515
and ``line``. The default is long. See ``bzr help log-formats``
2516
for more details on log formats.
2518
The following options can be used to control what information is
2521
-l N display a maximum of N revisions
2522
-n N display N levels of revisions (0 for all, 1 for collapsed)
2523
-v display a status summary (delta) for each revision
2524
-p display a diff (patch) for each revision
2525
--show-ids display revision-ids (and file-ids), not just revnos
2527
Note that the default number of levels to display is a function of the
2528
log format. If the -n option is not used, the standard log formats show
2529
just the top level (mainline).
2531
Status summaries are shown using status flags like A, M, etc. To see
2532
the changes explained using words like ``added`` and ``modified``
2533
instead, use the -vv option.
2537
To display revisions from oldest to newest, use the --forward option.
2538
In most cases, using this option will have little impact on the total
2539
time taken to produce a log, though --forward does not incrementally
2540
display revisions like --reverse does when it can.
2542
:Revision filtering:
2544
The -r option can be used to specify what revision or range of revisions
2545
to filter against. The various forms are shown below::
2547
-rX display revision X
2548
-rX.. display revision X and later
2549
-r..Y display up to and including revision Y
2550
-rX..Y display from X to Y inclusive
2552
See ``bzr help revisionspec`` for details on how to specify X and Y.
2553
Some common examples are given below::
2555
-r-1 show just the tip
2556
-r-10.. show the last 10 mainline revisions
2557
-rsubmit:.. show what's new on this branch
2558
-rancestor:path.. show changes since the common ancestor of this
2559
branch and the one at location path
2560
-rdate:yesterday.. show changes since yesterday
2562
When logging a range of revisions using -rX..Y, log starts at
2563
revision Y and searches back in history through the primary
2564
("left-hand") parents until it finds X. When logging just the
2565
top level (using -n1), an error is reported if X is not found
2566
along the way. If multi-level logging is used (-n0), X may be
2567
a nested merge revision and the log will be truncated accordingly.
2571
If parameters are given and the first one is not a branch, the log
2572
will be filtered to show only those revisions that changed the
2573
nominated files or directories.
2575
Filenames are interpreted within their historical context. To log a
2576
deleted file, specify a revision range so that the file existed at
2577
the end or start of the range.
2579
Historical context is also important when interpreting pathnames of
2580
renamed files/directories. Consider the following example:
2582
* revision 1: add tutorial.txt
2583
* revision 2: modify tutorial.txt
2584
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
2588
* ``bzr log guide.txt`` will log the file added in revision 1
2590
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2592
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2593
the original file in revision 2.
2595
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2596
was no file called guide.txt in revision 2.
2598
Renames are always followed by log. By design, there is no need to
2599
explicitly ask for this (and no way to stop logging a file back
2600
until it was last renamed).
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.
2612
GUI tools and IDEs are often better at exploring history than command
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>.
2618
You may find it useful to add the aliases below to ``bazaar.conf``::
2622
top = log -l10 --line
2625
``bzr tip`` will then show the latest revision while ``bzr top``
2626
will show the last 10 mainline revisions. To see the details of a
2627
particular revision X, ``bzr show -rX``.
2629
If you are interested in looking deeper into a particular merge X,
2630
use ``bzr log -n0 -rX``.
2632
``bzr log -v`` on a branch with lots of history is currently
2633
very slow. A fix for this issue is currently under development.
2634
With or without that fix, it is recommended that a revision range
2635
be given when using the -v option.
2637
bzr has a generic full-text matching plugin, bzr-search, that can be
2638
used to find revisions matching user names, commit messages, etc.
2639
Among other features, this plugin can find all revisions containing
2640
a list of words but not others.
2642
When exploring non-mainline history on large projects with deep
2643
history, the performance of log can be greatly improved by installing
2644
the historycache plugin. This plugin buffers historical information
2645
trading disk space for faster speed.
1654
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1656
takes_args = ['location?']
2647
takes_args = ['file*']
2648
_see_also = ['log-formats', 'revisionspec']
1657
2649
takes_options = [
1658
2650
Option('forward',
1659
2651
help='Show from oldest to newest.'),
1662
help='Display timezone as local, original, or utc.'),
1663
2653
custom_help('verbose',
1664
2654
help='Show files changed in each revision.'),
2658
type=bzrlib.option._parse_revision_str,
2660
help='Show just the specified revision.'
2661
' See also "help revisionspec".'),
2663
RegistryOption('authors',
2664
'What names to list as authors - first, all or committer.',
2666
lazy_registry=('bzrlib.log', 'author_list_registry'),
2670
help='Number of levels to display - 0 for all, 1 for flat.',
2672
type=_parse_levels),
1668
2673
Option('message',
1670
2674
help='Show revisions whose message matches this '
1671
2675
'regular expression.',
1673
2678
Option('limit',
1674
2679
short_name='l',
1675
2680
help='Limit the output to the first N revisions.',
1677
2682
type=_parse_limit),
2685
help='Show changes made in each revision as a patch.'),
2686
Option('include-merged',
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).'
2696
Option('signatures',
2697
help='Show digital signature validity.'),
2700
help='Show revisions whose properties match this '
2703
ListOption('match-message',
2704
help='Show revisions whose message matches this '
2707
ListOption('match-committer',
2708
help='Show revisions whose committer matches this '
2711
ListOption('match-author',
2712
help='Show revisions whose authors match this '
2715
ListOption('match-bugs',
2716
help='Show revisions whose bugs match this '
1679
2720
encoding_type = 'replace'
1681
2722
@display_command
1682
def run(self, location=None, timezone='original',
2723
def run(self, file_list=None, timezone='original',
1684
2725
show_ids=False,
1687
2729
log_format=None,
1690
from bzrlib.log import show_log
2734
include_merged=None,
2736
exclude_common_ancestry=False,
2740
match_committer=None,
2744
include_merges=symbol_versioning.DEPRECATED_PARAMETER,
2746
from bzrlib.log import (
2748
make_log_request_dict,
2749
_get_info_for_log_files,
1691
2751
direction = (forward and 'forward') or 'reverse'
1696
# find the file id to log:
1698
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1702
tree = b.basis_tree()
1703
file_id = tree.path2id(fp)
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
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'))
2775
raise errors.BzrCommandError(gettext(
2776
'{0} and {1} are mutually exclusive').format(
2777
'--levels', '--include-merged'))
2779
if change is not None:
2781
raise errors.RangeInChangeOption()
2782
if revision is not None:
2783
raise errors.BzrCommandError(gettext(
2784
'{0} and {1} are mutually exclusive').format(
2785
'--revision', '--change'))
2790
filter_by_dir = False
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:
1704
2796
if file_id is None:
1705
raise errors.BzrCommandError(
1706
"Path does not have any revision history: %s" %
2797
raise errors.BzrCommandError(gettext(
2798
"Path unknown at end or start of revision range: %s") %
2800
# If the relpath is the top of the tree, we log everything
2805
file_ids.append(file_id)
2806
filter_by_dir = filter_by_dir or (
2807
kind in ['directory', 'tree-reference'])
1710
# FIXME ? log the current subdir only RBC 20060203
2810
# FIXME ? log the current subdir only RBC 20060203
1711
2811
if revision is not None \
1712
2812
and len(revision) > 0 and revision[0].get_branch():
1713
2813
location = revision[0].get_branch()
1716
dir, relpath = bzrdir.BzrDir.open_containing(location)
2816
dir, relpath = controldir.ControlDir.open_containing(location)
1717
2817
b = dir.open_branch()
1721
if revision is None:
1724
elif len(revision) == 1:
1725
rev1 = rev2 = revision[0].in_history(b)
1726
elif len(revision) == 2:
1727
if revision[1].get_branch() != revision[0].get_branch():
1728
# b is taken from revision[0].get_branch(), and
1729
# show_log will use its revision_history. Having
1730
# different branches will lead to weird behaviors.
1731
raise errors.BzrCommandError(
1732
"Log doesn't accept two revisions in different"
1734
rev1 = revision[0].in_history(b)
1735
rev2 = revision[1].in_history(b)
1737
raise errors.BzrCommandError(
1738
'bzr log --revision takes one or two values.')
1740
if log_format is None:
1741
log_format = log.log_formatter_registry.get_default(b)
1743
lf = log_format(show_ids=show_ids, to_file=self.outf,
1744
show_timezone=timezone)
1750
direction=direction,
1751
start_revision=rev1,
2818
self.add_cleanup(b.lock_read().unlock)
2819
rev1, rev2 = _get_revision_range(revision, b, self.name())
2821
if b.get_config_stack().get('validate_signatures_in_log'):
2825
if not gpg.GPGStrategy.verify_signatures_available():
2826
raise errors.GpgmeNotInstalled(None)
2828
# Decide on the type of delta & diff filtering to use
2829
# TODO: add an --all-files option to make this configurable & consistent
2837
diff_type = 'partial'
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(),
2851
show_advice=levels is None,
2852
author_list_handler=authors)
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)
2872
match_dict[''] = match
2874
match_dict['message'] = match_message
2876
match_dict['committer'] = match_committer
2878
match_dict['author'] = match_author
2880
match_dict['bugs'] = match_bugs
2882
# Build the LogRequest and execute it
2883
if len(file_ids) == 0:
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,
2893
Logger(b, rqst).show(lf)
2896
def _get_revision_range(revisionspec_list, branch, command_name):
2897
"""Take the input of a revision option and turn it into a revision range.
2899
It returns RevisionInfo objects which can be used to obtain the rev_id's
2900
of the desired revisions. It does some user input validations.
2902
if revisionspec_list is None:
2905
elif len(revisionspec_list) == 1:
2906
rev1 = rev2 = revisionspec_list[0].in_history(branch)
2907
elif len(revisionspec_list) == 2:
2908
start_spec = revisionspec_list[0]
2909
end_spec = revisionspec_list[1]
2910
if end_spec.get_branch() != start_spec.get_branch():
2911
# b is taken from revision[0].get_branch(), and
2912
# show_log will use its revision_history. Having
2913
# different branches will lead to weird behaviors.
2914
raise errors.BzrCommandError(gettext(
2915
"bzr %s doesn't accept two revisions in different"
2916
" branches.") % command_name)
2917
if start_spec.spec is None:
2918
# Avoid loading all the history.
2919
rev1 = RevisionInfo(branch, None, None)
2921
rev1 = start_spec.in_history(branch)
2922
# Avoid loading all of history when we know a missing
2923
# end of range means the last revision ...
2924
if end_spec.spec is None:
2925
last_revno, last_revision_id = branch.last_revision_info()
2926
rev2 = RevisionInfo(branch, last_revno, last_revision_id)
2928
rev2 = end_spec.in_history(branch)
2930
raise errors.BzrCommandError(gettext(
2931
'bzr %s --revision takes one or two values.') % command_name)
2935
def _revision_range_to_revid_range(revision_range):
2938
if revision_range[0] is not None:
2939
rev_id1 = revision_range[0].rev_id
2940
if revision_range[1] is not None:
2941
rev_id2 = revision_range[1].rev_id
2942
return rev_id1, rev_id2
1759
2944
def get_log_format(long=False, short=False, line=False, default='long'):
1760
2945
log_format = default
1779
2964
@display_command
1780
2965
def run(self, filename):
1781
2966
tree, relpath = WorkingTree.open_containing(filename)
2967
file_id = tree.path2id(relpath)
1782
2968
b = tree.branch
1783
file_id = tree.path2id(relpath)
1784
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
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:
1785
2972
self.outf.write("%6d %s\n" % (revno, what))
1788
2975
class cmd_ls(Command):
1789
"""List files in a tree.
2976
__doc__ = """List files in a tree.
1792
2979
_see_also = ['status', 'cat']
1793
2980
takes_args = ['path?']
1794
# TODO: Take a revision or remote path and list that tree instead.
1795
2981
takes_options = [
1798
Option('non-recursive',
1799
help='Don\'t recurse into subdirectories.'),
2984
Option('recursive', short_name='R',
2985
help='Recurse into subdirectories.'),
1800
2986
Option('from-root',
1801
2987
help='Print paths relative to the root of the branch.'),
1802
Option('unknown', help='Print unknown files.'),
2988
Option('unknown', short_name='u',
2989
help='Print unknown files.'),
1803
2990
Option('versioned', help='Print versioned files.',
1804
2991
short_name='V'),
1805
Option('ignored', help='Print ignored files.'),
1807
help='Write an ascii NUL (\\0) separator '
1808
'between files rather than a newline.'),
2992
Option('ignored', short_name='i',
2993
help='Print ignored files.'),
2994
Option('kind', short_name='k',
1810
2995
help='List entries of a particular kind: file, directory, symlink.',
1814
3001
@display_command
1815
3002
def run(self, revision=None, verbose=False,
1816
non_recursive=False, from_root=False,
3003
recursive=False, from_root=False,
1817
3004
unknown=False, versioned=False, ignored=False,
1818
null=False, kind=None, show_ids=False, path=None):
3005
null=False, kind=None, show_ids=False, path=None, directory=None):
1820
3007
if kind and kind not in ('file', 'directory', 'symlink'):
1821
raise errors.BzrCommandError('invalid kind specified')
3008
raise errors.BzrCommandError(gettext('invalid kind specified'))
1823
3010
if verbose and null:
1824
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3011
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
1825
3012
all = not (unknown or versioned or ignored)
1827
3014
selection = {'I':ignored, '?':unknown, 'V':versioned}
1829
3016
if path is None:
1834
raise errors.BzrCommandError('cannot specify both --from-root'
3020
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
1838
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
3023
tree, branch, relpath = \
3024
_open_directory_or_containing_tree_or_branch(fs_path, directory)
3026
# Calculate the prefix to use
1844
if revision is not None:
1845
tree = branch.repository.revision_tree(
1846
revision[0].as_revision_id(branch))
1848
tree = branch.basis_tree()
1852
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1853
if fp.startswith(relpath):
1854
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1855
if non_recursive and '/' in fp:
1857
if not all and not selection[fc]:
1859
if kind is not None and fkind != kind:
1862
kindch = entry.kind_character()
1863
outstring = '%-8s %s%s' % (fc, fp, kindch)
1864
if show_ids and fid is not None:
1865
outstring = "%-50s %s" % (outstring, fid)
1866
self.outf.write(outstring + '\n')
1868
self.outf.write(fp + '\0')
1871
self.outf.write(fid)
1872
self.outf.write('\0')
1880
self.outf.write('%-50s %s\n' % (fp, my_id))
1882
self.outf.write(fp + '\n')
3030
prefix = relpath + '/'
3031
elif fs_path != '.' and not fs_path.endswith('/'):
3032
prefix = fs_path + '/'
3034
if revision is not None or tree is None:
3035
tree = _get_one_revision_tree('ls', revision, branch=branch)
3038
if isinstance(tree, WorkingTree) and tree.supports_views():
3039
view_files = tree.views.lookup_view()
3042
view_str = views.view_display_str(view_files)
3043
note(gettext("Ignoring files outside view. View is %s") % view_str)
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]:
3051
if kind is not None and fkind != kind:
3056
fullpath = osutils.pathjoin(relpath, fp)
3059
views.check_path_in_view(tree, fullpath)
3060
except errors.FileOutsideView:
3065
fp = osutils.pathjoin(prefix, fp)
3066
kindch = entry.kind_character()
3067
outstring = fp + kindch
3068
ui.ui_factory.clear_term()
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')
3075
self.outf.write(fp + '\0')
3078
self.outf.write(fid)
3079
self.outf.write('\0')
3087
self.outf.write('%-50s %s\n' % (outstring, my_id))
3089
self.outf.write(outstring + '\n')
1887
3092
class cmd_unknowns(Command):
1888
"""List unknown files.
3093
__doc__ = """List unknown files.
1892
3097
_see_also = ['ls']
3098
takes_options = ['directory']
1894
3100
@display_command
1896
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():
1897
3103
self.outf.write(osutils.quotefn(f) + '\n')
1900
3106
class cmd_ignore(Command):
1901
"""Ignore specified files or patterns.
3107
__doc__ = """Ignore specified files or patterns.
1903
3109
See ``bzr help patterns`` for details on the syntax of patterns.
3111
If a .bzrignore file does not exist, the ignore command
3112
will create one and add the specified files or patterns to the newly
3113
created file. The ignore command will also automatically add the
3114
.bzrignore file to be versioned. Creating a .bzrignore file without
3115
the use of the ignore command will require an explicit add command.
1905
3117
To remove patterns from the ignore list, edit the .bzrignore file.
1906
3118
After adding, editing or deleting that file either indirectly by
1907
3119
using this command or directly by using an editor, be sure to commit
1910
Note: ignore patterns containing shell wildcards must be quoted from
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.
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.
3132
Patterns prefixed with '!!' act as regular ignore patterns, but have
3133
precedence over the '!' exception patterns.
3137
* Ignore patterns containing shell wildcards must be quoted from
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.
1914
3144
Ignore the top level Makefile::
1916
3146
bzr ignore ./Makefile
1918
Ignore class files in all directories::
3148
Ignore .class files in all directories...::
1920
3150
bzr ignore "*.class"
3152
...but do not ignore "special.class"::
3154
bzr ignore "!special.class"
3156
Ignore files whose name begins with the "#" character::
1922
3160
Ignore .o files under the lib directory::
1924
3162
bzr ignore "lib/**/*.o"
2050
3309
================= =========================
2052
3312
takes_args = ['dest', 'branch_or_subdir?']
3313
takes_options = ['directory',
2054
3314
Option('format',
2055
3315
help="Type of file to export to.",
3318
Option('filters', help='Apply content filters to export the '
3319
'convenient form.'),
2060
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 '
2062
3330
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3331
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2064
3333
from bzrlib.export import export
2066
3335
if branch_or_subdir is None:
2067
tree = WorkingTree.open_containing(u'.')[0]
2071
b, subdir = Branch.open_containing(branch_or_subdir)
2073
if revision is None:
2074
# should be tree.last_revision FIXME
2075
rev_id = b.last_revision()
2077
if len(revision) != 1:
2078
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2079
rev_id = revision[0].as_revision_id(b)
2080
t = b.repository.revision_tree(rev_id)
3336
branch_or_subdir = directory
3338
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3340
if tree is not None:
3341
self.add_cleanup(tree.lock_read().unlock)
3345
raise errors.BzrCommandError(
3346
gettext("--uncommitted requires a working tree"))
3349
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2082
export(t, dest, format, root, subdir)
3351
export(export_tree, dest, format, root, subdir, filtered=filters,
3352
per_file_timestamps=per_file_timestamps)
2083
3353
except errors.NoSuchExportFormat, e:
2084
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
raise errors.BzrCommandError(
3355
gettext('Unsupported export format: %s') % e.format)
2087
3358
class cmd_cat(Command):
2088
"""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.
2090
3361
If no revision is nominated, the last revision is used.
2092
3363
Note: Take care to redirect standard output when using this command on a
2096
3367
_see_also = ['ls']
3368
takes_options = ['directory',
2098
3369
Option('name-from-revision', help='The path name in the old tree.'),
3370
Option('filters', help='Apply content filters to display the '
3371
'convenience form.'),
2101
3374
takes_args = ['filename']
2102
3375
encoding_type = 'exact'
2104
3377
@display_command
2105
def run(self, filename, revision=None, name_from_revision=False):
3378
def run(self, filename, revision=None, name_from_revision=False,
3379
filters=False, directory=None):
2106
3380
if revision is not None and len(revision) != 1:
2107
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2108
" one revision specifier")
3381
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3382
" one revision specifier"))
2109
3383
tree, branch, relpath = \
2110
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2113
return self._run(tree, branch, relpath, filename, revision,
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)
2118
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
3389
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2119
3391
if tree is None:
2120
3392
tree = b.basis_tree()
2121
if revision is None:
2122
revision_id = b.last_revision()
2124
revision_id = revision[0].as_revision_id(b)
3393
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3394
self.add_cleanup(rev_tree.lock_read().unlock)
2126
cur_file_id = tree.path2id(relpath)
2127
rev_tree = b.repository.revision_tree(revision_id)
2128
3396
old_file_id = rev_tree.path2id(relpath)
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
2130
3402
if name_from_revision:
3403
# Try in revision if requested
2131
3404
if old_file_id is None:
2132
raise errors.BzrCommandError("%r is not present in revision %s"
2133
% (filename, revision_id))
2135
content = rev_tree.get_file_text(old_file_id)
2136
elif cur_file_id is not None:
2137
content = rev_tree.get_file_text(cur_file_id)
2138
elif old_file_id is not None:
2139
content = rev_tree.get_file_text(old_file_id)
2141
raise errors.BzrCommandError("%r is not present in revision %s" %
2142
(filename, revision_id))
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
3407
filename, rev_tree.get_revision_id()))
3409
actual_file_id = old_file_id
3411
cur_file_id = tree.path2id(relpath)
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
3417
raise errors.BzrCommandError(gettext(
3418
"{0!r} is not present in revision {1}").format(
3419
filename, rev_tree.get_revision_id()))
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)
3426
content = rev_tree.get_file_text(actual_file_id)
2143
3428
self.outf.write(content)
2146
3431
class cmd_local_time_offset(Command):
2147
"""Show the offset in seconds from GMT to local time."""
3432
__doc__ = """Show the offset in seconds from GMT to local time."""
2149
3434
@display_command
2151
print osutils.local_time_offset()
3436
self.outf.write("%s\n" % osutils.local_time_offset())
2155
3440
class cmd_commit(Command):
2156
"""Commit changes into a new revision.
2158
If no arguments are given, the entire tree is committed.
2160
If selected files are specified, only changes to those files are
2161
committed. If a directory is specified then the directory and everything
2162
within it is committed.
2164
When excludes are given, they take precedence over selected files.
2165
For example, too commit only changes within foo, but not changes within
2168
bzr commit foo -x foo/bar
2170
If author of the change is not the same person as the committer, you can
2171
specify the author's name using the --author option. The name should be
2172
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2174
A selected-file commit may fail in some cases where the committed
2175
tree would be invalid. Consider::
2180
bzr commit foo -m "committing foo"
2181
bzr mv foo/bar foo/baz
2184
bzr commit foo/bar -m "committing bar but not baz"
2186
In the example above, the last commit will fail by design. This gives
2187
the user the opportunity to decide whether they want to commit the
2188
rename at the same time, separately first, or not at all. (As a general
2189
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2191
Note: A selected-file commit after a merge is not yet supported.
3441
__doc__ = """Commit changes into a new revision.
3443
An explanatory message needs to be given for each commit. This is
3444
often done by using the --message option (getting the message from the
3445
command line) or by using the --file option (getting the message from
3446
a file). If neither of these options is given, an editor is opened for
3447
the user to enter the message. To see the changed files in the
3448
boilerplate text loaded into the editor, use the --show-diff option.
3450
By default, the entire tree is committed and the person doing the
3451
commit is assumed to be the author. These defaults can be overridden
3456
If selected files are specified, only changes to those files are
3457
committed. If a directory is specified then the directory and
3458
everything within it is committed.
3460
When excludes are given, they take precedence over selected files.
3461
For example, to commit only changes within foo, but not changes
3464
bzr commit foo -x foo/bar
3466
A selective commit after a merge is not yet supported.
3470
If the author of the change is not the same person as the committer,
3471
you can specify the author's name using the --author option. The
3472
name should be in the same format as a committer-id, e.g.
3473
"John Doe <jdoe@example.com>". If there is more than one author of
3474
the change you can specify the option multiple times, once for each
3479
A common mistake is to forget to add a new file or directory before
3480
running the commit command. The --strict option checks for unknown
3481
files and aborts the commit if any are found. More advanced pre-commit
3482
checks can be implemented by defining hooks. See ``bzr help hooks``
3487
If you accidentially commit the wrong changes or make a spelling
3488
mistake in the commit message say, you can use the uncommit command
3489
to undo it. See ``bzr help uncommit`` for details.
3491
Hooks can also be configured to run after a commit. This allows you
3492
to trigger updates to external systems like bug trackers. The --fixes
3493
option can be used to record the association between a revision and
3494
one or more bugs. See ``bzr help bugs`` for details.
2193
# TODO: Run hooks on tree to-be-committed, and after commit.
2195
# TODO: Strict commit that fails if there are deleted files.
2196
# (what does "deleted files" mean ??)
2198
# TODO: Give better message for -s, --summary, used by tla people
2200
# XXX: verbose currently does nothing
2202
_see_also = ['bugs', 'uncommit']
3497
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
2203
3498
takes_args = ['selected*']
2204
3499
takes_options = [
2205
3500
ListOption('exclude', type=str, short_name='x',
2287
3608
if fixes is None:
2289
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
3610
bug_property = bugtracker.encode_fixes_bug_urls(
3611
self._iter_bug_fix_urls(fixes, tree.branch))
2290
3612
if bug_property:
2291
3613
properties['bugs'] = bug_property
2293
3615
if local and not tree.branch.get_bound_location():
2294
3616
raise errors.LocalRequiresBoundBranch()
3618
if message is not None:
3620
file_exists = osutils.lexists(message)
3621
except UnicodeError:
3622
# The commit message contains unicode characters that can't be
3623
# represented in the filesystem encoding, so that can't be a
3628
'The commit message is a file name: "%(f)s".\n'
3629
'(use --file "%(f)s" to take commit message from that file)'
3631
ui.ui_factory.show_warning(warning_msg)
3633
message = message.replace('\r\n', '\n')
3634
message = message.replace('\r', '\n')
3636
raise errors.BzrCommandError(gettext(
3637
"please specify either --message or --file"))
2296
3639
def get_message(commit_obj):
2297
3640
"""Callback to get commit message"""
2298
my_message = message
2299
if my_message is None and not file:
2300
t = make_commit_message_template_encoded(tree,
3644
my_message = f.read().decode(osutils.get_user_encoding())
3647
elif message is not None:
3648
my_message = message
3650
# No message supplied: make one up.
3651
# text is the status of the tree
3652
text = make_commit_message_template_encoded(tree,
2301
3653
selected_list, diff=show_diff,
2302
output_encoding=bzrlib.user_encoding)
2303
my_message = edit_commit_message_encoded(t)
2304
if my_message is None:
2305
raise errors.BzrCommandError("please specify a commit"
2306
" message with either --message or --file")
2307
elif my_message and file:
2308
raise errors.BzrCommandError(
2309
"please specify either --message or --file")
2311
my_message = codecs.open(file, 'rt',
2312
bzrlib.user_encoding).read()
2313
if my_message == "":
2314
raise errors.BzrCommandError("empty commit message specified")
3654
output_encoding=osutils.get_user_encoding())
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
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 \"\"."))
2315
3673
return my_message
3675
# The API permits a commit with a filter of [] to mean 'select nothing'
3676
# but the command line should not do that.
3677
if not selected_list:
3678
selected_list = None
2318
3680
tree.commit(message_callback=get_message,
2319
3681
specific_files=selected_list,
2320
3682
allow_pointless=unchanged, strict=strict, local=local,
2321
3683
reporter=None, verbose=verbose, revprops=properties,
2323
exclude=safe_relpath_files(tree, exclude))
3684
authors=author, timestamp=commit_stamp,
3686
exclude=tree.safe_relpath_files(exclude),
2324
3688
except PointlessCommit:
2325
# FIXME: This should really happen before the file is read in;
2326
# perhaps prepare the commit; get the message; then actually commit
2327
raise errors.BzrCommandError("no changes to commit."
2328
" 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."))
2329
3692
except ConflictsInTree:
2330
raise errors.BzrCommandError('Conflicts detected in working '
3693
raise errors.BzrCommandError(gettext('Conflicts detected in working '
2331
3694
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2333
3696
except StrictCommitFailed:
2334
raise errors.BzrCommandError("Commit refused because there are"
2335
" unknown files in the working tree.")
3697
raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
" unknown files in the working tree."))
2336
3699
except errors.BoundBranchOutOfDate, e:
2337
raise errors.BzrCommandError(str(e) + "\n"
2338
'To commit to master branch, run update and then commit.\n'
2339
'You can also pass --local to commit to continue working '
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 '
2343
3707
class cmd_check(Command):
2344
"""Validate working tree structure, branch consistency and repository history.
3708
__doc__ = """Validate working tree structure, branch consistency and repository history.
2346
3710
This command checks various invariants about branch and repository storage
2347
3711
to detect data corruption or bzr bugs.
2670
4109
param_name='starting_with', short_name='s',
2672
4111
'Load only the tests starting with TESTID.'),
4113
help="By default we disable fsync and fdatasync"
4114
" while running the test suite.")
2674
4116
encoding_type = 'replace'
4119
Command.__init__(self)
4120
self.additional_selftest_args = {}
2676
4122
def run(self, testspecs_list=None, verbose=False, one=False,
2677
4123
transport=None, benchmark=None,
2678
lsprof_timed=None, cache_dir=None,
2679
4125
first=False, list_only=False,
2680
4126
randomize=None, exclude=None, strict=False,
2681
load_list=None, debugflag=None, starting_with=None):
2683
from bzrlib.tests import selftest
2684
import bzrlib.benchmarks as benchmarks
2685
from bzrlib.benchmarks import tree_creator
2687
# Make deprecation warnings visible, unless -Werror is set
2688
symbol_versioning.activate_deprecation_warnings(override=False)
2690
if cache_dir is not None:
2691
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2693
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2694
print ' %s (%s python%s)' % (
2696
bzrlib.version_string,
2697
bzrlib._format_version_tuple(sys.version_info),
4127
load_list=None, debugflag=None, starting_with=None, subunit=False,
4128
parallel=None, lsprof_tests=False,
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
4137
lazy_import.disallow_proxying()
4139
from bzrlib import tests
2700
4141
if testspecs_list is not None:
2701
4142
pattern = '|'.join(testspecs_list)
4147
from bzrlib.tests import SubUnitBzrRunner
4149
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4150
"needs to be installed to use --subunit."))
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):
4160
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4162
self.additional_selftest_args.setdefault(
4163
'suite_decorators', []).append(parallel)
2705
test_suite_factory = benchmarks.test_suite
2706
# Unless user explicitly asks for quiet, be verbose in benchmarks
2707
verbose = not is_quiet()
2708
# TODO: should possibly lock the history file...
2709
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
4170
exclude_pattern = None
2711
test_suite_factory = None
4172
exclude_pattern = '(' + '|'.join(exclude) + ')'
4174
self._disable_fsync()
4175
selftest_kwargs = {"verbose": verbose,
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,
4187
"load_list": load_list,
4188
"debug_flags": debugflag,
4189
"starting_with": starting_with
4191
selftest_kwargs.update(self.additional_selftest_args)
4193
# Make deprecation warnings visible, unless -Werror is set
4194
cleanup = symbol_versioning.activate_deprecation_warnings(
2714
result = selftest(verbose=verbose,
2716
stop_on_failure=one,
2717
transport=transport,
2718
test_suite_factory=test_suite_factory,
2719
lsprof_timed=lsprof_timed,
2720
bench_history=benchfile,
2721
matching_tests_first=first,
2722
list_only=list_only,
2723
random_seed=randomize,
2724
exclude_pattern=exclude,
2726
load_list=load_list,
2727
debug_flags=debugflag,
2728
starting_with=starting_with,
4197
result = tests.selftest(**selftest_kwargs)
2731
if benchfile is not None:
2734
note('tests passed')
2736
note('tests failed')
2737
4200
return int(not result)
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
2740
4212
class cmd_version(Command):
2741
"""Show version of bzr."""
4213
__doc__ = """Show version of bzr."""
2743
4215
encoding_type = 'replace'
2744
4216
takes_options = [
2757
4229
class cmd_rocks(Command):
2758
"""Statement of optimism."""
4230
__doc__ = """Statement of optimism."""
2762
4234
@display_command
2764
print "It sure does!"
4236
self.outf.write(gettext("It sure does!\n"))
2767
4239
class cmd_find_merge_base(Command):
2768
"""Find and print a base revision for merging two branches."""
4240
__doc__ = """Find and print a base revision for merging two branches."""
2769
4241
# TODO: Options to specify revisions on either side, as if
2770
4242
# merging only part of the history.
2771
4243
takes_args = ['branch', 'other']
2774
4246
@display_command
2775
4247
def run(self, branch, other):
2776
4248
from bzrlib.revision import ensure_null
2778
4250
branch1 = Branch.open_containing(branch)[0]
2779
4251
branch2 = Branch.open_containing(other)[0]
2784
last1 = ensure_null(branch1.last_revision())
2785
last2 = ensure_null(branch2.last_revision())
2787
graph = branch1.repository.get_graph(branch2.repository)
2788
base_rev_id = graph.find_unique_lca(last1, last2)
2790
print 'merge base is revision %s' % base_rev_id
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())
4257
graph = branch1.repository.get_graph(branch2.repository)
4258
base_rev_id = graph.find_unique_lca(last1, last2)
4260
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
2797
4263
class cmd_merge(Command):
2798
"""Perform a three-way merge.
4264
__doc__ = """Perform a three-way merge.
2800
4266
The source of the merge can be specified either in the form of a branch,
2801
4267
or in the form of a path to a file containing a merge directive generated
2802
4268
with bzr send. If neither is specified, the default is the upstream branch
2803
or the branch most recently merged using --remember.
2805
When merging a branch, by default the tip will be merged. To pick a different
2806
revision, pass --revision. If you specify two values, the first will be used as
2807
BASE and the second one as OTHER. Merging individual revisions, or a subset of
2808
available revisions, like this is commonly referred to as "cherrypicking".
2810
Revision numbers are always relative to the branch being merged.
2812
By default, bzr will try to merge in all new work from the other
2813
branch, automatically determining an appropriate base. If this
2814
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.
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.
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.
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.
4289
Revision numbers are always relative to the source branch.
2816
4291
Merge will do its best to combine the changes in two branches, but there
2817
4292
are some kinds of problems only a human can fix. When it encounters those,
2818
4293
it will mark a conflict. A conflict means that you need to fix something,
2819
before you should commit.
4294
before you can commit.
2821
4296
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2823
If there is no default branch set, the first merge will set it. After
2824
that, you can omit the branch to use the default. To change the
2825
default, use --remember. The value will only be saved if the remote
2826
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.
2828
4303
The results of the merge are placed into the destination working
2829
4304
directory, where they can be reviewed (with bzr diff), tested, and then
2830
4305
committed to record the result of the merge.
2832
4307
merge refuses to run if there are any uncommitted changes, unless
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.
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
4317
To select only some changes to merge, use "merge -i", which will prompt
4318
you to apply each diff hunk and file change, similar to "shelve".
2836
To merge the latest revision from bzr.dev::
4321
To merge all new revisions from bzr.dev::
2838
4323
bzr merge ../bzr.dev
2893
4386
allow_pending = True
2894
4387
verified = 'inapplicable'
2895
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'))
4395
basis_tree = tree.revision_tree(tree.last_revision())
4396
except errors.NoSuchRevision:
4397
basis_tree = tree.basis_tree()
4399
# die as quickly as possible if there are uncommitted changes
4401
if tree.has_changes():
4402
raise errors.UncommittedChanges(tree)
4404
view_info = _get_view_info_for_change_reporter(tree)
2896
4405
change_reporter = delta._ChangeReporter(
2897
unversioned_filter=tree.is_ignored)
2900
pb = ui.ui_factory.nested_progress_bar()
2901
cleanups.append(pb.finished)
2903
cleanups.append(tree.unlock)
2904
if location is not None:
2906
mergeable = bundle.read_mergeable_from_url(location,
2907
possible_transports=possible_transports)
2908
except errors.NotABundle:
2912
raise errors.BzrCommandError('Cannot use --uncommitted'
2913
' with bundles or merge directives.')
2915
if revision is not None:
2916
raise errors.BzrCommandError(
2917
'Cannot use -r with merge directives or bundles')
2918
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2921
if merger is None and uncommitted:
2922
if revision is not None and len(revision) > 0:
2923
raise errors.BzrCommandError('Cannot use --uncommitted and'
2924
' --revision at the same time.')
2925
location = self._select_branch_location(tree, location)[0]
2926
other_tree, other_path = WorkingTree.open_containing(location)
2927
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2929
allow_pending = False
2930
if other_path != '':
2931
merger.interesting_files = [other_path]
2934
merger, allow_pending = self._get_merger_from_branch(tree,
2935
location, revision, remember, possible_transports, pb)
2937
merger.merge_type = merge_type
2938
merger.reprocess = reprocess
2939
merger.show_base = show_base
2940
self.sanity_check_merger(merger)
2941
if (merger.base_rev_id == merger.other_rev_id and
2942
merger.other_rev_id is not None):
2943
note('Nothing to do.')
4406
unversioned_filter=tree.is_ignored, view_info=view_info)
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:
4412
mergeable = bundle.read_mergeable_from_url(location,
4413
possible_transports=possible_transports)
4414
except errors.NotABundle:
4418
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4419
' with bundles or merge directives.'))
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,
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
4435
merger, allow_pending = self._get_merger_from_branch(tree,
4436
location, revision, remember, possible_transports, None)
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.'))
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)
2946
if merger.interesting_files is not None:
2947
raise errors.BzrCommandError('Cannot pull individual files')
2948
if (merger.base_rev_id == tree.last_revision()):
2949
result = tree.pull(merger.other_branch, False,
2950
merger.other_rev_id)
2951
result.report(self.outf)
2953
merger.check_basis(not force)
2955
return self._do_preview(merger)
2957
return self._do_merge(merger, change_reporter, allow_pending,
2960
for cleanup in reversed(cleanups):
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')"))
4466
return self._do_preview(merger)
4468
return self._do_interactive(merger)
4470
return self._do_merge(merger, change_reporter, allow_pending,
4473
def _get_preview(self, merger):
4474
tree_merger = merger.make_merger()
4475
tt = tree_merger.make_preview_transform()
4476
self.add_cleanup(tt.finalize)
4477
result_tree = tt.get_preview_tree()
2963
4480
def _do_preview(self, merger):
2964
4481
from bzrlib.diff import show_diff_trees
2965
tree_merger = merger.make_merger()
2966
tt = tree_merger.make_preview_transform()
2968
result_tree = tt.get_preview_tree()
2969
show_diff_trees(merger.this_tree, result_tree, self.outf,
2970
old_label='', new_label='')
4482
result_tree = self._get_preview(merger)
4483
path_encoding = osutils.get_diff_header_encoding()
4484
show_diff_trees(merger.this_tree, result_tree, self.outf,
4485
old_label='', new_label='',
4486
path_encoding=path_encoding)
2974
4488
def _do_merge(self, merger, change_reporter, allow_pending, verified):
2975
4489
merger.change_reporter = change_reporter
3122
4682
def run(self, file_list=None, merge_type=None, show_base=False,
3123
4683
reprocess=False):
4684
from bzrlib.conflicts import restore
3124
4685
if merge_type is None:
3125
4686
merge_type = _mod_merge.Merge3Merger
3126
tree, file_list = tree_files(file_list)
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"
4694
repository = tree.branch.repository
4695
interesting_ids = None
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)
4703
raise errors.NotVersionedError(filename)
4704
interesting_ids.add(file_id)
4705
if tree.kind(file_id) != "directory":
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]
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:
4723
restore(tree.abspath(filename))
4724
except errors.NotConflicted:
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])
3129
parents = tree.get_parent_ids()
3130
if len(parents) != 2:
3131
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3132
" merges. Not cherrypicking or"
3134
repository = tree.branch.repository
3135
interesting_ids = None
3137
conflicts = tree.conflicts()
3138
if file_list is not None:
3139
interesting_ids = set()
3140
for filename in file_list:
3141
file_id = tree.path2id(filename)
3143
raise errors.NotVersionedError(filename)
3144
interesting_ids.add(file_id)
3145
if tree.kind(file_id) != "directory":
3148
for name, ie in tree.inventory.iter_entries(file_id):
3149
interesting_ids.add(ie.file_id)
3150
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3152
# Remerge only supports resolving contents conflicts
3153
allowed_conflicts = ('text conflict', 'contents conflict')
3154
restore_files = [c.path for c in conflicts
3155
if c.typestring in allowed_conflicts]
3156
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3157
tree.set_conflicts(ConflictList(new_conflicts))
3158
if file_list is not None:
3159
restore_files = file_list
3160
for filename in restore_files:
3162
restore(tree.abspath(filename))
3163
except errors.NotConflicted:
3165
# Disable pending merges, because the file texts we are remerging
3166
# have not had those merges performed. If we use the wrong parents
3167
# list, we imply that the working tree text has seen and rejected
3168
# all the changes from the other tree, when in fact those changes
3169
# have not yet been seen.
3170
pb = ui.ui_factory.nested_progress_bar()
3171
tree.set_parent_ids(parents[:1])
3173
merger = _mod_merge.Merger.from_revision_ids(pb,
3175
merger.interesting_ids = interesting_ids
3176
merger.merge_type = merge_type
3177
merger.show_base = show_base
3178
merger.reprocess = reprocess
3179
conflicts = merger.do_merge()
3181
tree.set_parent_ids(parents)
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()
4740
tree.set_parent_ids(parents)
3185
4741
if conflicts > 0:
3191
4747
class cmd_revert(Command):
3192
"""Revert files to a previous revision.
4749
Set files in the working tree back to the contents of a previous revision.
3194
4751
Giving a list of files will revert only those files. Otherwise, all files
3195
4752
will be reverted. If the revision is not specified with '--revision', the
3196
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.
3198
4757
To remove only some changes, without reverting to a prior version, use
3199
merge instead. For example, "merge . --revision -2..-3" will remove the
3200
changes introduced by -2, without affecting the changes introduced by -1.
3201
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
3203
By default, any files that have been manually changed will be backed up
3204
first. (Files changed only by merge are not backed up.) Backup files have
3205
'.~#~' appended to their name, where # is a number.
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
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.
3207
4771
When you provide files, you can use their current pathname or the pathname
3208
4772
from the target revision. So you can use revert to "undelete" a file by
3209
4773
name. If you name a directory, all the contents of that directory will be
3212
Any files that have been newly added since that revision will be deleted,
3213
with a backup kept if appropriate. Directories containing unknown files
3214
will not be deleted.
4776
If you have newly added files since the target revision, they will be
4777
removed. If the files to be removed have been changed, backups will be
4778
created as above. Directories containing unknown files will not be
3216
The working tree contains a list of pending merged revisions, which will
3217
be included as parents in the next commit. Normally, revert clears that
3218
list as well as reverting the files. If any files are specified, revert
3219
leaves the pending merge list alone and reverts only the files. Use "bzr
3220
revert ." in the tree root to revert all files but keep the merge record,
3221
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
3222
4788
reverting any files.
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
3225
_see_also = ['cat', 'export']
4801
_see_also = ['cat', 'export', 'merge', 'shelve']
3226
4802
takes_options = [
3228
4804
Option('no-backup', "Do not save backups of reverted files."),
3288
4855
class cmd_shell_complete(Command):
3289
"""Show appropriate completions for context.
4856
__doc__ = """Show appropriate completions for context.
3291
4858
For a list of all available commands, say 'bzr shell-complete'.
3293
4860
takes_args = ['context?']
3294
4861
aliases = ['s-c']
3297
4864
@display_command
3298
4865
def run(self, context=None):
3299
import shellcomplete
4866
from bzrlib import shellcomplete
3300
4867
shellcomplete.shellcomplete(context)
3303
4870
class cmd_missing(Command):
3304
"""Show unmerged/unpulled revisions between two branches.
4871
__doc__ = """Show unmerged/unpulled revisions between two branches.
3306
4873
OTHER_BRANCH may be local or remote.
4875
To filter on a range of revisions, you can use the command -r begin..end
4876
-r revision requests a specific revision, -r ..end or -r begin.. are
4880
1 - some missing revisions
4881
0 - no missing revisions
4885
Determine the missing revisions between this and the branch at the
4886
remembered pull location::
4890
Determine the missing revisions between this and another branch::
4892
bzr missing http://server/branch
4894
Determine the missing revisions up to a specific revision on the other
4897
bzr missing -r ..-10
4899
Determine the missing revisions up to a specific revision on this
4902
bzr missing --my-revision ..-10
3309
4905
_see_also = ['merge', 'pull']
3310
4906
takes_args = ['other_branch?']
3311
4907
takes_options = [
3312
Option('reverse', 'Reverse the order of revisions.'),
3314
'Display changes in the local branch only.'),
3315
Option('this' , 'Same as --mine-only.'),
3316
Option('theirs-only',
3317
'Display changes in the remote branch only.'),
3318
Option('other', 'Same as --theirs-only.'),
4909
Option('reverse', 'Reverse the order of revisions.'),
4911
'Display changes in the local branch only.'),
4912
Option('this' , 'Same as --mine-only.'),
4913
Option('theirs-only',
4914
'Display changes in the remote branch only.'),
4915
Option('other', 'Same as --theirs-only.'),
4919
custom_help('revision',
4920
help='Filter on other branch revisions (inclusive). '
4921
'See "help revisionspec" for details.'),
4922
Option('my-revision',
4923
type=_parse_revision_str,
4924
help='Filter on local branch revisions (inclusive). '
4925
'See "help revisionspec" for details.'),
4926
Option('include-merged',
4927
'Show all revisions in addition to the mainline ones.'),
4928
Option('include-merges', hidden=True,
4929
help='Historical alias for --include-merged.'),
3323
4931
encoding_type = 'replace'
3325
4933
@display_command
3326
4934
def run(self, other_branch=None, reverse=False, mine_only=False,
3327
theirs_only=False, log_format=None, long=False, short=False, line=False,
3328
show_ids=False, verbose=False, this=False, other=False):
4936
log_format=None, long=False, short=False, line=False,
4937
show_ids=False, verbose=False, this=False, other=False,
4938
include_merged=None, revision=None, my_revision=None,
4940
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
3329
4941
from bzrlib.missing import find_unmerged, iter_log_revisions
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
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
3332
4962
mine_only = this
3341
4971
elif theirs_only:
3342
4972
restrict = 'remote'
3344
local_branch = Branch.open_containing(u".")[0]
4974
local_branch = Branch.open_containing(directory)[0]
4975
self.add_cleanup(local_branch.lock_read().unlock)
3345
4977
parent = local_branch.get_parent()
3346
4978
if other_branch is None:
3347
4979
other_branch = parent
3348
4980
if other_branch is None:
3349
raise errors.BzrCommandError("No peer location known"
4981
raise errors.BzrCommandError(gettext("No peer location known"
3351
4983
display_url = urlutils.unescape_for_display(parent,
3352
4984
self.outf.encoding)
3353
self.outf.write("Using saved parent location: "
3354
+ display_url + "\n")
4985
message(gettext("Using saved parent location: {0}\n").format(
3356
4988
remote_branch = Branch.open(other_branch)
3357
4989
if remote_branch.base == local_branch.base:
3358
4990
remote_branch = local_branch
3359
local_branch.lock_read()
3361
remote_branch.lock_read()
3363
local_extra, remote_extra = find_unmerged(
3364
local_branch, remote_branch, restrict)
3366
if log_format is None:
3367
registry = log.log_formatter_registry
3368
log_format = registry.get_default(local_branch)
3369
lf = log_format(to_file=self.outf,
3371
show_timezone='original')
3372
if reverse is False:
3373
if local_extra is not None:
3374
local_extra.reverse()
3375
if remote_extra is not None:
3376
remote_extra.reverse()
3379
if local_extra and not theirs_only:
3380
self.outf.write("You have %d extra revision(s):\n" %
3382
for revision in iter_log_revisions(local_extra,
3383
local_branch.repository,
3385
lf.log_revision(revision)
3386
printed_local = True
3389
printed_local = False
3391
if remote_extra and not mine_only:
3392
if printed_local is True:
3393
self.outf.write("\n\n\n")
3394
self.outf.write("You are missing %d revision(s):\n" %
3396
for revision in iter_log_revisions(remote_extra,
3397
remote_branch.repository,
3399
lf.log_revision(revision)
3402
if mine_only and not local_extra:
3403
# We checked local, and found nothing extra
3404
self.outf.write('This branch is up to date.\n')
3405
elif theirs_only and not remote_extra:
3406
# We checked remote, and found nothing extra
3407
self.outf.write('Other branch is up to date.\n')
3408
elif not (mine_only or theirs_only or local_extra or
3410
# We checked both branches, and neither one had extra
3412
self.outf.write("Branches are up to date.\n")
3414
remote_branch.unlock()
3416
local_branch.unlock()
4992
self.add_cleanup(remote_branch.lock_read().unlock)
4994
local_revid_range = _revision_range_to_revid_range(
4995
_get_revision_range(my_revision, local_branch,
4998
remote_revid_range = _revision_range_to_revid_range(
4999
_get_revision_range(revision,
5000
remote_branch, self.name()))
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)
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,
5014
show_timezone='original')
5017
if local_extra and not theirs_only:
5018
message(ngettext("You have %d extra revision:\n",
5019
"You have %d extra revisions:\n",
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,
5029
lf.log_revision(revision)
5030
printed_local = True
5033
printed_local = False
5035
if remote_extra and not mine_only:
5036
if printed_local is True:
5038
message(ngettext("You are missing %d revision:\n",
5039
"You are missing %d revisions:\n",
5040
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,
5048
lf.log_revision(revision)
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
5059
# We checked both branches, and neither one had extra
5061
message(gettext("Branches are up to date.\n"))
3417
5063
if not status_code and parent is None and other_branch is not None:
3418
local_branch.lock_write()
3420
# handle race conditions - a parent might be set while we run.
3421
if local_branch.get_parent() is None:
3422
local_branch.set_parent(remote_branch.base)
3424
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)
3425
5068
return status_code
3428
5071
class cmd_pack(Command):
3429
"""Compress the data within a repository."""
5072
__doc__ = """Compress the data within a repository.
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.
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
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.
3431
5090
_see_also = ['repositories']
3432
5091
takes_args = ['branch_or_repo?']
5093
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
3434
def run(self, branch_or_repo='.'):
3435
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]
3437
5099
branch = dir.open_branch()
3438
5100
repository = branch.repository
3439
5101
except errors.NotBranchError:
3440
5102
repository = dir.open_repository()
5103
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
3444
5106
class cmd_plugins(Command):
3445
"""List the installed plugins.
5107
__doc__ = """List the installed plugins.
3447
5109
This command displays the list of installed plugins including
3448
5110
version of plugin and a short description of each.
3845
5514
class cmd_serve(Command):
3846
"""Run the bzr server."""
5515
__doc__ = """Run the bzr server."""
3848
5517
aliases = ['server']
3850
5519
takes_options = [
3852
5521
help='Serve on stdin/out for use from inetd or sshd.'),
5522
RegistryOption('protocol',
5523
help="Protocol to serve.",
5524
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5525
value_switches=True),
5527
help='Listen for connections on nominated address.', type=str),
3854
help='Listen for connections on nominated port of the form '
3855
'[hostname:]portnumber. Passing 0 as the port number will '
3856
'result in a dynamically allocated port. The default port is '
3860
help='Serve contents of this directory.',
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.',
5533
custom_help('directory',
5534
help='Serve contents of this directory.'),
3862
5535
Option('allow-writes',
3863
5536
help='By default the server is a readonly server. Supplying '
3864
5537
'--allow-writes enables write access to the contents of '
3865
'the served directory and below.'
5538
'the served directory and below. Note that ``bzr serve`` '
5539
'does not perform authentication, so unless some form of '
5540
'external authentication is arranged supplying this '
5541
'option leads to global uncontrolled write access to your '
5544
Option('client-timeout', type=float,
5545
help='Override the default idle client timeout (5min).'),
3869
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3870
from bzrlib import lockdir
3871
from bzrlib.smart import medium, server
3872
from bzrlib.transport import get_transport
3873
from bzrlib.transport.chroot import ChrootServer
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
3874
5551
if directory is None:
3875
5552
directory = os.getcwd()
3876
url = urlutils.local_path_to_url(directory)
5553
if protocol is None:
5554
protocol = transport.transport_server_registry.get()
5555
url = transport.location_to_url(directory)
3877
5556
if not allow_writes:
3878
5557
url = 'readonly+' + url
3879
chroot_server = ChrootServer(get_transport(url))
3880
chroot_server.setUp()
3881
t = get_transport(chroot_server.get_url())
3883
smart_server = medium.SmartServerPipeStreamMedium(
3884
sys.stdin, sys.stdout, t)
3886
host = medium.BZR_DEFAULT_INTERFACE
3888
port = medium.BZR_DEFAULT_PORT
3891
host, port = port.split(':')
3893
smart_server = server.SmartTCPServer(t, host=host, port=port)
3894
print 'listening on port: ', smart_server.port
3896
# for the duration of this server, no UI output is permitted.
3897
# note that this may cause problems with blackbox tests. This should
3898
# be changed with care though, as we dont want to use bandwidth sending
3899
# progress over stderr to smart server clients!
3900
old_factory = ui.ui_factory
3901
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3903
ui.ui_factory = ui.SilentUIFactory()
3904
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3905
smart_server.serve()
3907
ui.ui_factory = old_factory
3908
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
3911
5562
class cmd_join(Command):
3912
"""Combine a subtree into its containing tree.
3914
This command is for experimental use only. It requires the target tree
3915
to be in dirstate-with-subtree format, which cannot be converted into
5563
__doc__ = """Combine a tree into its containing tree.
5565
This command requires the target tree to be in a rich-root format.
3918
5567
The TREE argument should be an independent tree, inside another tree, but
3919
5568
not part of it. (Such trees can be produced by "bzr split", but also by
3920
5569
running "bzr branch" with the target inside a tree.)
3922
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
3923
5572
part. This is marked as a merge of the subtree into the containing tree,
3924
5573
and all history is preserved.
3926
If --reference is specified, the subtree retains its independence. It can
3927
be branched by itself, and can be part of multiple projects at the same
3928
time. But operations performed in the containing tree, such as commit
3929
and merge, will recurse into the subtree.
3932
5576
_see_also = ['split']
3933
5577
takes_args = ['tree']
3934
5578
takes_options = [
3935
Option('reference', help='Join by reference.'),
5579
Option('reference', help='Join by reference.', hidden=True),
3939
5582
def run(self, tree, reference=False):
3940
5583
sub_tree = WorkingTree.open(tree)
4157
5828
short_name='f',
4159
5830
Option('output', short_name='o',
4160
help='Write merge directive to this file; '
5831
help='Write merge directive to this file or directory; '
4161
5832
'use - for stdout.',
5835
help='Refuse to send if there are uncommitted changes in'
5836
' the working tree, --no-strict disables the check.'),
4163
5837
Option('mail-to', help='Mail the request to this address.',
4167
RegistryOption.from_kwargs('format',
4168
'Use the specified output format.',
4169
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4170
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5841
Option('body', help='Body for the email.', type=unicode),
5842
RegistryOption('format',
5843
help='Use the specified output format.',
5844
lazy_registry=('bzrlib.send', 'format_registry')),
4173
5847
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4174
no_patch=False, revision=None, remember=False, output=None,
4175
format='4', mail_to=None, message=None, **kwargs):
4176
return self._run(submit_branch, revision, public_branch, remember,
4177
format, no_bundle, no_patch, output,
4178
kwargs.get('from', '.'), mail_to, message)
4180
def _run(self, submit_branch, revision, public_branch, remember, format,
4181
no_bundle, no_patch, output, from_, mail_to, message):
4182
from bzrlib.revision import NULL_REVISION
4183
branch = Branch.open_containing(from_)[0]
4185
outfile = StringIO()
4189
outfile = open(output, 'wb')
4190
# we may need to write data into branch's repository to calculate
4195
config = branch.get_config()
4197
mail_to = config.get_user_option('submit_to')
4198
mail_client = config.get_mail_client()
4199
if remember and submit_branch is None:
4200
raise errors.BzrCommandError(
4201
'--remember requires a branch to be specified.')
4202
stored_submit_branch = branch.get_submit_branch()
4203
remembered_submit_branch = None
4204
if submit_branch is None:
4205
submit_branch = stored_submit_branch
4206
remembered_submit_branch = "submit"
4208
if stored_submit_branch is None or remember:
4209
branch.set_submit_branch(submit_branch)
4210
if submit_branch is None:
4211
submit_branch = branch.get_parent()
4212
remembered_submit_branch = "parent"
4213
if submit_branch is None:
4214
raise errors.BzrCommandError('No submit branch known or'
4216
if remembered_submit_branch is not None:
4217
note('Using saved %s location "%s" to determine what '
4218
'changes to submit.', remembered_submit_branch,
4222
submit_config = Branch.open(submit_branch).get_config()
4223
mail_to = submit_config.get_user_option("child_submit_to")
4225
stored_public_branch = branch.get_public_branch()
4226
if public_branch is None:
4227
public_branch = stored_public_branch
4228
elif stored_public_branch is None or remember:
4229
branch.set_public_branch(public_branch)
4230
if no_bundle and public_branch is None:
4231
raise errors.BzrCommandError('No public branch specified or'
4233
base_revision_id = None
4235
if revision is not None:
4236
if len(revision) > 2:
4237
raise errors.BzrCommandError('bzr send takes '
4238
'at most two one revision identifiers')
4239
revision_id = revision[-1].as_revision_id(branch)
4240
if len(revision) == 2:
4241
base_revision_id = revision[0].as_revision_id(branch)
4242
if revision_id is None:
4243
revision_id = branch.last_revision()
4244
if revision_id == NULL_REVISION:
4245
raise errors.BzrCommandError('No revisions to submit.')
4247
directive = merge_directive.MergeDirective2.from_objects(
4248
branch.repository, revision_id, time.time(),
4249
osutils.local_time_offset(), submit_branch,
4250
public_branch=public_branch, include_patch=not no_patch,
4251
include_bundle=not no_bundle, message=message,
4252
base_revision_id=base_revision_id)
4253
elif format == '0.9':
4256
patch_type = 'bundle'
4258
raise errors.BzrCommandError('Format 0.9 does not'
4259
' permit bundle with no patch')
4265
directive = merge_directive.MergeDirective.from_objects(
4266
branch.repository, revision_id, time.time(),
4267
osutils.local_time_offset(), submit_branch,
4268
public_branch=public_branch, patch_type=patch_type,
4271
outfile.writelines(directive.to_lines())
4273
subject = '[MERGE] '
4274
if message is not None:
4277
revision = branch.repository.get_revision(revision_id)
4278
subject += revision.get_summary()
4279
basename = directive.get_disk_name(branch)
4280
mail_client.compose_merge_request(mail_to, subject,
4281
outfile.getvalue(), basename)
5848
no_patch=False, revision=None, remember=None, output=None,
5849
format=None, mail_to=None, message=None, body=None,
5850
strict=None, **kwargs):
5851
from bzrlib.send import send
5852
return send(submit_branch, revision, public_branch, remember,
5853
format, no_bundle, no_patch, output,
5854
kwargs.get('from', '.'), mail_to, message, body,
4288
5859
class cmd_bundle_revisions(cmd_send):
4290
"""Create a merge-directive for submiting changes.
5860
__doc__ = """Create a merge-directive for submitting changes.
4292
5862
A merge directive provides many things needed for requesting merges:
4365
5939
Tags are stored in the branch. Tags are copied from one branch to another
4366
5940
along when you branch, push, pull or merge.
4368
It is an error to give a tag name that already exists unless you pass
5942
It is an error to give a tag name that already exists unless you pass
4369
5943
--force, in which case the tag is moved to point to the new revision.
4371
5945
To rename a tag (change the name but keep it on the same revsion), run ``bzr
4372
5946
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
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
4375
5954
_see_also = ['commit', 'tags']
4376
takes_args = ['tag_name']
5955
takes_args = ['tag_name?']
4377
5956
takes_options = [
4378
5957
Option('delete',
4379
5958
help='Delete this tag rather than placing it.',
4382
help='Branch in which to place the tag.',
5960
custom_help('directory',
5961
help='Branch in which to place the tag.'),
4386
5962
Option('force',
4387
5963
help='Replace existing tags.',
4392
def run(self, tag_name,
5968
def run(self, tag_name=None,
4398
5974
branch, relpath = Branch.open_containing(directory)
4402
branch.tags.delete_tag(tag_name)
4403
self.outf.write('Deleted tag %s.\n' % tag_name)
4406
if len(revision) != 1:
4407
raise errors.BzrCommandError(
4408
"Tags can only be placed on a single revision, "
4410
revision_id = revision[0].as_revision_id(branch)
4412
revision_id = branch.last_revision()
4413
if (not force) and branch.tags.has_tag(tag_name):
4414
raise errors.TagAlreadyExists(tag_name)
5975
self.add_cleanup(branch.lock_write().unlock)
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)
5983
if len(revision) != 1:
5984
raise errors.BzrCommandError(gettext(
5985
"Tags can only be placed on a single revision, "
5987
revision_id = revision[0].as_revision_id(branch)
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."))
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)
4415
6004
branch.tags.set_tag(tag_name, revision_id)
4416
self.outf.write('Created tag %s.\n' % tag_name)
6005
if existing_target is None:
6006
note(gettext('Created tag %s.') % tag_name)
6008
note(gettext('Updated tag %s.') % tag_name)
4421
6011
class cmd_tags(Command):
6012
__doc__ = """List tags.
4424
6014
This command shows a table of tag names and the revisions they reference.
4427
6017
_see_also = ['tag']
4428
6018
takes_options = [
4430
help='Branch whose tags should be displayed.',
4434
RegistryOption.from_kwargs('sort',
6019
custom_help('directory',
6020
help='Branch whose tags should be displayed.'),
6021
RegistryOption('sort',
4435
6022
'Sort tags by different criteria.', title='Sorting',
4436
alpha='Sort tags lexicographically (default).',
4437
time='Sort tags chronologically.',
6023
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
4442
6029
@display_command
6030
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6031
from bzrlib.tag import tag_sort_methods
4448
6032
branch, relpath = Branch.open_containing(directory)
4449
6034
tags = branch.tags.get_tag_dict().items()
4454
elif sort == 'time':
4456
for tag, revid in tags:
4458
revobj = branch.repository.get_revision(revid)
4459
except errors.NoSuchRevision:
4460
timestamp = sys.maxint # place them at the end
4462
timestamp = revobj.timestamp
4463
timestamps[revid] = timestamp
4464
tags.sort(key=lambda x: timestamps[x[1]])
6038
self.add_cleanup(branch.lock_read().unlock)
6040
# Restrict to the specified range
6041
tags = self._tags_for_range(branch, revision)
6043
sort = tag_sort_methods.get()
4465
6045
if not show_ids:
4466
6046
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4467
revno_map = branch.get_revision_id_to_revno_map()
4468
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4469
for tag, revid in tags ]
6047
for index, (tag, revid) in enumerate(tags):
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 ...
6058
tags[index] = (tag, revno)
4470
6060
for tag, revspec in tags:
4471
6061
self.outf.write('%-20s %s\n' % (tag, revspec))
6063
def _tags_for_range(self, branch, revision):
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...
6078
# only show revisions between revid1 and revid2 (inclusive)
6079
tagged_revids = branch.tags.get_reverse_tag_dict()
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)
6086
found.extend([(tag, r[0]) for tag in revid_tags])
4474
6090
class cmd_reconfigure(Command):
4475
"""Reconfigure the type of a bzr directory.
6091
__doc__ = """Reconfigure the type of a bzr directory.
4477
6093
A target configuration must be specified.
4488
6104
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
4489
6105
takes_args = ['location?']
4490
takes_options = [RegistryOption.from_kwargs('target_type',
4491
title='Target type',
4492
help='The type to reconfigure the directory to.',
4493
value_switches=True, enum_switch=False,
4494
branch='Reconfigure to be an unbound branch '
4495
'with no working tree.',
4496
tree='Reconfigure to be an unbound branch '
4497
'with a working tree.',
4498
checkout='Reconfigure to be a bound branch '
4499
'with a working tree.',
4500
lightweight_checkout='Reconfigure to be a lightweight'
4501
' checkout (with no local history).',
4502
standalone='Reconfigure to be a standalone branch '
4503
'(i.e. stop using shared repository).',
4504
use_shared='Reconfigure to use a shared repository.'),
4505
Option('bind-to', help='Branch to bind checkout to.',
4508
help='Perform reconfiguration even if local changes'
6107
RegistryOption.from_kwargs(
6110
help='The relation between branch and tree.',
6111
value_switches=True, enum_switch=False,
6112
branch='Reconfigure to be an unbound branch with no working tree.',
6113
tree='Reconfigure to be an unbound branch with a working tree.',
6114
checkout='Reconfigure to be a bound branch with a working tree.',
6115
lightweight_checkout='Reconfigure to be a lightweight'
6116
' checkout (with no local history).',
6118
RegistryOption.from_kwargs(
6120
title='Repository type',
6121
help='Location fo the repository.',
6122
value_switches=True, enum_switch=False,
6123
standalone='Reconfigure to be a standalone branch '
6124
'(i.e. stop using shared repository).',
6125
use_shared='Reconfigure to use a shared repository.',
6127
RegistryOption.from_kwargs(
6129
title='Trees in Repository',
6130
help='Whether new branches in the repository have trees.',
6131
value_switches=True, enum_switch=False,
6132
with_trees='Reconfigure repository to create '
6133
'working trees on branches by default.',
6134
with_no_trees='Reconfigure repository to not create '
6135
'working trees on branches by default.'
6137
Option('bind-to', help='Branch to bind checkout to.', type=str),
6139
help='Perform reconfiguration even if local changes'
6141
Option('stacked-on',
6142
help='Reconfigure a branch to be stacked on another branch.',
6146
help='Reconfigure a branch to be unstacked. This '
6147
'may require copying substantial data into it.',
4512
def run(self, location=None, target_type=None, bind_to=None, force=False):
4513
directory = bzrdir.BzrDir.open(location)
4514
if target_type is None:
4515
raise errors.BzrCommandError('No target configuration specified')
4516
elif target_type == 'branch':
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)
6155
if stacked_on and unstacked:
6156
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
6157
elif stacked_on is not None:
6158
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
6160
reconfigure.ReconfigureUnstacked().apply(directory)
6161
# At the moment you can use --stacked-on and a different
6162
# reconfiguration shape at the same time; there seems no good reason
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
6167
if stacked_on or unstacked:
6170
raise errors.BzrCommandError(gettext('No target configuration '
6172
reconfiguration = None
6173
if tree_type == 'branch':
4517
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4518
elif target_type == 'tree':
6175
elif tree_type == 'tree':
4519
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4520
elif target_type == 'checkout':
4521
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4523
elif target_type == 'lightweight-checkout':
6177
elif tree_type == 'checkout':
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
6180
elif tree_type == 'lightweight-checkout':
4524
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4525
6182
directory, bind_to)
4526
elif target_type == 'use-shared':
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
4527
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
4528
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
4529
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
4530
reconfiguration.apply(force)
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6196
elif repository_trees == 'with-no-trees':
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6200
reconfiguration.apply(force)
6201
reconfiguration = None
4533
6204
class cmd_switch(Command):
4534
"""Set the branch of a checkout and update.
6205
__doc__ = """Set the branch of a checkout and update.
4536
6207
For lightweight checkouts, this changes the branch being referenced.
4537
6208
For heavyweight checkouts, this checks that there are no local commits
4538
6209
versus the current bound branch, then it makes the local branch a mirror
4539
6210
of the new location and binds to it.
4541
6212
In both cases, the working tree is updated and uncommitted changes
4542
6213
are merged. The user can commit or revert these as they desire.
4547
6218
directory of the current branch. For example, if you are currently in a
4548
6219
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
4549
6220
/path/to/newbranch.
6222
Bound branches use the nickname of its master branch unless it is set
6223
locally, in which case switching will update the local nickname to be
4552
takes_args = ['to_location']
4553
takes_options = [Option('force',
4554
help='Switch even if local commits will be lost.')
6227
takes_args = ['to_location?']
6228
takes_options = ['directory',
6230
help='Switch even if local commits will be lost.'),
6232
Option('create-branch', short_name='b',
6233
help='Create the target branch from this one before'
6234
' switching to it.'),
6236
help='Store and restore uncommitted changes in the'
4557
def run(self, to_location, force=False):
6240
def run(self, to_location=None, force=False, create_branch=False,
6241
revision=None, directory=u'.', store=False):
4558
6242
from bzrlib import switch
4560
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
4562
to_branch = Branch.open(to_location)
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
4563
6257
except errors.NotBranchError:
4564
to_branch = Branch.open(
4565
control_dir.open_branch().base + '../' + to_location)
4566
switch.switch(control_dir, to_branch, force)
4567
note('Switched to branch: %s',
6259
had_explicit_nick = False
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)
6266
to_branch = branch.bzrdir.sprout(to_location,
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
6273
except errors.NotBranchError:
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)
6280
if had_explicit_nick:
6281
branch = control_dir.open_branch() #get the new branch!
6282
branch.nick = to_branch.nick
6283
note(gettext('Switched to branch: %s'),
4568
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
6288
class cmd_view(Command):
6289
__doc__ = """Manage filtered views.
6291
Views provide a mask over the tree so that users can focus on
6292
a subset of a tree when doing their work. After creating a view,
6293
commands that support a list of files - status, diff, commit, etc -
6294
effectively have that list of files implicitly given each time.
6295
An explicit list of files can still be given but those files
6296
must be within the current view.
6298
In most cases, a view has a short life-span: it is created to make
6299
a selected change and is deleted once that change is committed.
6300
At other times, you may wish to create one or more named views
6301
and switch between them.
6303
To disable the current view without deleting it, you can switch to
6304
the pseudo view called ``off``. This can be useful when you need
6305
to see the whole tree for an operation or two (e.g. merge) but
6306
want to switch back to your view after that.
6309
To define the current view::
6311
bzr view file1 dir1 ...
6313
To list the current view::
6317
To delete the current view::
6321
To disable the current view without deleting it::
6323
bzr view --switch off
6325
To define a named view and switch to it::
6327
bzr view --name view-name file1 dir1 ...
6329
To list a named view::
6331
bzr view --name view-name
6333
To delete a named view::
6335
bzr view --name view-name --delete
6337
To switch to a named view::
6339
bzr view --switch view-name
6341
To list all views defined::
6345
To delete all views::
6347
bzr view --delete --all
6351
takes_args = ['file*']
6354
help='Apply list or delete action to all views.',
6357
help='Delete the view.',
6360
help='Name of the view to define, list or delete.',
6364
help='Name of the view to switch to.',
6369
def run(self, file_list,
6375
tree, file_list = WorkingTree.open_containing_paths(file_list,
6377
current_view, view_dict = tree.views.get_view_info()
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
6388
tree.views.set_view_info(None, {})
6389
self.outf.write(gettext("Deleted all views.\n"))
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
6393
tree.views.delete_view(name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
6402
elif switch == 'off':
6403
if current_view is None:
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
6405
tree.views.set_view_info(None, view_dict)
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
6408
tree.views.set_view_info(switch, view_dict)
6409
view_str = views.view_display_str(tree.views.lookup_view())
6410
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
6413
self.outf.write(gettext('Views defined:\n'))
6414
for view in sorted(view_dict):
6415
if view == current_view:
6419
view_str = views.view_display_str(view_dict[view])
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6422
self.outf.write(gettext('No views defined.\n'))
6425
# No name given and no current view set
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
6430
tree.views.set_view(name, sorted(file_list))
6431
view_str = views.view_display_str(tree.views.lookup_view())
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
6436
# No name given and no current view set
6437
self.outf.write(gettext('No current view.\n'))
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
6440
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
4571
6443
class cmd_hooks(Command):
4572
"""Show a branch's currently registered hooks.
4576
takes_args = ['path?']
4578
def run(self, path=None):
6444
__doc__ = """Show hooks."""
6449
for hook_key in sorted(hooks.known_hooks.keys()):
6450
some_hooks = hooks.known_hooks_key_to_object(hook_key)
6451
self.outf.write("%s:\n" % type(some_hooks).__name__)
6452
for hook_name, hook_point in sorted(some_hooks.items()):
6453
self.outf.write(" %s:\n" % (hook_name,))
6454
found_hooks = list(hook_point)
6456
for hook in found_hooks:
6457
self.outf.write(" %s\n" %
6458
(some_hooks.get_hook_name(hook),))
6460
self.outf.write(gettext(" <no hooks installed>\n"))
6463
class cmd_remove_branch(Command):
6464
__doc__ = """Remove a branch.
6466
This will remove the branch from the specified location but
6467
will keep any working tree or repository in place.
6471
Remove the branch at repo/trunk::
6473
bzr remove-branch repo/trunk
6477
takes_args = ["location?"]
6479
takes_options = ['directory',
6480
Option('force', help='Remove branch even if it is the active branch.')]
6482
aliases = ["rmbranch"]
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():
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)
6498
class cmd_shelve(Command):
6499
__doc__ = """Temporarily set aside some changes from the current tree.
6501
Shelve allows you to temporarily put changes you've made "on the shelf",
6502
ie. out of the way, until a later time when you can bring them back from
6503
the shelf with the 'unshelve' command. The changes are stored alongside
6504
your working tree, and so they aren't propagated along with your branch nor
6505
will they survive its deletion.
6507
If shelve --list is specified, previously-shelved changes are listed.
6509
Shelve is intended to help separate several sets of changes that have
6510
been inappropriately mingled. If you just want to get rid of all changes
6511
and you don't need to restore them later, use revert. If you want to
6512
shelve all text changes at once, use shelve --all.
6514
If filenames are specified, only the changes to those files will be
6515
shelved. Other files will be left untouched.
6517
If a revision is specified, changes since that revision will be shelved.
6519
You can put multiple items on the shelf, and by default, 'unshelve' will
6520
restore the most recently shelved changes.
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
6526
change_editor = PROGRAM @new_path @old_path
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.
6535
takes_args = ['file*']
6540
Option('all', help='Shelve all changes.'),
6542
RegistryOption('writer', 'Method to use for writing diffs.',
6543
bzrlib.option.diff_writer_registry,
6544
value_switches=True, enum_switch=False),
6546
Option('list', help='List shelved changes.'),
6548
help='Destroy removed changes instead of shelving them.'),
6550
_see_also = ['unshelve', 'configuration']
6552
def run(self, revision=None, all=False, file_list=None, message=None,
6553
writer=None, list=False, destroy=False, directory=None):
6555
return self.run_for_list(directory=directory)
6556
from bzrlib.shelf_ui import Shelver
6558
writer = bzrlib.option.diff_writer_registry.get()
6560
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6561
file_list, message, destroy=destroy, directory=directory)
6566
except errors.UserAbort:
6569
def run_for_list(self, directory=None):
6570
if directory is None:
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.'))
6579
for shelf_id in reversed(shelves):
6580
message = manager.get_metadata(shelf_id).get('message')
6582
message = '<no message>'
6583
self.outf.write('%3d: %s\n' % (shelf_id, message))
6587
class cmd_unshelve(Command):
6588
__doc__ = """Restore shelved changes.
6590
By default, the most recently shelved changes are restored. However if you
6591
specify a shelf by id those changes will be restored instead. This works
6592
best when the changes don't depend on each other.
6595
takes_args = ['shelf_id?']
6598
RegistryOption.from_kwargs(
6599
'action', help="The action to perform.",
6600
enum_switch=False, value_switches=True,
6601
apply="Apply changes and remove from the shelf.",
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.",
6605
delete_only="Delete changes without applying them.",
6606
keep="Apply changes but don't delete them.",
6609
_see_also = ['shelve']
6611
def run(self, shelf_id=None, action='apply', directory=u'.'):
6612
from bzrlib.shelf_ui import Unshelver
6613
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
6617
unshelver.tree.unlock()
6620
class cmd_clean_tree(Command):
6621
__doc__ = """Remove unwanted files from working tree.
6623
By default, only unknown files, not ignored files, are deleted. Versioned
6624
files are never deleted.
6626
Another class is 'detritus', which includes files emitted by bzr during
6627
normal operations and selftests. (The value of these files decreases with
6630
If no options are specified, unknown files are deleted. Otherwise, option
6631
flags are respected, and may be combined.
6633
To check what clean-tree will do, use --dry-run.
6635
takes_options = ['directory',
6636
Option('ignored', help='Delete all ignored files.'),
6637
Option('detritus', help='Delete conflict files, merge and revert'
6638
' backups, and failed selftest dirs.'),
6640
help='Delete files unknown to bzr (default).'),
6641
Option('dry-run', help='Show files to delete instead of'
6643
Option('force', help='Do not prompt before deleting.')]
6644
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6645
force=False, directory=u'.'):
6646
from bzrlib.clean_tree import clean_tree
6647
if not (unknown or ignored or detritus):
6651
clean_tree(directory, unknown=unknown, ignored=ignored,
6652
detritus=detritus, dry_run=dry_run, no_prompt=force)
6655
class cmd_reference(Command):
6656
__doc__ = """list, view and set branch locations for nested trees.
6658
If no arguments are provided, lists the branch locations for nested trees.
6659
If one argument is provided, display the branch location for that tree.
6660
If two arguments are provided, set the branch location for that tree.
6665
takes_args = ['path?', 'location?']
6667
def run(self, path=None, location=None):
6669
if path is not None:
6671
tree, branch, relpath =(
6672
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6673
if path is not None:
6676
tree = branch.basis_tree()
4579
6677
if path is None:
4581
branch_hooks = Branch.open(path).hooks
4582
for hook_type in branch_hooks:
4583
hooks = branch_hooks[hook_type]
4584
self.outf.write("%s:\n" % (hook_type,))
4587
self.outf.write(" %s\n" %
4588
(branch_hooks.get_hook_name(hook),))
6678
info = branch._get_all_reference_info().iteritems()
6679
self._display_reference_info(tree, branch, info)
6681
file_id = tree.path2id(path)
6683
raise errors.NotVersionedError(path)
6684
if location is None:
6685
info = [(file_id, branch.get_reference_info(file_id))]
6686
self._display_reference_info(tree, branch, info)
4590
self.outf.write(" <no hooks installed>\n")
4593
def _create_prefix(cur_transport):
4594
needed = [cur_transport]
4595
# Recurse upwards until we can create a directory successfully
4597
new_transport = cur_transport.clone('..')
4598
if new_transport.base == cur_transport.base:
4599
raise errors.BzrCommandError(
4600
"Failed to create path prefix for %s."
4601
% cur_transport.base)
4603
new_transport.mkdir('.')
4604
except errors.NoSuchFile:
4605
needed.append(new_transport)
4606
cur_transport = new_transport
4609
# Now we only need to create child directories
4611
cur_transport = needed.pop()
4612
cur_transport.ensure_base()
4615
# these get imported and then picked up by the scan for cmd_*
4616
# TODO: Some more consistent way to split command definitions across files;
4617
# we do need to load at least some information about them to know of
4618
# aliases. ideally we would avoid loading the implementation until the
4619
# details were needed.
4620
from bzrlib.cmd_version_info import cmd_version_info
4621
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4622
from bzrlib.bundle.commands import (
4625
from bzrlib.sign_my_commits import cmd_sign_my_commits
4626
from bzrlib.weave_commands import cmd_versionedfile_list, \
4627
cmd_weave_plan_merge, cmd_weave_merge_text
6688
branch.set_reference_info(file_id, path, location)
6690
def _display_reference_info(self, tree, branch, info):
6692
for file_id, (path, location) in info:
6694
path = tree.id2path(file_id)
6695
except errors.NoSuchId:
6697
ref_list.append((path, location))
6698
for path, location in sorted(ref_list):
6699
self.outf.write('%s %s\n' % (path, location))
6702
class cmd_export_pot(Command):
6703
__doc__ = """Export command helps and error messages in po format."""
6706
takes_options = [Option('plugin',
6707
help='Export help text from named command '\
6708
'(defaults to all built in commands).',
6710
Option('include-duplicates',
6711
help='Output multiple copies of the same msgid '
6712
'string if it appears more than once.'),
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)
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'),
6735
builtin_command_registry.register_lazy(name, aliases, module_name)