61
from breezy.branch import Branch
62
from breezy.conflicts import ConflictList
63
from breezy.transport import memory
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
69
from .commands import (
63
from bzrlib.commands import (
71
65
builtin_command_registry,
68
from bzrlib.option import (
79
73
_parse_revision_str,
81
from .revisionspec import (
91
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
94
def _get_branch_location(control_dir, possible_transports=None):
95
"""Return location of branch for this control dir."""
97
target = control_dir.get_branch_reference()
98
except errors.NotBranchError:
99
return control_dir.root_transport.base
100
if target is not None:
102
this_branch = control_dir.open_branch(
103
possible_transports=possible_transports)
104
# This may be a heavy checkout, where we want the master branch
105
master_location = this_branch.get_bound_location()
106
if master_location is not None:
107
return master_location
108
# If not, use a local sibling
109
return this_branch.base
112
def _is_colocated(control_dir, possible_transports=None):
113
"""Check if the branch in control_dir is colocated.
115
:param control_dir: Control directory
116
:return: Tuple with boolean indicating whether the branch is colocated
117
and the full URL to the actual branch
119
# This path is meant to be relative to the existing branch
120
this_url = _get_branch_location(control_dir,
121
possible_transports=possible_transports)
122
# Perhaps the target control dir supports colocated branches?
124
root = controldir.ControlDir.open(this_url,
125
possible_transports=possible_transports)
126
except errors.NotBranchError:
127
return (False, this_url)
130
control_dir.open_workingtree()
131
except (errors.NoWorkingTree, errors.NotLocalUrl):
132
return (False, this_url)
135
root._format.colocated_branches and
136
control_dir.control_url == root.control_url,
140
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
141
"""Lookup the location for a new sibling branch.
143
:param control_dir: Control directory to find sibling branches from
144
:param location: Name of the new branch
145
:return: Full location to the new branch
147
location = directory_service.directories.dereference(location)
148
if '/' not in location and '\\' not in location:
149
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
152
return urlutils.join_segment_parameters(this_url,
153
{"branch": urlutils.escape(location)})
155
return urlutils.join(this_url, '..', urlutils.escape(location))
159
def open_sibling_branch(control_dir, location, possible_transports=None):
160
"""Open a branch, possibly a sibling of another.
162
:param control_dir: Control directory relative to which to lookup the
164
:param location: Location to look up
165
:return: branch to open
168
# Perhaps it's a colocated branch?
169
return control_dir.open_branch(location,
170
possible_transports=possible_transports)
171
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
172
this_url = _get_branch_location(control_dir)
175
this_url, '..', urlutils.escape(location)))
178
def open_nearby_branch(near=None, location=None, possible_transports=None):
179
"""Open a nearby branch.
181
:param near: Optional location of container from which to open branch
182
:param location: Location of the branch
183
:return: Branch instance
189
return Branch.open(location,
190
possible_transports=possible_transports)
191
except errors.NotBranchError:
193
cdir = controldir.ControlDir.open(near,
194
possible_transports=possible_transports)
195
return open_sibling_branch(cdir, location,
196
possible_transports=possible_transports)
199
def iter_sibling_branches(control_dir, possible_transports=None):
200
"""Iterate over the siblings of a branch.
202
:param control_dir: Control directory for which to look up the siblings
203
:return: Iterator over tuples with branch name and branch object
206
reference = control_dir.get_branch_reference()
207
except errors.NotBranchError:
208
# There is no active branch, just return the colocated branches.
209
for name, branch in viewitems(control_dir.get_branches()):
212
if reference is not None:
213
ref_branch = Branch.open(reference,
214
possible_transports=possible_transports)
217
if ref_branch is None or ref_branch.name:
218
if ref_branch is not None:
219
control_dir = ref_branch.controldir
220
for name, branch in viewitems(control_dir.get_branches()):
223
repo = ref_branch.controldir.find_repository()
224
for branch in repo.find_branches(using=True):
225
name = urlutils.relative_url(repo.user_url,
226
branch.user_url).rstrip("/")
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
230
88
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
295
223
def _get_view_info_for_change_reporter(tree):
296
224
"""Get the view information from a tree for change reporting."""
432
342
takes_args = ['revision_id?']
433
takes_options = ['directory', 'revision']
343
takes_options = ['revision']
434
344
# cat-revision is more for frontends so should be exact
435
345
encoding = 'strict'
437
347
def print_revision(self, revisions, revid):
438
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
439
record = next(stream)
349
record = stream.next()
440
350
if record.storage_kind == 'absent':
441
351
raise errors.NoSuchRevision(revisions, revid)
442
352
revtext = record.get_bytes_as('fulltext')
443
353
self.outf.write(revtext.decode('utf-8'))
446
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
447
357
if revision_id is not None and revision is not None:
448
raise errors.BzrCommandError(gettext('You can only supply one of'
449
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
450
360
if revision_id is None and revision is None:
451
raise errors.BzrCommandError(gettext('You must supply either'
452
' --revision or a revision_id'))
454
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
456
365
revisions = b.repository.revisions
457
366
if revisions is None:
458
raise errors.BzrCommandError(gettext('Repository %r does not support '
459
'access to raw revision texts'))
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
461
with b.repository.lock_read():
370
b.repository.lock_read()
462
372
# TODO: jam 20060112 should cat-revision always output utf-8?
463
373
if revision_id is not None:
464
revision_id = cache_utf8.encode(revision_id)
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
466
376
self.print_revision(revisions, revision_id)
467
377
except errors.NoSuchRevision:
468
msg = gettext("The repository {0} contains no revision {1}.").format(
469
b.repository.base, revision_id.decode('utf-8'))
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
470
380
raise errors.BzrCommandError(msg)
471
381
elif revision is not None:
472
382
for rev in revision:
474
384
raise errors.BzrCommandError(
475
gettext('You cannot specify a NULL revision.'))
385
'You cannot specify a NULL revision.')
476
386
rev_id = rev.as_revision_id(b)
477
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
395
PATH is a btree index file, it can be any URL. This includes things like
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
398
By default, the tuples stored in the index file will be displayed. With
399
--raw, we will uncompress the pages, but otherwise display the raw bytes
403
# TODO: Do we want to dump the internal nodes as well?
404
# TODO: It would be nice to be able to dump the un-parsed information,
405
# rather than only going through iter_all_entries. However, this is
406
# good enough for a start
408
encoding_type = 'exact'
409
takes_args = ['path']
410
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
411
' rather than the parsed tuples.'),
414
def run(self, path, raw=False):
415
dirname, basename = osutils.split(path)
416
t = transport.get_transport(dirname)
418
self._dump_raw_bytes(t, basename)
420
self._dump_entries(t, basename)
422
def _get_index_and_bytes(self, trans, basename):
423
"""Create a BTreeGraphIndex and raw bytes."""
424
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
427
bt._size = len(bytes)
430
def _dump_raw_bytes(self, trans, basename):
433
# We need to parse at least the root node.
434
# This is because the first page of every row starts with an
435
# uncompressed header.
436
bt, bytes = self._get_index_and_bytes(trans, basename)
437
for page_idx, page_start in enumerate(xrange(0, len(bytes),
438
btree_index._PAGE_SIZE)):
439
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
440
page_bytes = bytes[page_start:page_end]
442
self.outf.write('Root node:\n')
443
header_end, data = bt._parse_header_from_bytes(page_bytes)
444
self.outf.write(page_bytes[:header_end])
446
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
451
def _dump_entries(self, trans, basename):
453
st = trans.stat(basename)
454
except errors.TransportNotPossible:
455
# We can't stat, so we'll fake it because we have to do the 'get()'
457
bt, _ = self._get_index_and_bytes(trans, basename)
459
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
460
for node in bt.iter_all_entries():
461
# Node is made up of:
462
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
480
473
class cmd_remove_tree(Command):
483
476
Since a lightweight checkout is little more than a working tree
484
477
this will refuse to run against one.
486
To re-create the working tree, use "brz checkout".
479
To re-create the working tree, use "bzr checkout".
488
481
_see_also = ['checkout', 'working-trees']
489
482
takes_args = ['location*']
490
483
takes_options = [
492
485
help='Remove the working tree even if it has '
493
'uncommitted or shelved changes.'),
486
'uncommitted changes.'),
496
489
def run(self, location_list, force=False):
497
490
if not location_list:
498
location_list = ['.']
500
493
for location in location_list:
501
d = controldir.ControlDir.open(location)
494
d = bzrdir.BzrDir.open(location)
504
497
working = d.open_workingtree()
505
498
except errors.NoWorkingTree:
506
raise errors.BzrCommandError(gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
507
500
except errors.NotLocalUrl:
508
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
509
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
511
504
if (working.has_changes()):
512
505
raise errors.UncommittedChanges(working)
513
if working.get_shelf_manager().last_shelf() is not None:
514
raise errors.ShelvedChanges(working)
516
507
if working.user_url != working.branch.user_url:
517
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
518
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
520
511
d.destroy_workingtree()
523
class cmd_repair_workingtree(Command):
524
__doc__ = """Reset the working tree state file.
526
This is not meant to be used normally, but more as a way to recover from
527
filesystem corruption, etc. This rebuilds the working inventory back to a
528
'known good' state. Any new modifications (adding a file, renaming, etc)
529
will be lost, though modified files will still be detected as such.
531
Most users will want something more like "brz revert" or "brz update"
532
unless the state file has become corrupted.
534
By default this attempts to recover the current state by looking at the
535
headers of the state file. If the state file is too corrupted to even do
536
that, you can supply --revision to force the state of the tree.
539
takes_options = ['revision', 'directory',
541
help='Reset the tree even if it doesn\'t appear to be'
546
def run(self, revision=None, directory='.', force=False):
547
tree, _ = WorkingTree.open_containing(directory)
548
self.add_cleanup(tree.lock_tree_write().unlock)
552
except errors.BzrError:
553
pass # There seems to be a real error here, so we'll reset
556
raise errors.BzrCommandError(gettext(
557
'The tree does not appear to be corrupt. You probably'
558
' want "brz revert" instead. Use "--force" if you are'
559
' sure you want to reset the working tree.'))
563
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
565
tree.reset_state(revision_ids)
566
except errors.BzrError:
567
if revision_ids is None:
568
extra = (gettext(', the header appears corrupt, try passing -r -1'
569
' to set the state to the last commit'))
572
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
575
514
class cmd_revno(Command):
576
515
__doc__ = """Show current revision number.
581
520
_see_also = ['info']
582
521
takes_args = ['location?']
583
522
takes_options = [
584
Option('tree', help='Show revno of working tree.'),
523
Option('tree', help='Show revno of working tree'),
589
def run(self, tree=False, location=u'.', revision=None):
590
if revision is not None and tree:
591
raise errors.BzrCommandError(gettext("--tree and --revision can "
592
"not be used together"))
527
def run(self, tree=False, location=u'.'):
596
530
wt = WorkingTree.open_containing(location)[0]
597
self.add_cleanup(wt.lock_read().unlock)
598
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
599
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
601
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
603
542
b = Branch.open_containing(location)[0]
604
self.add_cleanup(b.lock_read().unlock)
606
if len(revision) != 1:
607
raise errors.BzrCommandError(gettext(
608
"Revision numbers only make sense for single "
609
"revisions, not ranges"))
610
revid = revision[0].as_revision_id(b)
612
revid = b.last_revision()
614
revno_t = b.revision_id_to_dotted_revno(revid)
615
except (errors.NoSuchRevision, errors.GhostRevisionsHaveNoRevno):
617
revno = ".".join(str(n) for n in revno_t)
544
self.add_cleanup(b.unlock)
618
546
self.cleanup_now()
619
self.outf.write(revno + '\n')
547
self.outf.write(str(revno) + '\n')
622
550
class cmd_revision_info(Command):
851
751
help='List entries of a particular kind: file, directory, symlink.',
854
754
takes_args = ['file*']
857
757
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
858
758
if kind and kind not in ['file', 'directory', 'symlink']:
859
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
861
761
revision = _get_one_revision('inventory', revision)
862
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
863
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
864
765
if revision is not None:
865
766
tree = revision.as_tree(work_tree.branch)
867
768
extra_trees = [work_tree]
868
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
873
self.add_cleanup(tree.lock_read().unlock)
874
775
if file_list is not None:
875
paths = tree.find_related_paths_across_trees(
876
file_list, extra_trees, require_versioned=True)
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
877
778
# find_ids_across_trees may include some paths that don't
878
779
# exist in 'tree'.
879
entries = tree.iter_entries_by_dir(specific_files=paths)
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
881
entries = tree.iter_entries_by_dir()
783
entries = tree.inventory.entries()
883
for path, entry in sorted(entries):
786
for path, entry in entries:
884
787
if kind and kind != entry.kind:
889
self.outf.write('%-50s %s\n' % (path, entry.file_id.decode('utf-8')))
790
self.outf.write('%-50s %s\n' % (path, entry.file_id))
891
792
self.outf.write(path)
892
793
self.outf.write('\n')
895
class cmd_cp(Command):
896
__doc__ = """Copy a file.
899
brz cp OLDNAME NEWNAME
901
brz cp SOURCE... DESTINATION
903
If the last argument is a versioned directory, all the other names
904
are copied into it. Otherwise, there must be exactly two arguments
905
and the file is copied to a new name.
907
Files cannot be copied between branches. Only files can be copied
911
takes_args = ['names*']
914
encoding_type = 'replace'
916
def run(self, names_list):
917
if names_list is None:
919
if len(names_list) < 2:
920
raise errors.BzrCommandError(gettext("missing file argument"))
921
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
922
for file_name in rel_names[0:-1]:
924
raise errors.BzrCommandError(gettext("can not copy root of branch"))
925
self.add_cleanup(tree.lock_tree_write().unlock)
926
into_existing = osutils.isdir(names_list[-1])
927
if not into_existing:
929
(src, dst) = rel_names
931
raise errors.BzrCommandError(gettext('to copy multiple files the'
932
' destination must be a versioned'
936
pairs = [(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
937
for n in rel_names[:-1]]
939
for src, dst in pairs:
941
src_kind = tree.stored_kind(src)
942
except errors.NoSuchFile:
943
raise errors.BzrCommandError(
944
gettext('Could not copy %s => %s: %s is not versioned.')
947
raise errors.BzrCommandError(
948
gettext('Could not copy %s => %s . %s is not versioned\\.'
950
if src_kind == 'directory':
951
raise errors.BzrCommandError(
952
gettext('Could not copy %s => %s . %s is a directory.'
954
dst_parent = osutils.split(dst)[0]
957
dst_parent_kind = tree.stored_kind(dst_parent)
958
except errors.NoSuchFile:
959
raise errors.BzrCommandError(
960
gettext('Could not copy %s => %s: %s is not versioned.')
961
% (src, dst, dst_parent))
962
if dst_parent_kind != 'directory':
963
raise errors.BzrCommandError(
964
gettext('Could not copy to %s: %s is not a directory.')
965
% (dst_parent, dst_parent))
967
tree.copy_one(src, dst)
970
796
class cmd_mv(Command):
971
797
__doc__ = """Move or rename a file.
974
brz mv OLDNAME NEWNAME
800
bzr mv OLDNAME NEWNAME
976
brz mv SOURCE... DESTINATION
802
bzr mv SOURCE... DESTINATION
978
804
If the last argument is a versioned directory, all the other names
979
805
are moved into it. Otherwise, there must be exactly two arguments
1002
828
return self.run_auto(names_list, after, dry_run)
1004
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1005
831
if names_list is None:
1007
833
if len(names_list) < 2:
1008
raise errors.BzrCommandError(gettext("missing file argument"))
1009
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1010
for file_name in rel_names[0:-1]:
1012
raise errors.BzrCommandError(gettext("can not move root of branch"))
1013
self.add_cleanup(tree.lock_tree_write().unlock)
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1014
838
self._run(tree, names_list, rel_names, after)
1016
840
def run_auto(self, names_list, after, dry_run):
1017
841
if names_list is not None and len(names_list) > 1:
1018
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('Only one path may be specified to'
1021
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1023
work_tree, file_list = WorkingTree.open_containing_paths(
1024
names_list, default_directory='.')
1025
self.add_cleanup(work_tree.lock_tree_write().unlock)
1026
rename_map.RenameMap.guess_renames(
1027
work_tree.basis_tree(), work_tree, dry_run)
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1029
852
def _run(self, tree, names_list, rel_names, after):
1030
853
into_existing = osutils.isdir(names_list[-1])
1038
861
and rel_names[0].lower() == rel_names[1].lower()):
1039
862
into_existing = False
1041
865
# 'fix' the case of a potential 'from'
1042
from_path = tree.get_canonical_path(rel_names[0])
866
from_id = tree.path2id(
867
tree.get_canonical_inventory_path(rel_names[0]))
1043
868
if (not osutils.lexists(names_list[0]) and
1044
tree.is_versioned(from_path) and
1045
tree.stored_kind(from_path) == "directory"):
869
from_id and inv.get_file_kind(from_id) == "directory"):
1046
870
into_existing = False
1048
872
if into_existing:
1049
873
# move into existing directory
1050
874
# All entries reference existing inventory items, so fix them up
1051
875
# for cicp file-systems.
1052
rel_names = list(tree.get_canonical_paths(rel_names))
876
rel_names = tree.get_canonical_inventory_paths(rel_names)
1053
877
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
1054
878
if not is_quiet():
1055
879
self.outf.write("%s => %s\n" % (src, dest))
1057
881
if len(names_list) != 2:
1058
raise errors.BzrCommandError(gettext('to mv multiple files the'
882
raise errors.BzrCommandError('to mv multiple files the'
1059
883
' destination must be a versioned'
1062
886
# for cicp file-systems: the src references an existing inventory
1064
src = tree.get_canonical_path(rel_names[0])
888
src = tree.get_canonical_inventory_path(rel_names[0])
1065
889
# Find the canonical version of the destination: In all cases, the
1066
890
# parent of the target must be in the inventory, so we fetch the
1067
891
# canonical version from there (we do not always *use* the
1068
892
# canonicalized tail portion - we may be attempting to rename the
1069
893
# case of the tail)
1070
canon_dest = tree.get_canonical_path(rel_names[1])
894
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
1071
895
dest_parent = osutils.dirname(canon_dest)
1072
896
spec_tail = osutils.basename(rel_names[1])
1073
897
# For a CICP file-system, we need to avoid creating 2 inventory
1122
946
match the remote one, use pull --overwrite. This will work even if the two
1123
947
branches have diverged.
1125
If there is no default location set, the first pull will set it (use
1126
--no-remember to avoid setting it). After that, you can omit the
1127
location to use the default. To change the default, use --remember. The
1128
value will only be saved if the remote location can be accessed.
1130
The --verbose option will display the revisions pulled using the log_format
1131
configuration option. You can use a different format by overriding it with
1132
-Olog_format=<other_format>.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
1134
954
Note: The location can be specified either in the form of a branch,
1135
955
or in the form of a path to a file containing a merge directive generated
1139
959
_see_also = ['push', 'update', 'status-flags', 'send']
1140
960
takes_options = ['remember', 'overwrite', 'revision',
1141
961
custom_help('verbose',
1142
962
help='Show logs of pulled revisions.'),
1143
custom_help('directory',
1144
964
help='Branch to pull into, '
1145
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1147
970
help="Perform a local pull in a bound "
1148
971
"branch. Local pulls are not applied to "
1149
972
"the master branch."
1152
help="Show base revision text in conflicts."),
1153
Option('overwrite-tags',
1154
help="Overwrite tags only."),
1156
975
takes_args = ['location?']
1157
976
encoding_type = 'replace'
1159
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1160
979
revision=None, verbose=False,
1161
directory=None, local=False,
1162
show_base=False, overwrite_tags=False):
1165
overwrite = ["history", "tags"]
1166
elif overwrite_tags:
1167
overwrite = ["tags"]
980
directory=None, local=False):
1170
981
# FIXME: too much stuff is in the command class
1171
982
revision_id = None
1172
983
mergeable = None
1265
1070
considered diverged if the destination branch's most recent commit is one
1266
1071
that has not been merged (directly or indirectly) by the source branch.
1268
If branches have diverged, you can use 'brz push --overwrite' to replace
1073
If branches have diverged, you can use 'bzr push --overwrite' to replace
1269
1074
the other branch completely, discarding its unmerged changes.
1271
1076
If you want to ensure you have the different changes in the other branch,
1272
do a merge (see brz help merge) from the other branch, and commit that.
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1273
1078
After that you will be able to do a push without '--overwrite'.
1275
If there is no default push location set, the first push will set it (use
1276
--no-remember to avoid setting it). After that, you can omit the
1277
location to use the default. To change the default, use --remember. The
1278
value will only be saved if the remote location can be accessed.
1280
The --verbose option will display the revisions pushed using the log_format
1281
configuration option. You can use a different format by overriding it with
1282
-Olog_format=<other_format>.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1285
1086
_see_also = ['pull', 'update', 'working-trees']
1302
1106
help='Create a stacked branch that refers to another branch '
1303
1107
'for the commit history. Only the work not present in the '
1304
1108
'referenced branch is included in the branch created.',
1306
1110
Option('strict',
1307
1111
help='Refuse to push if there are uncommitted changes in'
1308
1112
' the working tree, --no-strict disables the check.'),
1310
help="Don't populate the working tree, even for protocols"
1311
" that support it."),
1312
Option('overwrite-tags',
1313
help="Overwrite tags only."),
1314
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1315
"that can't be represented in the target.")
1317
1114
takes_args = ['location?']
1318
1115
encoding_type = 'replace'
1320
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1321
1118
create_prefix=False, verbose=False, revision=None,
1322
1119
use_existing_dir=False, directory=None, stacked_on=None,
1323
stacked=False, strict=None, no_tree=False,
1324
overwrite_tags=False, lossy=False):
1325
from .push import _show_push_branch
1328
overwrite = ["history", "tags"]
1329
elif overwrite_tags:
1330
overwrite = ["tags"]
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1334
1123
if directory is None:
1335
1124
directory = '.'
1336
1125
# Get the source branch
1337
1126
(tree, br_from,
1338
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1339
1128
# Get the tip's revision_id
1340
1129
revision = _get_one_revision('push', revision)
1341
1130
if revision is not None:
1362
1151
# error by the feedback given to them. RBC 20080227.
1363
1152
stacked_on = parent_url
1364
1153
if not stacked_on:
1365
raise errors.BzrCommandError(gettext(
1366
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1368
1157
# Get the destination location
1369
1158
if location is None:
1370
1159
stored_loc = br_from.get_push_location()
1371
1160
if stored_loc is None:
1372
parent_loc = br_from.get_parent()
1374
raise errors.BzrCommandError(gettext(
1375
"No push location known or specified. To push to the "
1376
"parent branch (at %s), use 'brz push :parent'." %
1377
urlutils.unescape_for_display(parent_loc,
1378
self.outf.encoding)))
1380
raise errors.BzrCommandError(gettext(
1381
"No push location known or specified."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1383
1164
display_url = urlutils.unescape_for_display(stored_loc,
1384
1165
self.outf.encoding)
1385
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1386
1167
location = stored_loc
1388
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1389
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1390
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1391
use_existing_dir=use_existing_dir, no_tree=no_tree,
1172
use_existing_dir=use_existing_dir)
1395
1175
class cmd_branch(Command):
1432
1210
help="Bind new branch to from location."),
1212
aliases = ['get', 'clone']
1435
1214
def run(self, from_location, to_location=None, revision=None,
1436
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1437
use_existing_dir=False, switch=False, bind=False,
1439
from breezy import switch as _mod_switch
1440
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1218
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1442
if not (hardlink or files_from):
1443
# accelerator_tree is usually slower because you have to read N
1444
# files (no readahead, lots of seeks, etc), but allow the user to
1445
# explicitly request it
1446
accelerator_tree = None
1447
if files_from is not None and files_from != from_location:
1448
accelerator_tree = WorkingTree.open(files_from)
1449
1221
revision = _get_one_revision('branch', revision)
1450
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1451
1224
if revision is not None:
1452
1225
revision_id = revision.as_revision_id(br_from)
1462
1235
to_transport.mkdir('.')
1463
1236
except errors.FileExists:
1465
to_dir = controldir.ControlDir.open_from_transport(
1467
except errors.NotBranchError:
1468
if not use_existing_dir:
1469
raise errors.BzrCommandError(gettext('Target directory "%s" '
1470
'already exists.') % to_location)
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1475
to_dir.open_branch()
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1476
1243
except errors.NotBranchError:
1479
1246
raise errors.AlreadyBranchError(to_location)
1480
1247
except errors.NoSuchFile:
1481
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1487
# preserve whatever source format we have.
1488
to_dir = br_from.controldir.sprout(
1489
to_transport.base, revision_id,
1490
possible_transports=[to_transport],
1491
accelerator_tree=accelerator_tree, hardlink=hardlink,
1492
stacked=stacked, force_new_repo=standalone,
1493
create_tree_if_local=not no_tree, source_branch=br_from)
1494
branch = to_dir.open_branch(
1495
possible_transports=[
1496
br_from.controldir.root_transport, to_transport])
1497
except errors.NoSuchRevision:
1498
to_transport.delete_tree('.')
1499
msg = gettext("The branch {0} has no revision {1}.").format(
1500
from_location, revision)
1501
raise errors.BzrCommandError(msg)
1504
to_repo = to_dir.open_repository()
1505
except errors.NoRepositoryPresent:
1506
to_repo = to_dir.create_repository()
1507
to_repo.fetch(br_from.repository, revision_id=revision_id)
1508
branch = br_from.sprout(to_dir, revision_id=revision_id)
1509
br_from.tags.merge_to(branch.tags)
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1511
1266
# If the source branch is stacked, the new branch may
1512
1267
# be stacked whether we asked for that explicitly or not.
1513
1268
# We therefore need a try/except here and not just 'if stacked:'
1515
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1516
1271
branch.get_stacked_on_url())
1517
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1518
errors.UnstackableRepositoryFormat) as e:
1519
revno = branch.revno()
1520
if revno is not None:
1521
note(ngettext('Branched %d revision.', 'Branched %d revisions.',
1522
branch.revno()) % revno)
1524
note(gettext('Created new branch.'))
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1526
1276
# Bind to the parent
1527
1277
parent_branch = Branch.open(from_location)
1528
1278
branch.bind(parent_branch)
1529
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1531
1281
# Switch to the new branch
1532
1282
wt, _ = WorkingTree.open_containing('.')
1533
_mod_switch.switch(wt.controldir, branch)
1534
note(gettext('Switched to branch: %s'),
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1535
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1538
class cmd_branches(Command):
1539
__doc__ = """List the branches available at the current location.
1541
This command will print the names of all the branches at the current
1545
takes_args = ['location?']
1547
Option('recursive', short_name='R',
1548
help='Recursively scan for branches rather than '
1549
'just looking in the specified location.')]
1551
def run(self, location=".", recursive=False):
1553
t = transport.get_transport(location)
1554
if not t.listable():
1555
raise errors.BzrCommandError(
1556
"Can't scan this type of location.")
1557
for b in controldir.ControlDir.find_branches(t):
1558
self.outf.write("%s\n" % urlutils.unescape_for_display(
1559
urlutils.relative_url(t.base, b.base),
1560
self.outf.encoding).rstrip("/"))
1562
dir = controldir.ControlDir.open_containing(location)[0]
1564
active_branch = dir.open_branch(name="")
1565
except errors.NotBranchError:
1566
active_branch = None
1568
for name, branch in iter_sibling_branches(dir):
1571
active = (active_branch is not None and
1572
active_branch.user_url == branch.user_url)
1573
names[name] = active
1574
# Only mention the current branch explicitly if it's not
1575
# one of the colocated branches
1576
if not any(viewvalues(names)) and active_branch is not None:
1577
self.outf.write("* %s\n" % gettext("(default)"))
1578
for name in sorted(names):
1579
active = names[name]
1584
self.outf.write("%s %s\n" % (
1585
prefix, (name if PY3 else name.encode(self.outf.encoding))))
1588
1288
class cmd_checkout(Command):
1589
1289
__doc__ = """Create a new checkout of an existing branch.
1690
1389
class cmd_update(Command):
1691
__doc__ = """Update a working tree to a new revision.
1693
This will perform a merge of the destination revision (the tip of the
1694
branch, or the specified revision) into the working tree, and then make
1695
that revision the basis revision for the working tree.
1697
You can use this to visit an older revision, or to update a working tree
1698
that is out of date from its branch.
1700
If there are any uncommitted changes in the tree, they will be carried
1701
across and remain as uncommitted changes after the update. To discard
1702
these changes, use 'brz revert'. The uncommitted changes may conflict
1703
with the changes brought in by the change in basis revision.
1705
If the tree's branch is bound to a master branch, brz will also update
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1706
1400
the branch from the master.
1708
You cannot update just a single file or directory, because each Bazaar
1709
working tree has just a single basis revision. If you want to restore a
1710
file that has been removed locally, use 'brz revert' instead of 'brz
1711
update'. If you want to restore a file to its state in a previous
1712
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1713
out the old content of that file to a new location.
1715
The 'dir' argument, if given, must be the location of the root of a
1716
working tree to update. By default, the working tree that contains the
1717
current working directory is used.
1720
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1721
1404
takes_args = ['dir?']
1722
takes_options = ['revision',
1724
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1726
1406
aliases = ['up']
1728
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1729
1409
if revision is not None and len(revision) != 1:
1730
raise errors.BzrCommandError(gettext(
1731
"brz update --revision takes exactly one revision"))
1733
tree = WorkingTree.open_containing('.')[0]
1735
tree, relpath = WorkingTree.open_containing(dir)
1738
raise errors.BzrCommandError(gettext(
1739
"brz update can only update a whole tree, "
1740
"not a file or subdirectory"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1741
1413
branch = tree.branch
1742
1414
possible_transports = []
1743
1415
master = branch.get_master_branch(
1744
1416
possible_transports=possible_transports)
1745
1417
if master is not None:
1746
1419
branch_location = master.base
1421
tree.lock_tree_write()
1749
1422
branch_location = tree.branch.base
1750
tree.lock_tree_write()
1751
1423
self.add_cleanup(tree.unlock)
1752
1424
# get rid of the final '/' and be ready for display
1753
1425
branch_location = urlutils.unescape_for_display(
1779
1451
change_reporter,
1780
1452
possible_transports=possible_transports,
1781
1453
revision=revision_id,
1783
show_base=show_base)
1784
except errors.NoSuchRevision as e:
1785
raise errors.BzrCommandError(gettext(
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1786
1457
"branch has no revision %s\n"
1787
"brz update --revision only works"
1788
" for a revision in the branch history")
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1789
1460
% (e.revision))
1790
1461
revno = tree.branch.revision_id_to_dotted_revno(
1791
1462
_mod_revision.ensure_null(tree.last_revision()))
1792
note(gettext('Updated to revision {0} of branch {1}').format(
1793
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1794
1465
parent_ids = tree.get_parent_ids()
1795
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1796
note(gettext('Your local commits will now show as pending merges with '
1797
"'brz status', and can be committed with 'brz commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1798
1469
if conflicts != 0:
1860
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1861
1531
'The file deletion mode to be used.',
1862
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1863
safe='Backup changed files (default).',
1864
keep='Delete from brz but leave the working copy.',
1865
no_backup='Don\'t backup changed files.'),
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1535
keep='Delete from bzr but leave the working copy.',
1536
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1867
1538
aliases = ['rm', 'del']
1868
1539
encoding_type = 'replace'
1870
1541
def run(self, file_list, verbose=False, new=False,
1871
1542
file_deletion_strategy='safe'):
1873
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1875
1545
if file_list is not None:
1876
1546
file_list = [f for f in file_list]
1878
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1879
1550
# Heuristics should probably all move into tree.remove_smart or
2087
1742
to_transport.ensure_base()
2088
1743
except errors.NoSuchFile:
2089
1744
if not create_prefix:
2090
raise errors.BzrCommandError(gettext("Parent directory of %s"
1745
raise errors.BzrCommandError("Parent directory of %s"
2091
1746
" does not exist."
2092
1747
"\nYou may supply --create-prefix to create all"
2093
" leading parent directories.")
1748
" leading parent directories."
2095
1750
to_transport.create_prefix()
2098
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2099
1754
except errors.NotBranchError:
2100
1755
# really a NotBzrDir error...
2101
create_branch = controldir.ControlDir.create_branch_convenience
2103
force_new_tree = False
2105
force_new_tree = None
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2106
1757
branch = create_branch(to_transport.base, format=format,
2107
possible_transports=[to_transport],
2108
force_new_tree=force_new_tree)
2109
a_controldir = branch.controldir
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2111
from .transport.local import LocalTransport
2112
if a_controldir.has_branch():
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2113
1763
if (isinstance(to_transport, LocalTransport)
2114
and not a_controldir.has_workingtree()):
1764
and not a_bzrdir.has_workingtree()):
2115
1765
raise errors.BranchExistsWithoutWorkingTree(location)
2116
1766
raise errors.AlreadyBranchError(location)
2117
branch = a_controldir.create_branch()
2118
if not no_tree and not a_controldir.has_workingtree():
2119
a_controldir.create_workingtree()
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2120
1769
if append_revisions_only:
2122
1771
branch.set_append_revisions_only(True)
2123
1772
except errors.UpgradeRequired:
2124
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2125
' to append-revisions-only. Try --default.'))
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2126
1775
if not is_quiet():
2127
from .info import describe_layout, describe_format
1776
from bzrlib.info import describe_layout, describe_format
2129
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2130
1779
except (errors.NoWorkingTree, errors.NotLocalUrl):
2132
1781
repository = branch.repository
2133
1782
layout = describe_layout(repository, branch, tree).lower()
2134
format = describe_format(a_controldir, repository, branch, tree)
2135
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2137
1785
if repository.is_shared():
2138
1786
#XXX: maybe this can be refactored into transport.path_or_url()
2139
url = repository.controldir.root_transport.external_url()
1787
url = repository.bzrdir.root_transport.external_url()
2141
1789
url = urlutils.local_path_from_url(url)
2142
except urlutils.InvalidURL:
1790
except errors.InvalidURL:
2144
self.outf.write(gettext("Using shared repository: %s\n") % url)
1792
self.outf.write("Using shared repository: %s\n" % url)
2147
1795
class cmd_init_repository(Command):
2189
1837
def run(self, location, format=None, no_trees=False):
2190
1838
if format is None:
2191
format = controldir.format_registry.make_controldir('default')
1839
format = bzrdir.format_registry.make_bzrdir('default')
2193
1841
if location is None:
2196
1844
to_transport = transport.get_transport(location)
2198
if format.fixed_components:
2199
repo_format_name = None
2201
repo_format_name = format.repository_format.get_format_string()
2203
(repo, newdir, require_stacking, repository_policy) = (
2204
format.initialize_on_transport_ex(to_transport,
2205
create_prefix=True, make_working_trees=not no_trees,
2206
shared_repo=True, force_new_repo=True,
2207
use_existing_dir=True,
2208
repo_format_name=repo_format_name))
1845
to_transport.ensure_base()
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2209
1850
if not is_quiet():
2210
from .info import show_bzrdir_info
2211
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2214
1855
class cmd_diff(Command):
2241
1875
Shows the difference in the working tree versus the last commit::
2245
1879
Difference between the working tree and revision 1::
2249
1883
Difference between revision 3 and revision 1::
2253
1887
Difference between revision 3 and revision 1 for branch xxx::
2257
The changes introduced by revision 2 (equivalent to -r1..2)::
2261
To see the changes introduced by revision X::
1891
To see the changes introduced in revision X::
2265
1895
Note that in the case of a merge, the -c option shows the changes
2266
1896
compared to the left hand parent. To see the changes against
2267
1897
another parent, use::
2269
brz diff -r<chosen_parent>..X
2271
The changes between the current revision and the previous revision
2272
(equivalent to -c-1 and -r-2..-1)
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2276
1905
Show just the differences for file NEWS::
2280
1909
Show the differences in working tree xxx for file NEWS::
2284
1913
Show the differences from branch xxx to this working tree:
2288
1917
Show the differences between two branches for file NEWS::
2290
brz diff --old xxx --new yyy NEWS
2292
Same as 'brz diff' but prefix paths with old/ and new/::
2294
brz diff --prefix old/:new/
2296
Show the differences using a custom diff program with options::
2298
brz diff --using /usr/bin/diff --diff-options -wu
1919
bzr diff --old xxx --new yyy NEWS
1921
Same as 'bzr diff' but prefix paths with old/ and new/::
1923
bzr diff --prefix old/:new/
2300
1925
_see_also = ['status']
2301
1926
takes_args = ['file*']
2302
1927
takes_options = [
2303
Option('diff-options', type=text_type,
1928
Option('diff-options', type=str,
2304
1929
help='Pass these options to the external diff program.'),
2305
Option('prefix', type=text_type,
1930
Option('prefix', type=str,
2306
1931
short_name='p',
2307
1932
help='Set prefixes added to old and new filenames, as '
2308
1933
'two values separated by a colon. (eg "old/:new/").'),
2310
1935
help='Branch/tree to compare from.',
2314
1939
help='Branch/tree to compare to.',
2319
1944
Option('using',
2320
1945
help='Use this command to compare files.',
2323
1948
RegistryOption('format',
2325
1949
help='Diff format to use.',
2326
lazy_registry=('breezy.diff', 'format_registry'),
2327
title='Diff format'),
2329
help='How many lines of context to show.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2333
1953
aliases = ['di', 'dif']
2334
1954
encoding_type = 'exact'
2336
1956
@display_command
2337
1957
def run(self, revision=None, file_list=None, diff_options=None,
2338
prefix=None, old=None, new=None, using=None, format=None,
2340
from .diff import (get_trees_and_branches_to_diff_locked,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2341
1960
show_diff_trees)
1962
if (prefix is None) or (prefix == '0'):
2344
1963
# diff -p0 format
2347
elif prefix == u'1' or prefix is None:
2348
1967
old_label = 'old/'
2349
1968
new_label = 'new/'
2350
elif u':' in prefix:
2351
old_label, new_label = prefix.split(u":")
1970
old_label, new_label = prefix.split(":")
2353
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2354
1973
'--prefix expects two values separated by a colon'
2355
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2357
1976
if revision and len(revision) > 2:
2358
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2359
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2361
1980
if using is not None and format is not None:
2362
raise errors.BzrCommandError(gettext(
2363
'{0} and {1} are mutually exclusive').format(
2364
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2366
1984
(old_tree, new_tree,
2367
1985
old_branch, new_branch,
2368
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2369
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2370
# GNU diff on Windows uses ANSI encoding for filenames
2371
path_encoding = osutils.get_diff_header_encoding()
2372
return show_diff_trees(old_tree, new_tree, self.outf,
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2373
1989
specific_files=specific_files,
2374
1990
external_diff_options=diff_options,
2375
1991
old_label=old_label, new_label=new_label,
2376
extra_trees=extra_trees,
2377
path_encoding=path_encoding,
2378
using=using, context=context,
1992
extra_trees=extra_trees, using=using,
2379
1993
format_cls=format)
2598
2224
:Other filtering:
2600
The --match option can be used for finding revisions that match a
2601
regular expression in a commit message, committer, author or bug.
2602
Specifying the option several times will match any of the supplied
2603
expressions. --match-author, --match-bugs, --match-committer and
2604
--match-message can be used to only match a specific field.
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2606
2229
:Tips & tricks:
2608
2231
GUI tools and IDEs are often better at exploring history than command
2609
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2610
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2611
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2612
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2614
You may find it useful to add the aliases below to ``breezy.conf``::
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2618
2241
top = log -l10 --line
2619
2242
show = log -v -p
2621
``brz tip`` will then show the latest revision while ``brz top``
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2622
2245
will show the last 10 mainline revisions. To see the details of a
2623
particular revision X, ``brz show -rX``.
2246
particular revision X, ``bzr show -rX``.
2625
2248
If you are interested in looking deeper into a particular merge X,
2626
use ``brz log -n0 -rX``.
2249
use ``bzr log -n0 -rX``.
2628
``brz log -v`` on a branch with lots of history is currently
2251
``bzr log -v`` on a branch with lots of history is currently
2629
2252
very slow. A fix for this issue is currently under development.
2630
2253
With or without that fix, it is recommended that a revision range
2631
2254
be given when using the -v option.
2633
brz has a generic full-text matching plugin, brz-search, that can be
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2634
2257
used to find revisions matching user names, commit messages, etc.
2635
2258
Among other features, this plugin can find all revisions containing
2636
2259
a list of words but not others.
2967
2528
help='Recurse into subdirectories.'),
2968
2529
Option('from-root',
2969
2530
help='Print paths relative to the root of the branch.'),
2970
Option('unknown', short_name='u',
2971
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2972
2532
Option('versioned', help='Print versioned files.',
2973
2533
short_name='V'),
2974
Option('ignored', short_name='i',
2975
help='Print ignored files.'),
2976
Option('kind', short_name='k',
2977
help=('List entries of a particular kind: file, '
2978
'directory, symlink, tree-reference.'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2539
help='List entries of a particular kind: file, directory, symlink.',
2984
2543
@display_command
2985
2544
def run(self, revision=None, verbose=False,
2986
2545
recursive=False, from_root=False,
2987
2546
unknown=False, versioned=False, ignored=False,
2988
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2990
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
2991
raise errors.BzrCommandError(gettext('invalid kind specified'))
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2993
2552
if verbose and null:
2994
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2995
2554
all = not (unknown or versioned or ignored)
2997
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
3111
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
3112
2671
precedence over regular ignores. Such exceptions are used to specify
3113
2672
files that should be versioned which would otherwise be ignored.
3115
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
3116
2675
precedence over the '!' exception patterns.
3120
* Ignore patterns containing shell wildcards must be quoted from
3123
* Ignore patterns starting with "#" act as comments in the ignore file.
3124
To ignore patterns that begin with that character, use the "RE:" prefix.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3127
2681
Ignore the top level Makefile::
3129
brz ignore ./Makefile
2683
bzr ignore ./Makefile
3131
2685
Ignore .class files in all directories...::
3133
brz ignore "*.class"
2687
bzr ignore "*.class"
3135
2689
...but do not ignore "special.class"::
3137
brz ignore "!special.class"
3139
Ignore files whose name begins with the "#" character::
3143
Ignore .o files under the lib directory::
3145
brz ignore "lib/**/*.o"
3147
Ignore .o files under the lib directory::
3149
brz ignore "RE:lib/.*\\.o"
2691
bzr ignore "!special.class"
2693
Ignore .o files under the lib directory::
2695
bzr ignore "lib/**/*.o"
2697
Ignore .o files under the lib directory::
2699
bzr ignore "RE:lib/.*\.o"
3151
2701
Ignore everything but the "debian" toplevel directory::
3153
brz ignore "RE:(?!debian/).*"
2703
bzr ignore "RE:(?!debian/).*"
3155
2705
Ignore everything except the "local" toplevel directory,
3156
but always ignore autosave files ending in ~, even under local/::
3159
brz ignore "!./local"
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
3163
2713
_see_also = ['status', 'ignored', 'patterns']
3164
2714
takes_args = ['name_pattern*']
3165
takes_options = ['directory',
3166
2716
Option('default-rules',
3167
help='Display the default ignore rules that brz uses.')
2717
help='Display the default ignore rules that bzr uses.')
3170
def run(self, name_pattern_list=None, default_rules=None,
3172
from breezy import ignores
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
3173
2722
if default_rules is not None:
3174
2723
# dump the default rules and exit
3175
2724
for pattern in ignores.USER_DEFAULTS:
3176
2725
self.outf.write("%s\n" % pattern)
3178
2727
if not name_pattern_list:
3179
raise errors.BzrCommandError(gettext("ignore requires at least one "
3180
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3181
2730
name_pattern_list = [globbing.normalize_pattern(p)
3182
2731
for p in name_pattern_list]
3184
bad_patterns_count = 0
3185
for p in name_pattern_list:
3186
if not globbing.Globster.is_pattern_valid(p):
3187
bad_patterns_count += 1
3188
bad_patterns += ('\n %s' % p)
3190
msg = (ngettext('Invalid ignore pattern found. %s',
3191
'Invalid ignore patterns found. %s',
3192
bad_patterns_count) % bad_patterns)
3193
ui.ui_factory.show_error(msg)
3194
raise lazy_regex.InvalidPattern('')
3195
2732
for name_pattern in name_pattern_list:
3196
2733
if (name_pattern[0] == '/' or
3197
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3198
raise errors.BzrCommandError(gettext(
3199
"NAME_PATTERN should not be an absolute path"))
3200
tree, relpath = WorkingTree.open_containing(directory)
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3201
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3202
2739
ignored = globbing.Globster(name_pattern_list)
3204
self.add_cleanup(tree.lock_read().unlock)
3205
2742
for entry in tree.list_files():
3207
2744
if id is not None:
3208
2745
filename = entry[0]
3209
2746
if ignored.match(filename):
3210
2747
matches.append(filename)
3211
2749
if len(matches) > 0:
3212
self.outf.write(gettext("Warning: the following files are version "
3213
"controlled and match your ignore pattern:\n%s"
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3214
2752
"\nThese files will continue to be version controlled"
3215
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3218
2756
class cmd_ignored(Command):
3292
2829
================= =========================
3295
encoding_type = 'exact'
3296
2831
takes_args = ['dest', 'branch_or_subdir?']
3297
takes_options = ['directory',
3298
2833
Option('format',
3299
2834
help="Type of file to export to.",
3302
2837
Option('filters', help='Apply content filters to export the '
3303
2838
'convenient form.'),
3306
2841
help="Name of the root directory inside the exported file."),
3307
2842
Option('per-file-timestamps',
3308
2843
help='Set modification time of files to that of the last '
3309
2844
'revision in which it was changed.'),
3310
Option('uncommitted',
3311
help='Export the working tree contents rather than that of the '
3315
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3316
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3318
from .export import export, guess_format, get_root_name
2847
root=None, filters=False, per_file_timestamps=False):
2848
from bzrlib.export import export
3320
2850
if branch_or_subdir is None:
3321
branch_or_subdir = directory
3323
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3325
if tree is not None:
3326
self.add_cleanup(tree.lock_read().unlock)
3330
raise errors.BzrCommandError(
3331
gettext("--uncommitted requires a working tree"))
3334
export_tree = _get_one_revision_tree(
3335
'export', revision, branch=b,
3339
format = guess_format(dest)
3342
root = get_root_name(dest)
3344
if not per_file_timestamps:
3345
force_mtime = time.time()
3350
from breezy.filter_tree import ContentFilterTree
3351
export_tree = ContentFilterTree(
3352
export_tree, export_tree._content_filter_stack)
2851
tree = WorkingTree.open_containing(u'.')[0]
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3355
export(export_tree, dest, format, root, subdir,
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3356
2861
per_file_timestamps=per_file_timestamps)
3357
except errors.NoSuchExportFormat as e:
3358
raise errors.BzrCommandError(
3359
gettext('Unsupported export format: %s') % e.format)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3362
2866
class cmd_cat(Command):
3381
2885
@display_command
3382
2886
def run(self, filename, revision=None, name_from_revision=False,
3383
filters=False, directory=None):
3384
2888
if revision is not None and len(revision) != 1:
3385
raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"
3386
" one revision specifier"))
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3387
2891
tree, branch, relpath = \
3388
_open_directory_or_containing_tree_or_branch(filename, directory)
3389
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3390
2895
return self._run(tree, branch, relpath, filename, revision,
3391
2896
name_from_revision, filters)
3393
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3396
2900
if tree is None:
3397
2901
tree = b.basis_tree()
3398
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3399
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3401
2906
old_file_id = rev_tree.path2id(relpath)
3403
# TODO: Split out this code to something that generically finds the
3404
# best id for a path across one or more trees; it's like
3405
# find_ids_across_trees but restricted to find just one. -- mbp
3407
2908
if name_from_revision:
3408
2909
# Try in revision if requested
3409
2910
if old_file_id is None:
3410
raise errors.BzrCommandError(gettext(
3411
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3412
2913
filename, rev_tree.get_revision_id()))
3414
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3416
2917
cur_file_id = tree.path2id(relpath)
3417
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3418
actual_file_id = cur_file_id
3419
elif old_file_id is not None:
3420
actual_file_id = old_file_id
3422
raise errors.BzrCommandError(gettext(
3423
"{0!r} is not present in revision {1}").format(
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3424
2935
filename, rev_tree.get_revision_id()))
3425
relpath = rev_tree.id2path(actual_file_id)
3427
from .filter_tree import ContentFilterTree
3428
filter_tree = ContentFilterTree(rev_tree,
3429
rev_tree._content_filter_stack)
3430
fileobj = filter_tree.get_file(relpath, actual_file_id)
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3432
fileobj = rev_tree.get_file(relpath, actual_file_id)
3433
shutil.copyfileobj(fileobj, self.outf)
2949
self.outf.write(content)
3437
2952
class cmd_local_time_offset(Command):
3438
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
3441
2955
@display_command
3443
2957
self.outf.write("%s\n" % osutils.local_time_offset())
3480
2994
"John Doe <jdoe@example.com>". If there is more than one author of
3481
2995
the change you can specify the option multiple times, once for each
3486
3000
A common mistake is to forget to add a new file or directory before
3487
3001
running the commit command. The --strict option checks for unknown
3488
3002
files and aborts the commit if any are found. More advanced pre-commit
3489
checks can be implemented by defining hooks. See ``brz help hooks``
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3492
3006
:Things to note:
3494
3008
If you accidentially commit the wrong changes or make a spelling
3495
3009
mistake in the commit message say, you can use the uncommit command
3496
to undo it. See ``brz help uncommit`` for details.
3010
to undo it. See ``bzr help uncommit`` for details.
3498
3012
Hooks can also be configured to run after a commit. This allows you
3499
3013
to trigger updates to external systems like bug trackers. The --fixes
3500
3014
option can be used to record the association between a revision and
3501
one or more bugs. See ``brz help bugs`` for details.
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3504
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3505
3044
takes_args = ['selected*']
3506
3045
takes_options = [
3507
ListOption('exclude', type=text_type, short_name='x',
3046
ListOption('exclude', type=str, short_name='x',
3508
3047
help="Do not consider changes made to a given path."),
3509
Option('message', type=text_type,
3048
Option('message', type=unicode,
3510
3049
short_name='m',
3511
3050
help="Description of the new revision."),
3513
3052
Option('unchanged',
3514
3053
help='Commit even if nothing has changed.'),
3515
Option('file', type=text_type,
3054
Option('file', type=str,
3516
3055
short_name='F',
3517
3056
argname='msgfile',
3518
3057
help='Take commit message from this file.'),
3519
3058
Option('strict',
3520
3059
help="Refuse to commit if there are unknown "
3521
3060
"files in the working tree."),
3522
Option('commit-time', type=text_type,
3061
Option('commit-time', type=str,
3523
3062
help="Manually set a commit time using commit date "
3524
3063
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3525
ListOption('bugs', type=text_type,
3526
help="Link to a related bug. (see \"brz help bugs\")."),
3527
ListOption('fixes', type=text_type,
3064
ListOption('fixes', type=str,
3528
3065
help="Mark a bug as being fixed by this revision "
3529
"(see \"brz help bugs\")."),
3530
ListOption('author', type=text_type,
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3531
3068
help="Set the author's name, if it's different "
3532
3069
"from the committer."),
3533
3070
Option('local',
3539
3076
Option('show-diff', short_name='p',
3540
3077
help='When no message is supplied, show the diff along'
3541
3078
' with the status summary in the message editor.'),
3543
help='When committing to a foreign version control '
3544
'system do not push data that can not be natively '
3547
3080
aliases = ['ci', 'checkin']
3549
def _iter_bug_urls(self, bugs, branch, status):
3550
default_bugtracker = None
3082
def _iter_bug_fix_urls(self, fixes, branch):
3551
3083
# Configure the properties for bug fixing attributes.
3553
tokens = bug.split(':')
3554
if len(tokens) == 1:
3555
if default_bugtracker is None:
3556
branch_config = branch.get_config_stack()
3557
default_bugtracker = branch_config.get(
3559
if default_bugtracker is None:
3560
raise errors.BzrCommandError(gettext(
3561
"No tracker specified for bug %s. Use the form "
3562
"'tracker:id' or specify a default bug tracker "
3563
"using the `bugtracker` option.\nSee "
3564
"\"brz help bugs\" for more information on this "
3565
"feature. Commit refused.") % bug)
3566
tag = default_bugtracker
3568
elif len(tokens) != 2:
3569
raise errors.BzrCommandError(gettext(
3084
for fixed_bug in fixes:
3085
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3570
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3571
"See \"brz help bugs\" for more information on this "
3572
"feature.\nCommit refused.") % bug)
3574
tag, bug_id = tokens
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3576
yield bugtracker.get_bug_url(tag, branch, bug_id), status
3577
except bugtracker.UnknownBugTrackerAbbreviation:
3578
raise errors.BzrCommandError(gettext(
3579
'Unrecognized bug %s. Commit refused.') % bug)
3580
except bugtracker.MalformedBugIdentifier as e:
3581
raise errors.BzrCommandError(gettext(
3582
u"%s\nCommit refused.") % (e,))
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3584
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3585
unchanged=False, strict=False, local=False, fixes=None, bugs=None,
3586
author=None, show_diff=False, exclude=None, commit_time=None,
3589
from .commit import (
3102
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3590
3105
PointlessCommit,
3592
from .errors import (
3593
3106
ConflictsInTree,
3594
3107
StrictCommitFailed
3596
from .msgeditor import (
3109
from bzrlib.msgeditor import (
3597
3110
edit_commit_message_encoded,
3598
3111
generate_commit_message_template,
3599
make_commit_message_template_encoded,
3112
make_commit_message_template_encoded
3603
3115
commit_stamp = offset = None
3604
3116
if commit_time is not None:
3606
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3607
except ValueError as e:
3608
raise errors.BzrCommandError(gettext(
3609
"Could not parse --commit-time: " + str(e)))
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3611
3129
properties = {}
3613
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3614
3132
if selected_list == ['']:
3615
3133
# workaround - commit of root of tree should be exactly the same
3616
3134
# as just default commit in that tree, and succeed even though
3699
3205
reporter=None, verbose=verbose, revprops=properties,
3700
3206
authors=author, timestamp=commit_stamp,
3701
3207
timezone=offset,
3702
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3704
3209
except PointlessCommit:
3705
raise errors.BzrCommandError(gettext("No changes to commit."
3706
" Please 'brz add' the files you want to commit, or use"
3707
" --unchanged to force an empty commit."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3708
3212
except ConflictsInTree:
3709
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3710
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3712
3216
except StrictCommitFailed:
3713
raise errors.BzrCommandError(gettext("Commit refused because there are"
3714
" unknown files in the working tree."))
3715
except errors.BoundBranchOutOfDate as e:
3716
e.extra_help = (gettext("\n"
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3219
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3717
3221
'To commit to master branch, run update and then commit.\n'
3718
3222
'You can also pass --local to commit to continue working '
3793
3297
class cmd_upgrade(Command):
3794
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3796
When the default format has changed after a major new release of
3797
Bazaar, you may be informed during certain operations that you
3798
should upgrade. Upgrading to a newer format may improve performance
3799
or make new features available. It may however limit interoperability
3800
with older repositories or with older versions of Bazaar.
3802
If you wish to upgrade to a particular format rather than the
3803
current default, that can be specified using the --format option.
3804
As a consequence, you can use the upgrade command this way to
3805
"downgrade" to an earlier format, though some conversions are
3806
a one way process (e.g. changing from the 1.x default to the
3807
2.x default) so downgrading is not always possible.
3809
A backup.bzr.~#~ directory is created at the start of the conversion
3810
process (where # is a number). By default, this is left there on
3811
completion. If the conversion fails, delete the new .bzr directory
3812
and rename this one back in its place. Use the --clean option to ask
3813
for the backup.bzr directory to be removed on successful conversion.
3814
Alternatively, you can delete it by hand if everything looks good
3817
If the location given is a shared repository, dependent branches
3818
are also converted provided the repository converts successfully.
3819
If the conversion of a branch fails, remaining branches are still
3822
For more information on upgrades, see the Bazaar Upgrade Guide,
3823
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3826
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3827
3306
takes_args = ['url?']
3828
3307
takes_options = [
3829
RegistryOption('format',
3830
help='Upgrade to a specific format. See "brz help'
3831
' formats" for details.',
3832
lazy_registry=('breezy.controldir', 'format_registry'),
3833
converter=lambda name: controldir.format_registry.make_controldir(name),
3834
value_switches=True, title='Branch format'),
3836
help='Remove the backup.bzr directory if successful.'),
3838
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3841
def run(self, url='.', format=None, clean=False, dry_run=False):
3842
from .upgrade import upgrade
3843
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3845
if len(exceptions) == 1:
3846
# Compatibility with historical behavior
3316
def run(self, url='.', format=None):
3317
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3852
3321
class cmd_whoami(Command):
3853
__doc__ = """Show or set brz user id.
3322
__doc__ = """Show or set bzr user id.
3856
3325
Show the email of the current user::
3860
3329
Set the current user::
3862
brz whoami "Frank Chu <fchu@example.com>"
3331
bzr whoami "Frank Chu <fchu@example.com>"
3864
takes_options = [ 'directory',
3333
takes_options = [ Option('email',
3866
3334
help='Display email address only.'),
3867
3335
Option('branch',
3868
3336
help='Set identity for the current branch instead of '
3872
3340
encoding_type = 'replace'
3874
3342
@display_command
3875
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3876
3344
if name is None:
3877
if directory is None:
3878
# use branch if we're inside one; otherwise global config
3880
c = Branch.open_containing(u'.')[0].get_config_stack()
3881
except errors.NotBranchError:
3882
c = _mod_config.GlobalStack()
3884
c = Branch.open(directory).get_config_stack()
3885
identity = c.get('email')
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3887
self.outf.write(_mod_config.extract_email_address(identity)
3351
self.outf.write(c.user_email() + '\n')
3890
self.outf.write(identity + '\n')
3353
self.outf.write(c.username() + '\n')
3894
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3897
3356
# display a warning if an email address isn't included in the given name.
3899
_mod_config.extract_email_address(name)
3900
except _mod_config.NoEmailInUsername as e:
3358
config.extract_email_address(name)
3359
except errors.NoEmailInUsername, e:
3901
3360
warning('"%s" does not seem to contain an email address. '
3902
3361
'This is allowed, but not recommended.', name)
3904
3363
# use global config unless --branch given
3906
if directory is None:
3907
c = Branch.open_containing(u'.')[0].get_config_stack()
3909
b = Branch.open(directory)
3910
self.add_cleanup(b.lock_write().unlock)
3911
c = b.get_config_stack()
3365
c = Branch.open_containing('.')[0].get_config()
3913
c = _mod_config.GlobalStack()
3914
c.set('email', name)
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3917
3371
class cmd_nick(Command):
3918
3372
__doc__ = """Print or set the branch nickname.
3920
If unset, the colocated branch name is used for colocated branches, and
3921
the branch directory name is used for other branches. To print the
3922
current nickname, execute with no argument.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3924
3377
Bound branches use the nickname of its master branch unless it is set
3982
3433
def remove_alias(self, alias_name):
3983
3434
if alias_name is None:
3984
raise errors.BzrCommandError(gettext(
3985
'brz alias --remove expects an alias to remove.'))
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3986
3437
# If alias is not found, print something like:
3987
3438
# unalias: foo: not found
3988
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3989
3440
c.unset_alias(alias_name)
3991
3442
@display_command
3992
3443
def print_aliases(self):
3993
3444
"""Print out the defined aliases in a similar format to bash."""
3994
aliases = _mod_config.GlobalConfig().get_aliases()
3995
for key, value in sorted(viewitems(aliases)):
3996
self.outf.write('brz alias %s="%s"\n' % (key, value))
3445
aliases = config.GlobalConfig().get_aliases()
3446
for key, value in sorted(aliases.iteritems()):
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3998
3449
@display_command
3999
3450
def print_alias(self, alias_name):
4000
from .commands import get_alias
3451
from bzrlib.commands import get_alias
4001
3452
alias = get_alias(alias_name)
4002
3453
if alias is None:
4003
self.outf.write("brz alias: %s: not found\n" % alias_name)
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
4005
3456
self.outf.write(
4006
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
4008
3459
def set_alias(self, alias_name, alias_command):
4009
3460
"""Save the alias in the global config."""
4010
c = _mod_config.GlobalConfig()
3461
c = config.GlobalConfig()
4011
3462
c.set_alias(alias_name, alias_command)
4045
3496
Tests that need working space on disk use a common temporary directory,
4046
3497
typically inside $TMPDIR or /tmp.
4048
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4049
3500
into a pdb postmortem session.
4051
The --coverage=DIRNAME global option produces a report with covered code
4055
3503
Run only tests relating to 'ignore'::
4059
3507
Disable plugins and list tests as they're run::
4061
brz --no-plugins selftest -v
3509
bzr --no-plugins selftest -v
4063
3511
# NB: this is used from the class without creating an instance, which is
4064
3512
# why it does not have a self parameter.
4065
3513
def get_transport_type(typestring):
4066
3514
"""Parse and return a transport specifier."""
4067
3515
if typestring == "sftp":
4068
from .tests import stub_sftp
3516
from bzrlib.tests import stub_sftp
4069
3517
return stub_sftp.SFTPAbsoluteServer
4070
elif typestring == "memory":
4071
from .tests import test_server
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4072
3520
return memory.MemoryServer
4073
elif typestring == "fakenfs":
4074
from .tests import test_server
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4075
3523
return test_server.FakeNFSServer
4076
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
4104
3554
help='List the tests instead of running them.'),
4105
3555
RegistryOption('parallel',
4106
3556
help="Run the test suite in parallel.",
4107
lazy_registry=('breezy.tests', 'parallel_registry'),
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4108
3558
value_switches=False,
4110
Option('randomize', type=text_type, argname="SEED",
3560
Option('randomize', type=str, argname="SEED",
4111
3561
help='Randomize the order of tests using the given'
4112
3562
' seed or "now" for the current time.'),
4113
ListOption('exclude', type=text_type, argname="PATTERN",
4115
help='Exclude tests that match this regular'
4118
help='Output test progress via subunit v1.'),
4120
help='Output test progress via subunit v2.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3568
help='Output test progress via subunit.'),
4121
3569
Option('strict', help='Fail on missing dependencies or '
4122
3570
'known failures.'),
4123
Option('load-list', type=text_type, argname='TESTLISTFILE',
3571
Option('load-list', type=str, argname='TESTLISTFILE',
4124
3572
help='Load a test id list from a text file.'),
4125
ListOption('debugflag', type=text_type, short_name='E',
3573
ListOption('debugflag', type=str, short_name='E',
4126
3574
help='Turn on a selftest debug flag.'),
4127
ListOption('starting-with', type=text_type, argname='TESTID',
3575
ListOption('starting-with', type=str, argname='TESTID',
4128
3576
param_name='starting_with', short_name='s',
4130
3578
'Load only the tests starting with TESTID.'),
4132
help="By default we disable fsync and fdatasync"
4133
" while running the test suite.")
4135
3580
encoding_type = 'replace'
4141
3586
def run(self, testspecs_list=None, verbose=False, one=False,
4142
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
4144
3589
first=False, list_only=False,
4145
3590
randomize=None, exclude=None, strict=False,
4146
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4147
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4149
# During selftest, disallow proxying, as it can cause severe
4150
# performance penalties and is only needed for thread
4151
# safety. The selftest command is assumed to not use threads
4152
# too heavily. The call should be as early as possible, as
4153
# error reporting for past duplicate imports won't have useful
4155
if sys.version_info[0] < 3:
4156
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4157
# disallowing it currently leads to failures in many places.
4158
lazy_import.disallow_proxying()
4163
raise errors.BzrCommandError("tests not available. Install the "
4164
"breezy tests to run the breezy testsuite.")
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4166
3602
if testspecs_list is not None:
4167
3603
pattern = '|'.join(testspecs_list)
4172
from .tests import SubUnitBzrRunnerv1
3608
from bzrlib.tests import SubUnitBzrRunner
4173
3609
except ImportError:
4174
raise errors.BzrCommandError(gettext(
4175
"subunit not available. subunit needs to be installed "
4176
"to use --subunit."))
4177
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4178
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4179
# stdout, which would corrupt the subunit stream.
4180
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4181
# following code can be deleted when it's sufficiently deployed
4182
# -- vila/mgz 20100514
4183
if (sys.platform == "win32"
4184
and getattr(sys.stdout, 'fileno', None) is not None):
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4186
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4189
from .tests import SubUnitBzrRunnerv2
4191
raise errors.BzrCommandError(gettext(
4192
"subunit not available. subunit "
4193
"needs to be installed to use --subunit2."))
4194
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
4197
3619
self.additional_selftest_args.setdefault(
4198
3620
'suite_decorators', []).append(parallel)
4200
raise errors.BzrCommandError(gettext(
4201
"--benchmark is no longer supported from brz 2.2; "
4202
"use bzr-usertest instead"))
4203
test_suite_factory = None
4205
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4207
exclude_pattern = '(' + '|'.join(exclude) + ')'
4209
self._disable_fsync()
3629
test_suite_factory = None
4210
3631
selftest_kwargs = {"verbose": verbose,
4211
3632
"pattern": pattern,
4212
3633
"stop_on_failure": one,
4214
3635
"test_suite_factory": test_suite_factory,
4215
3636
"lsprof_timed": lsprof_timed,
4216
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
4217
3639
"matching_tests_first": first,
4218
3640
"list_only": list_only,
4219
3641
"random_seed": randomize,
4220
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
4221
3643
"strict": strict,
4222
3644
"load_list": load_list,
4223
3645
"debug_flags": debugflag,
4224
3646
"starting_with": starting_with
4226
3648
selftest_kwargs.update(self.additional_selftest_args)
4228
# Make deprecation warnings visible, unless -Werror is set
4229
cleanup = symbol_versioning.activate_deprecation_warnings(
4232
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
4235
3650
return int(not result)
4237
def _disable_fsync(self):
4238
"""Change the 'os' functionality to not synchronize."""
4239
self._orig_fsync = getattr(os, 'fsync', None)
4240
if self._orig_fsync is not None:
4241
os.fsync = lambda filedes: None
4242
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4243
if self._orig_fdatasync is not None:
4244
os.fdatasync = lambda filedes: None
4247
3653
class cmd_version(Command):
4248
__doc__ = """Show version of brz."""
3654
__doc__ = """Show version of bzr."""
4250
3656
encoding_type = 'replace'
4251
3657
takes_options = [
4302
3709
The source of the merge can be specified either in the form of a branch,
4303
3710
or in the form of a path to a file containing a merge directive generated
4304
with brz send. If neither is specified, the default is the upstream branch
4305
or the branch most recently merged using --remember. The source of the
4306
merge may also be specified in the form of a path to a file in another
4307
branch: in this case, only the modifications to that file are merged into
4308
the current working tree.
4310
When merging from a branch, by default brz will try to merge in all new
4311
work from the other branch, automatically determining an appropriate base
4312
revision. If this fails, you may need to give an explicit base.
4314
To pick a different ending revision, pass "--revision OTHER". brz will
4315
try to merge in all new work up to and including revision OTHER.
4317
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4318
through OTHER, excluding BASE but including OTHER, will be merged. If this
4319
causes some revisions to be skipped, i.e. if the destination branch does
4320
not already contain revision BASE, such a merge is commonly referred to as
4321
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4322
cherrypicks. The changes look like a normal commit, and the history of the
4323
changes from the other branch is not stored in the commit.
4325
Revision numbers are always relative to the source branch.
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4327
3725
Merge will do its best to combine the changes in two branches, but there
4328
3726
are some kinds of problems only a human can fix. When it encounters those,
4329
3727
it will mark a conflict. A conflict means that you need to fix something,
4330
before you can commit.
4332
Use brz resolve when you have fixed a problem. See also brz conflicts.
4334
If there is no default branch set, the first merge will set it (use
4335
--no-remember to avoid setting it). After that, you can omit the branch
4336
to use the default. To change the default, use --remember. The value will
4337
only be saved if the remote location can be accessed.
3728
before you should commit.
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4339
3737
The results of the merge are placed into the destination working
4340
directory, where they can be reviewed (with brz diff), tested, and then
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4341
3739
committed to record the result of the merge.
4343
3741
merge refuses to run if there are any uncommitted changes, unless
4344
--force is given. If --force is given, then the changes from the source
4345
will be merged with the current working tree, including any uncommitted
4346
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4347
3743
merge revision which has more than two parents.
4349
3745
If one would like to merge changes from the working tree of the other
4559
3950
# Use reprocess if the merger supports it
4560
3951
merger.reprocess = merger.merge_type.supports_reprocess
4561
3952
if merger.reprocess and not merger.merge_type.supports_reprocess:
4562
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4563
" for merge type %s.") %
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4564
3955
merger.merge_type)
4565
3956
if merger.reprocess and merger.show_base:
4566
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4569
if (merger.merge_type.requires_file_merge_plan and
4570
(not getattr(merger.this_tree, 'plan_file_merge', None) or
4571
not getattr(merger.other_tree, 'plan_file_merge', None) or
4572
(merger.base_tree is not None and
4573
not getattr(merger.base_tree, 'plan_file_merge', None)))):
4574
raise errors.BzrCommandError(
4575
gettext('Plan file merge unsupported: '
4576
'Merge type incompatible with tree formats.'))
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4578
3960
def _get_merger_from_branch(self, tree, location, revision, remember,
4579
3961
possible_transports, pb):
4580
3962
"""Produce a merger from a location, assuming it refers to a branch."""
3963
from bzrlib.tag import _merge_tags_if_possible
4581
3964
# find the branch locations
4582
3965
other_loc, user_location = self._select_branch_location(tree, location,
4722
4097
def run(self, file_list=None, merge_type=None, show_base=False,
4723
4098
reprocess=False):
4724
from .conflicts import restore
4099
from bzrlib.conflicts import restore
4725
4100
if merge_type is None:
4726
4101
merge_type = _mod_merge.Merge3Merger
4727
tree, file_list = WorkingTree.open_containing_paths(file_list)
4728
self.add_cleanup(tree.lock_write().unlock)
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4729
4105
parents = tree.get_parent_ids()
4730
4106
if len(parents) != 2:
4731
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4732
4108
" merges. Not cherrypicking or"
4734
4110
repository = tree.branch.repository
4735
interesting_files = None
4111
interesting_ids = None
4736
4112
new_conflicts = []
4737
4113
conflicts = tree.conflicts()
4738
4114
if file_list is not None:
4739
interesting_files = set()
4115
interesting_ids = set()
4740
4116
for filename in file_list:
4741
if not tree.is_versioned(filename):
4117
file_id = tree.path2id(filename)
4742
4119
raise errors.NotVersionedError(filename)
4743
interesting_files.add(filename)
4744
if tree.kind(filename) != "directory":
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4747
for path, ie in tree.iter_entries_by_dir(specific_files=[filename]):
4748
interesting_files.add(path)
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4749
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4751
4128
# Remerge only supports resolving contents conflicts
4752
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4753
4130
restore_files = [c.path for c in conflicts
4754
4131
if c.typestring in allowed_conflicts]
4755
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4756
4133
tree.set_conflicts(ConflictList(new_conflicts))
4757
4134
if file_list is not None:
4758
4135
restore_files = file_list
4785
4162
class cmd_revert(Command):
4787
Set files in the working tree back to the contents of a previous revision.
4163
__doc__ = """Revert files to a previous revision.
4789
4165
Giving a list of files will revert only those files. Otherwise, all files
4790
4166
will be reverted. If the revision is not specified with '--revision', the
4791
working tree basis revision is used. A revert operation affects only the
4792
working tree, not any revision history like the branch and repository or
4793
the working tree basis revision.
4167
last committed revision is used.
4795
4169
To remove only some changes, without reverting to a prior version, use
4796
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4797
will remove the changes introduced by the second last commit (-2), without
4798
affecting the changes introduced by the last commit (-1). To remove
4799
certain changes on a hunk-by-hunk basis, see the shelve command.
4800
To update the branch to a specific revision or the latest revision and
4801
update the working tree accordingly while preserving local changes, see the
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4804
Uncommitted changes to files that are reverted will be discarded.
4805
Howver, by default, any files that have been manually changed will be
4806
backed up first. (Files changed only by merge are not backed up.) Backup
4807
files have '.~#~' appended to their name, where # is a number.
4174
By default, any files that have been manually changed will be backed up
4175
first. (Files changed only by merge are not backed up.) Backup files have
4176
'.~#~' appended to their name, where # is a number.
4809
4178
When you provide files, you can use their current pathname or the pathname
4810
4179
from the target revision. So you can use revert to "undelete" a file by
5060
4419
if remote_extra and not mine_only:
5061
4420
if printed_local is True:
5062
4421
message("\n\n\n")
5063
message(ngettext("You are missing %d revision:\n",
5064
"You are missing %d revisions:\n",
5065
len(remote_extra)) %
4422
message("You are missing %d revision(s):\n" %
5066
4423
len(remote_extra))
5067
if remote_branch.supports_tags():
5068
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
5069
4424
for revision in iter_log_revisions(remote_extra,
5070
4425
remote_branch.repository,
5073
4427
lf.log_revision(revision)
5074
4428
status_code = 1
5076
4430
if mine_only and not local_extra:
5077
4431
# We checked local, and found nothing extra
5078
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
5079
4433
elif theirs_only and not remote_extra:
5080
4434
# We checked remote, and found nothing extra
5081
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
5082
4436
elif not (mine_only or theirs_only or local_extra or
5084
4438
# We checked both branches, and neither one had extra
5086
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
5087
4441
self.cleanup_now()
5088
4442
if not status_code and parent is None and other_branch is not None:
5089
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5090
4445
# handle race conditions - a parent might be set while we run.
5091
4446
if local_branch.get_parent() is None:
5092
4447
local_branch.set_parent(remote_branch.base)
5207
4578
Option('long', help='Show commit date in annotations.'),
5212
4582
encoding_type = 'exact'
5214
4584
@display_command
5215
4585
def run(self, filename, all=False, long=False, revision=None,
5216
show_ids=False, directory=None):
5217
from .annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5220
4588
wt, branch, relpath = \
5221
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5222
4590
if wt is not None:
5223
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
5225
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5226
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5227
self.add_cleanup(tree.lock_read().unlock)
5228
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
5229
4600
file_id = wt.path2id(relpath)
5231
4602
file_id = tree.path2id(relpath)
5232
4603
if file_id is None:
5233
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
5234
4606
if wt is not None and revision is None:
5235
4607
# If there is a tree and we're not annotating historical
5236
4608
# versions, annotate the working tree's content.
5237
annotate_file_tree(wt, relpath, self.outf, long, all,
5238
show_ids=show_ids, file_id=file_id)
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5240
annotate_file_tree(tree, relpath, self.outf, long, all,
5241
show_ids=show_ids, branch=branch, file_id=file_id)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5244
4616
class cmd_re_sign(Command):
5248
4620
hidden = True # is this right ?
5249
4621
takes_args = ['revision_id*']
5250
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
5252
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
5253
4625
if revision_id_list is not None and revision is not None:
5254
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5255
4627
if revision_id_list is None and revision is None:
5256
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5257
b = WorkingTree.open_containing(directory)[0].branch
5258
self.add_cleanup(b.lock_write().unlock)
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5259
4632
return self._run(b, revision_id_list, revision)
5261
4634
def _run(self, b, revision_id_list, revision):
5262
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5263
4637
if revision_id_list is not None:
5264
4638
b.repository.start_write_group()
5266
4640
for revision_id in revision_id_list:
5267
revision_id = cache_utf8.encode(revision_id)
5268
4641
b.repository.sign_revision(revision_id, gpg_strategy)
5270
4643
b.repository.abort_write_group()
5321
4694
_see_also = ['checkouts', 'unbind']
5322
4695
takes_args = ['location?']
5323
takes_options = ['directory']
5325
def run(self, location=None, directory=u'.'):
5326
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5327
4700
if location is None:
5329
4702
location = b.get_old_bound_location()
5330
4703
except errors.UpgradeRequired:
5331
raise errors.BzrCommandError(gettext('No location supplied. '
5332
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5334
4707
if location is None:
5335
4708
if b.get_bound_location() is not None:
5336
raise errors.BzrCommandError(
5337
gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5339
raise errors.BzrCommandError(
5340
gettext('No location supplied'
5341
' and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5342
4713
b_other = Branch.open(location)
5344
4715
b.bind(b_other)
5345
4716
except errors.DivergedBranches:
5346
raise errors.BzrCommandError(gettext('These branches have diverged.'
5347
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5348
4719
if b.get_config().has_explicit_nickname():
5349
4720
b.nick = b_other.nick
5414
4784
b = control.open_branch()
5416
4786
if tree is not None:
5417
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5419
self.add_cleanup(b.lock_write().unlock)
5420
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5423
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5425
from .log import log_formatter, show_log
5426
from .uncommit import uncommit
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
from bzrlib.log import log_formatter, show_log
4796
from bzrlib.uncommit import uncommit
5428
4798
last_revno, last_rev_id = b.last_revision_info()
5457
4827
end_revision=last_revno)
5460
self.outf.write(gettext('Dry-run, pretending to remove'
5461
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5463
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5466
if not ui.ui_factory.confirm_action(
5467
gettext(u'Uncommit these revisions'),
5468
'breezy.builtins.uncommit',
5470
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5473
4840
mutter('Uncommitting from {%s} to {%s}',
5474
4841
last_rev_id, rev_id)
5475
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5476
revno=revno, local=local, keep_tags=keep_tags)
5477
self.outf.write(gettext('You can restore the old tip by running:\n'
5478
' brz pull . -r revid:%s\n') % last_rev_id.decode('utf-8'))
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5481
4848
class cmd_break_lock(Command):
5482
__doc__ = """Break a dead lock.
5484
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5487
4851
CAUTION: Locks should only be broken when you are sure that the process
5488
4852
holding the lock has been stopped.
5490
You can get information on what locks are open via the 'brz info
4854
You can get information on what locks are open via the 'bzr info
5491
4855
[location]' command.
5495
brz break-lock brz+ssh://example.com/brz/foo
5496
brz break-lock --conf ~/.bazaar
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5499
4861
takes_args = ['location?']
5502
help='LOCATION is the directory where the config lock is.'),
5504
help='Do not ask for confirmation before breaking the lock.'),
5507
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5508
4864
if location is None:
5509
4865
location = u'.'
5511
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5513
{'breezy.lockdir.break': True})
5515
conf = _mod_config.LockableConfig(file_name=location)
5518
control, relpath = controldir.ControlDir.open_containing(location)
5520
control.break_lock()
5521
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5525
4873
class cmd_wait_until_signalled(Command):
5526
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5528
4876
This just prints a line to signal when it is ready, then blocks on stdin.
5546
4894
help='Serve on stdin/out for use from inetd or sshd.'),
5547
4895
RegistryOption('protocol',
5548
4896
help="Protocol to serve.",
5549
lazy_registry=('breezy.transport', 'transport_server_registry'),
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5550
4898
value_switches=True),
5552
help='Listen for connections on nominated address.', type=text_type),
5554
help='Listen for connections on nominated port. Passing 0 as '
5555
'the port number will result in a dynamically allocated '
5556
'port. The default port depends on the protocol.',
5558
custom_help('directory',
5559
help='Serve contents of this directory.'),
4900
help='Listen for connections on nominated port of the form '
4901
'[hostname:]portnumber. Passing 0 as the port number will '
4902
'result in a dynamically allocated port. The default port '
4903
'depends on the protocol.',
4906
help='Serve contents of this directory.',
5560
4908
Option('allow-writes',
5561
4909
help='By default the server is a readonly server. Supplying '
5562
4910
'--allow-writes enables write access to the contents of '
5563
'the served directory and below. Note that ``brz serve`` '
4911
'the served directory and below. Note that ``bzr serve`` '
5564
4912
'does not perform authentication, so unless some form of '
5565
4913
'external authentication is arranged supplying this '
5566
4914
'option leads to global uncontrolled write access to your '
5569
Option('client-timeout', type=float,
5570
help='Override the default idle client timeout (5min).'),
5573
def run(self, listen=None, port=None, inet=False, directory=None,
5574
allow_writes=False, protocol=None, client_timeout=None):
5575
from . import transport
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4932
if port is not None:
4934
host, port = port.split(':')
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5576
4941
if directory is None:
5577
directory = osutils.getcwd()
4942
directory = os.getcwd()
5578
4943
if protocol is None:
5579
protocol = transport.transport_server_registry.get()
5580
url = transport.location_to_url(directory)
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5581
4947
if not allow_writes:
5582
4948
url = 'readonly+' + url
5583
t = transport.get_transport_from_url(url)
5584
protocol(t, listen, port, inet, client_timeout)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5587
4953
class cmd_join(Command):
5607
4973
def run(self, tree, reference=False):
5608
from breezy.mutabletree import BadReferenceTarget
5609
4974
sub_tree = WorkingTree.open(tree)
5610
4975
parent_dir = osutils.dirname(sub_tree.basedir)
5611
4976
containing_tree = WorkingTree.open_containing(parent_dir)[0]
5612
4977
repo = containing_tree.branch.repository
5613
4978
if not repo.supports_rich_root():
5614
raise errors.BzrCommandError(gettext(
4979
raise errors.BzrCommandError(
5615
4980
"Can't join trees because %s doesn't support rich root data.\n"
5616
"You can use brz upgrade on the repository.")
4981
"You can use bzr upgrade on the repository."
5620
4985
containing_tree.add_reference(sub_tree)
5621
except BadReferenceTarget as e:
4986
except errors.BadReferenceTarget, e:
5622
4987
# XXX: Would be better to just raise a nicely printable
5623
4988
# exception from the real origin. Also below. mbp 20070306
5624
raise errors.BzrCommandError(
5625
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5628
4993
containing_tree.subsume(sub_tree)
5629
except errors.BadSubsumeSource as e:
5630
raise errors.BzrCommandError(
5631
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5634
4999
class cmd_split(Command):
5691
5055
diff='Normal unified diff.',
5692
5056
plain='No patch, just directive.'),
5693
5057
Option('sign', help='GPG-sign the directive.'), 'revision',
5694
Option('mail-to', type=text_type,
5058
Option('mail-to', type=str,
5695
5059
help='Instead of printing the directive, email to this address.'),
5696
Option('message', type=text_type, short_name='m',
5060
Option('message', type=str, short_name='m',
5697
5061
help='Message to use when committing this merge.')
5700
5064
encoding_type = 'exact'
5702
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5703
sign=False, revision=None, mail_to=None, message=None,
5705
from .revision import ensure_null, NULL_REVISION
5067
sign=False, revision=None, mail_to=None, message=None):
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5706
5069
include_patch, include_bundle = {
5707
5070
'plain': (False, False),
5708
5071
'diff': (True, False),
5709
5072
'bundle': (True, True),
5711
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5712
5075
stored_submit_branch = branch.get_submit_branch()
5713
5076
if submit_branch is None:
5714
5077
submit_branch = stored_submit_branch
5806
5162
given, in which case it is sent to a file.
5808
5164
Mail is sent using your preferred mail program. This should be transparent
5809
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5810
5166
If the preferred client can't be found (or used), your editor will be used.
5812
5168
To use a specific mail program, set the mail_client configuration option.
5813
Supported values for specific clients are "claws", "evolution", "kmail",
5814
"mail.app" (MacOS X's Mail.app), "mutt", and "thunderbird"; generic options
5815
are "default", "editor", "emacsclient", "mapi", and "xdg-email". Plugins
5816
may also add supported clients.
5169
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5170
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5171
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5172
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5818
5175
If mail is being sent, a to address is required. This can be supplied
5819
5176
either on the commandline, by setting the submit_to configuration
5820
5177
option in the branch itself or the child_submit_to configuration option
5821
5178
in the submit branch.
5823
The merge directives created by brz send may be applied using brz merge or
5824
brz pull by specifying a file containing a merge directive as the location.
5826
brz send makes extensive use of public locations to map local locations into
5827
URLs that can be used by other people. See `brz help configuration` to
5828
set them, and use `brz info` to display them.
5180
Two formats are currently supported: "4" uses revision bundle format 4 and
5181
merge directive format 2. It is significantly faster and smaller than
5182
older formats. It is compatible with Bazaar 0.19 and later. It is the
5183
default. "0.9" uses revision bundle format 0.9 and merge directive
5184
format 1. It is compatible with Bazaar 0.12 - 0.18.
5186
The merge directives created by bzr send may be applied using bzr merge or
5187
bzr pull by specifying a file containing a merge directive as the location.
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
5831
5194
encoding_type = 'exact'
5845
5208
help='Branch to generate the submission from, '
5846
5209
'rather than the one containing the working directory.',
5847
5210
short_name='f',
5849
5212
Option('output', short_name='o',
5850
5213
help='Write merge directive to this file or directory; '
5851
5214
'use - for stdout.',
5853
5216
Option('strict',
5854
5217
help='Refuse to send if there are uncommitted changes in'
5855
5218
' the working tree, --no-strict disables the check.'),
5856
5219
Option('mail-to', help='Mail the request to this address.',
5860
Option('body', help='Body for the email.', type=text_type),
5223
Option('body', help='Body for the email.', type=unicode),
5861
5224
RegistryOption('format',
5862
5225
help='Use the specified output format.',
5863
lazy_registry=('breezy.send', 'format_registry')),
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5866
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5867
no_patch=False, revision=None, remember=None, output=None,
5230
no_patch=False, revision=None, remember=False, output=None,
5868
5231
format=None, mail_to=None, message=None, body=None,
5869
5232
strict=None, **kwargs):
5870
from .send import send
5233
from bzrlib.send import send
5871
5234
return send(submit_branch, revision, public_branch, remember,
5872
5235
format, no_bundle, no_patch, output,
5873
5236
kwargs.get('from', '.'), mail_to, message, body,
5987
5359
branch, relpath = Branch.open_containing(directory)
5988
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5990
5363
if tag_name is None:
5991
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5992
5365
branch.tags.delete_tag(tag_name)
5993
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5996
5369
if len(revision) != 1:
5997
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5998
5371
"Tags can only be placed on a single revision, "
6000
5373
revision_id = revision[0].as_revision_id(branch)
6002
5375
revision_id = branch.last_revision()
6003
5376
if tag_name is None:
6004
5377
tag_name = branch.automatic_tag_name(revision_id)
6005
5378
if tag_name is None:
6006
raise errors.BzrCommandError(gettext(
6007
"Please specify a tag name."))
6009
existing_target = branch.tags.lookup_tag(tag_name)
6010
except errors.NoSuchTag:
6011
existing_target = None
6012
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
6013
5382
raise errors.TagAlreadyExists(tag_name)
6014
if existing_target == revision_id:
6015
note(gettext('Tag %s already exists for that revision.') % tag_name)
6017
branch.tags.set_tag(tag_name, revision_id)
6018
if existing_target is None:
6019
note(gettext('Created tag %s.') % tag_name)
6021
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6024
5387
class cmd_tags(Command):
6030
5393
_see_also = ['tag']
6031
5394
takes_options = [
6032
custom_help('directory',
6033
help='Branch whose tags should be displayed.'),
6034
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6035
5401
'Sort tags by different criteria.', title='Sorting',
6036
lazy_registry=('breezy.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6042
5409
@display_command
6043
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6044
from .tag import tag_sort_methods
6045
5416
branch, relpath = Branch.open_containing(directory)
6047
tags = list(viewitems(branch.tags.get_tag_dict()))
5418
tags = branch.tags.get_tag_dict().items()
6051
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
6053
# Restrict to the specified range
6054
tags = self._tags_for_range(branch, revision)
6056
sort = tag_sort_methods.get()
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6058
5444
if not show_ids:
6059
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
6060
5446
for index, (tag, revid) in enumerate(tags):
6062
5448
revno = branch.revision_id_to_dotted_revno(revid)
6063
5449
if isinstance(revno, tuple):
6064
5450
revno = '.'.join(map(str, revno))
6065
except (errors.NoSuchRevision,
6066
errors.GhostRevisionsHaveNoRevno,
6067
errors.UnsupportedOperation):
5451
except errors.NoSuchRevision:
6068
5452
# Bad tag data/merges can lead to tagged revisions
6069
5453
# which are not in this branch. Fail gracefully ...
6071
5455
tags[index] = (tag, revno)
6073
tags = [(tag, revid.decode('utf-8')) for (tag, revid) in tags]
6074
5456
self.cleanup_now()
6075
5457
for tag, revspec in tags:
6076
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
6078
def _tags_for_range(self, branch, revision):
6079
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6080
revid1, revid2 = rev1.rev_id, rev2.rev_id
6081
# _get_revision_range will always set revid2 if it's not specified.
6082
# If revid1 is None, it means we want to start from the branch
6083
# origin which is always a valid ancestor. If revid1 == revid2, the
6084
# ancestry check is useless.
6085
if revid1 and revid1 != revid2:
6086
# FIXME: We really want to use the same graph than
6087
# branch.iter_merge_sorted_revisions below, but this is not
6088
# easily available -- vila 2011-09-23
6089
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6090
# We don't want to output anything in this case...
6092
# only show revisions between revid1 and revid2 (inclusive)
6093
tagged_revids = branch.tags.get_reverse_tag_dict()
6095
for r in branch.iter_merge_sorted_revisions(
6096
start_revision_id=revid2, stop_revision_id=revid1,
6097
stop_rule='include'):
6098
revid_tags = tagged_revids.get(r[0], None)
6100
found.extend([(tag, r[0]) for tag in revid_tags])
6104
5461
class cmd_reconfigure(Command):
6105
__doc__ = """Reconfigure the type of a brz directory.
5462
__doc__ = """Reconfigure the type of a bzr directory.
6107
5464
A target configuration must be specified.
6119
5476
takes_args = ['location?']
6120
5477
takes_options = [
6121
5478
RegistryOption.from_kwargs(
6124
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6125
5482
value_switches=True, enum_switch=False,
6126
5483
branch='Reconfigure to be an unbound branch with no working tree.',
6127
5484
tree='Reconfigure to be an unbound branch with a working tree.',
6128
5485
checkout='Reconfigure to be a bound branch with a working tree.',
6129
5486
lightweight_checkout='Reconfigure to be a lightweight'
6130
5487
' checkout (with no local history).',
6132
RegistryOption.from_kwargs(
6134
title='Repository type',
6135
help='Location fo the repository.',
6136
value_switches=True, enum_switch=False,
6137
5488
standalone='Reconfigure to be a standalone branch '
6138
5489
'(i.e. stop using shared repository).',
6139
5490
use_shared='Reconfigure to use a shared repository.',
6141
RegistryOption.from_kwargs(
6143
title='Trees in Repository',
6144
help='Whether new branches in the repository have trees.',
6145
value_switches=True, enum_switch=False,
6146
5491
with_trees='Reconfigure repository to create '
6147
5492
'working trees on branches by default.',
6148
5493
with_no_trees='Reconfigure repository to not create '
6149
5494
'working trees on branches by default.'
6151
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
6152
5497
Option('force',
6153
5498
help='Perform reconfiguration even if local changes'
6154
5499
' will be lost.'),
6155
5500
Option('stacked-on',
6156
5501
help='Reconfigure a branch to be stacked on another branch.',
6159
5504
Option('unstacked',
6160
5505
help='Reconfigure a branch to be unstacked. This '
6175
5520
# At the moment you can use --stacked-on and a different
6176
5521
# reconfiguration shape at the same time; there seems no good reason
6178
if (tree_type is None and
6179
repository_type is None and
6180
repository_trees is None):
5523
if target_type is None:
6181
5524
if stacked_on or unstacked:
6184
raise errors.BzrCommandError(gettext('No target configuration '
6186
reconfiguration = None
6187
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6188
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
6189
elif tree_type == 'tree':
5531
elif target_type == 'tree':
6190
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
6191
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
6192
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
6193
5535
directory, bind_to)
6194
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
6195
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
6196
5538
directory, bind_to)
6198
reconfiguration.apply(force)
6199
reconfiguration = None
6200
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
6201
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
6202
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
6203
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6205
reconfiguration.apply(force)
6206
reconfiguration = None
6207
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
6208
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6209
5545
directory, True)
6210
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
6211
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6212
5548
directory, False)
6214
reconfiguration.apply(force)
6215
reconfiguration = None
5549
reconfiguration.apply(force)
6218
5552
class cmd_switch(Command):
6241
5575
takes_args = ['to_location?']
6242
takes_options = ['directory',
5576
takes_options = [Option('force',
6244
5577
help='Switch even if local commits will be lost.'),
6246
5579
Option('create-branch', short_name='b',
6247
5580
help='Create the target branch from this one before'
6248
5581
' switching to it.'),
6250
help='Store and restore uncommitted changes in the'
6254
5584
def run(self, to_location=None, force=False, create_branch=False,
6255
revision=None, directory=u'.', store=False):
6256
from . import switch
6257
tree_location = directory
5586
from bzrlib import switch
6258
5588
revision = _get_one_revision('switch', revision)
6259
possible_transports = []
6260
control_dir = controldir.ControlDir.open_containing(tree_location,
6261
possible_transports=possible_transports)[0]
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6262
5590
if to_location is None:
6263
5591
if revision is None:
6264
raise errors.BzrCommandError(gettext('You must supply either a'
6265
' revision or a location'))
6266
to_location = tree_location
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6268
branch = control_dir.open_branch(
6269
possible_transports=possible_transports)
5596
branch = control_dir.open_branch()
6270
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6271
5598
except errors.NotBranchError:
6273
5600
had_explicit_nick = False
6274
5601
if create_branch:
6275
5602
if branch is None:
6276
raise errors.BzrCommandError(
6277
gettext('cannot create branch without source branch'))
6278
to_location = lookup_new_sibling_branch(control_dir, to_location,
6279
possible_transports=possible_transports)
6280
if revision is not None:
6281
revision = revision.as_revision_id(branch)
6282
to_branch = branch.controldir.sprout(to_location,
6283
possible_transports=possible_transports,
6284
revision_id=revision,
6285
source_branch=branch).open_branch()
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6288
to_branch = Branch.open(to_location,
6289
possible_transports=possible_transports)
5616
to_branch = Branch.open(to_location)
6290
5617
except errors.NotBranchError:
6291
to_branch = open_sibling_branch(control_dir, to_location,
6292
possible_transports=possible_transports)
6293
if revision is not None:
6294
revision = revision.as_revision_id(to_branch)
6296
switch.switch(control_dir, to_branch, force, revision_id=revision,
6297
store_uncommitted=store)
6298
except controldir.BranchReferenceLoop:
6299
raise errors.BzrCommandError(
6300
gettext('switching would create a branch reference loop. '
6301
'Use the "bzr up" command to switch to a '
6302
'different revision.'))
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6303
5624
if had_explicit_nick:
6304
5625
branch = control_dir.open_branch() #get the new branch!
6305
5626
branch.nick = to_branch.nick
6306
note(gettext('Switched to branch: %s'),
5627
note('Switched to branch: %s',
6307
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
6311
5648
class cmd_view(Command):
6398
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6400
5736
current_view, view_dict = tree.views.get_view_info()
6401
5737
if name is None:
6402
5738
name = current_view
6405
raise errors.BzrCommandError(gettext(
6406
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6408
raise errors.BzrCommandError(gettext(
6409
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6411
5747
tree.views.set_view_info(None, {})
6412
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6413
5749
elif name is None:
6414
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6416
5752
tree.views.delete_view(name)
6417
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6420
raise errors.BzrCommandError(gettext(
6421
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6423
raise errors.BzrCommandError(gettext(
6424
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6425
5761
elif switch == 'off':
6426
5762
if current_view is None:
6427
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6428
5764
tree.views.set_view_info(None, view_dict)
6429
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6431
5767
tree.views.set_view_info(switch, view_dict)
6432
5768
view_str = views.view_display_str(tree.views.lookup_view())
6433
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6436
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6437
5773
for view in sorted(view_dict):
6438
5774
if view == current_view:
6542
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
6543
5869
restore the most recently shelved changes.
6545
For complicated changes, it is possible to edit the changes in a separate
6546
editor program to decide what the file remaining in the working copy
6547
should look like. To do this, add the configuration option
6549
change_editor = PROGRAM @new_path @old_path
6551
where @new_path is replaced with the path of the new version of the
6552
file and @old_path is replaced with the path of the old version of
6553
the file. The PROGRAM should save the new file with the desired
6554
contents of the file in the working tree.
6558
5872
takes_args = ['file*']
6560
5874
takes_options = [
6563
5876
Option('all', help='Shelve all changes.'),
6565
5878
RegistryOption('writer', 'Method to use for writing diffs.',
6566
breezy.option.diff_writer_registry,
5879
bzrlib.option.diff_writer_registry,
6567
5880
value_switches=True, enum_switch=False),
6569
5882
Option('list', help='List shelved changes.'),
6570
5883
Option('destroy',
6571
5884
help='Destroy removed changes instead of shelving them.'),
6573
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6575
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6576
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6578
return self.run_for_list(directory=directory)
6579
from .shelf_ui import Shelver
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6580
5893
if writer is None:
6581
writer = breezy.option.diff_writer_registry.get()
5894
writer = bzrlib.option.diff_writer_registry.get()
6583
shelver = Shelver.from_args(writer(self.outf), revision, all,
6584
file_list, message, destroy=destroy, directory=directory)
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6656
5967
To check what clean-tree will do, use --dry-run.
6658
takes_options = ['directory',
6659
Option('ignored', help='Delete all ignored files.'),
6660
Option('detritus', help='Delete conflict files, merge and revert'
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6661
5971
' backups, and failed selftest dirs.'),
6662
5972
Option('unknown',
6663
help='Delete files unknown to brz (default).'),
5973
help='Delete files unknown to bzr (default).'),
6664
5974
Option('dry-run', help='Show files to delete instead of'
6665
5975
' deleting them.'),
6666
5976
Option('force', help='Do not prompt before deleting.')]
6668
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6669
force=False, directory=u'.'):
6670
from .clean_tree import clean_tree
5979
from bzrlib.clean_tree import clean_tree
6671
5980
if not (unknown or ignored or detritus):
6675
clean_tree(directory, unknown=unknown, ignored=ignored,
6676
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6679
5988
class cmd_reference(Command):
6689
5998
takes_args = ['path?', 'location?']
6691
Option('force-unversioned',
6692
help='Set reference even if path is not versioned.'),
6695
def run(self, path=None, location=None, force_unversioned=False):
6000
def run(self, path=None, location=None):
6696
6001
branchdir = '.'
6697
6002
if path is not None:
6698
6003
branchdir = path
6699
6004
tree, branch, relpath =(
6700
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6701
6006
if path is not None:
6703
6008
if tree is None:
6704
6009
tree = branch.basis_tree()
6705
6010
if path is None:
6706
info = viewitems(branch._get_all_reference_info())
6011
info = branch._get_all_reference_info().iteritems()
6707
6012
self._display_reference_info(tree, branch, info)
6709
if not tree.is_versioned(path) and not force_unversioned:
6014
file_id = tree.path2id(path)
6710
6016
raise errors.NotVersionedError(path)
6711
6017
if location is None:
6712
info = [(path, branch.get_reference_info(path))]
6018
info = [(file_id, branch.get_reference_info(file_id))]
6713
6019
self._display_reference_info(tree, branch, info)
6715
branch.set_reference_info(
6716
path, location, file_id=tree.path2id(path))
6021
branch.set_reference_info(file_id, path, location)
6718
6023
def _display_reference_info(self, tree, branch, info):
6720
for path, (location, file_id) in info:
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6721
6030
ref_list.append((path, location))
6722
6031
for path, location in sorted(ref_list):
6723
6032
self.outf.write('%s %s\n' % (path, location))
6726
class cmd_export_pot(Command):
6727
__doc__ = """Export command helps and error messages in po format."""
6730
takes_options = [Option('plugin',
6731
help='Export help text from named command '\
6732
'(defaults to all built in commands).',
6734
Option('include-duplicates',
6735
help='Output multiple copies of the same msgid '
6736
'string if it appears more than once.'),
6739
def run(self, plugin=None, include_duplicates=False):
6740
from .export_pot import export_pot
6741
export_pot(self.outf, plugin, include_duplicates)
6744
class cmd_import(Command):
6745
__doc__ = """Import sources from a directory, tarball or zip file
6747
This command will import a directory, tarball or zip file into a bzr
6748
tree, replacing any versioned files already present. If a directory is
6749
specified, it is used as the target. If the directory does not exist, or
6750
is not versioned, it is created.
6752
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6754
If the tarball or zip has a single root directory, that directory is
6755
stripped when extracting the tarball. This is not done for directories.
6758
takes_args = ['source', 'tree?']
6760
def run(self, source, tree=None):
6761
from .upstream_import import do_import
6762
do_import(source, tree)
6765
class cmd_link_tree(Command):
6766
__doc__ = """Hardlink matching files to another tree.
6768
Only files with identical content and execute bit will be linked.
6771
takes_args = ['location']
6773
def run(self, location):
6774
from .transform import link_tree
6775
target_tree = WorkingTree.open_containing(".")[0]
6776
source_tree = WorkingTree.open(location)
6777
with target_tree.lock_write(), source_tree.lock_read():
6778
link_tree(target_tree, source_tree)
6781
class cmd_fetch_ghosts(Command):
6782
__doc__ = """Attempt to retrieve ghosts from another branch.
6784
If the other branch is not supplied, the last-pulled branch is used.
6788
aliases = ['fetch-missing']
6789
takes_args = ['branch?']
6790
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6792
def run(self, branch=None, no_fix=False):
6793
from .fetch_ghosts import GhostFetcher
6794
installed, failed = GhostFetcher.from_cmdline(branch).run()
6795
if len(installed) > 0:
6796
self.outf.write("Installed:\n")
6797
for rev in installed:
6798
self.outf.write(rev.decode('utf-8') + "\n")
6800
self.outf.write("Still missing:\n")
6802
self.outf.write(rev.decode('utf-8') + "\n")
6803
if not no_fix and len(installed) > 0:
6804
cmd_reconcile().run(".")
6807
6035
def _register_lazy_builtins():
6808
6036
# register lazy builtins from other modules; called at startup and should
6809
6037
# be only called once.
6810
6038
for (name, aliases, module_name) in [
6811
('cmd_bisect', [], 'breezy.bisect'),
6812
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6813
('cmd_config', [], 'breezy.config'),
6814
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
6815
('cmd_version_info', [], 'breezy.cmd_version_info'),
6816
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6817
('cmd_conflicts', [], 'breezy.conflicts'),
6818
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6819
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6820
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6821
('cmd_test_script', [], 'breezy.cmd_test_script'),
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6823
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
