46
53
revision as _mod_revision,
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
62
from breezy.branch import Branch
63
from breezy.conflicts import ConflictList
64
from breezy.transport import memory
65
from breezy.smtp_connection import SMTPConnection
66
from breezy.workingtree import WorkingTree
67
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
70
from .commands import (
65
72
builtin_command_registry,
68
from bzrlib.option import (
73
80
_parse_revision_str,
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]))
82
from .revisionspec import (
92
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
95
def _get_branch_location(control_dir, possible_transports=None):
96
"""Return location of branch for this control dir."""
98
target = control_dir.get_branch_reference()
99
except errors.NotBranchError:
100
return control_dir.root_transport.base
101
if target is not None:
103
this_branch = control_dir.open_branch(
104
possible_transports=possible_transports)
105
# This may be a heavy checkout, where we want the master branch
106
master_location = this_branch.get_bound_location()
107
if master_location is not None:
108
return master_location
109
# If not, use a local sibling
110
return this_branch.base
113
def _is_colocated(control_dir, possible_transports=None):
114
"""Check if the branch in control_dir is colocated.
116
:param control_dir: Control directory
117
:return: Tuple with boolean indicating whether the branch is colocated
118
and the full URL to the actual branch
120
# This path is meant to be relative to the existing branch
121
this_url = _get_branch_location(
122
control_dir, possible_transports=possible_transports)
123
# Perhaps the target control dir supports colocated branches?
125
root = controldir.ControlDir.open(
126
this_url, possible_transports=possible_transports)
127
except errors.NotBranchError:
128
return (False, this_url)
131
control_dir.open_workingtree()
132
except (errors.NoWorkingTree, errors.NotLocalUrl):
133
return (False, this_url)
136
root._format.colocated_branches and
137
control_dir.control_url == root.control_url,
141
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
142
"""Lookup the location for a new sibling branch.
144
:param control_dir: Control directory to find sibling branches from
145
:param location: Name of the new branch
146
:return: Full location to the new branch
148
location = directory_service.directories.dereference(location)
149
if '/' not in location and '\\' not in location:
150
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
153
return urlutils.join_segment_parameters(
154
this_url, {"branch": urlutils.escape(location)})
156
return urlutils.join(this_url, '..', urlutils.escape(location))
160
def open_sibling_branch(control_dir, location, possible_transports=None):
161
"""Open a branch, possibly a sibling of another.
163
:param control_dir: Control directory relative to which to lookup the
165
:param location: Location to look up
166
:return: branch to open
169
# Perhaps it's a colocated branch?
170
return control_dir.open_branch(
171
location, possible_transports=possible_transports)
172
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
173
this_url = _get_branch_location(control_dir)
176
this_url, '..', urlutils.escape(location)))
179
def open_nearby_branch(near=None, location=None, possible_transports=None):
180
"""Open a nearby branch.
182
:param near: Optional location of container from which to open branch
183
:param location: Location of the branch
184
:return: Branch instance
191
location, possible_transports=possible_transports)
192
except errors.NotBranchError:
194
cdir = controldir.ControlDir.open(
195
near, possible_transports=possible_transports)
196
return open_sibling_branch(
197
cdir, location, possible_transports=possible_transports)
200
def iter_sibling_branches(control_dir, possible_transports=None):
201
"""Iterate over the siblings of a branch.
203
:param control_dir: Control directory for which to look up the siblings
204
:return: Iterator over tuples with branch name and branch object
207
reference = control_dir.get_branch_reference()
208
except errors.NotBranchError:
209
# There is no active branch, just return the colocated branches.
210
for name, branch in viewitems(control_dir.get_branches()):
213
if reference is not None:
214
ref_branch = Branch.open(
215
reference, possible_transports=possible_transports)
218
if ref_branch is None or ref_branch.name:
219
if ref_branch is not None:
220
control_dir = ref_branch.controldir
221
for name, branch in viewitems(control_dir.get_branches()):
224
repo = ref_branch.controldir.find_repository()
225
for branch in repo.find_branches(using=True):
226
name = urlutils.relative_url(
227
repo.user_url, branch.user_url).rstrip("/")
88
231
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)
223
297
def _get_view_info_for_change_reporter(tree):
224
298
"""Get the view information from a tree for change reporting."""
342
433
takes_args = ['revision_id?']
343
takes_options = ['revision']
434
takes_options = ['directory', 'revision']
344
435
# cat-revision is more for frontends so should be exact
345
436
encoding = 'strict'
347
438
def print_revision(self, revisions, revid):
348
439
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
440
record = next(stream)
350
441
if record.storage_kind == 'absent':
351
442
raise errors.NoSuchRevision(revisions, revid)
352
443
revtext = record.get_bytes_as('fulltext')
353
444
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
447
def run(self, revision_id=None, revision=None, directory=u'.'):
357
448
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
449
raise errors.BzrCommandError(gettext('You can only supply one of'
450
' revision_id or --revision'))
360
451
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
452
raise errors.BzrCommandError(
453
gettext('You must supply either --revision or a revision_id'))
455
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
457
revisions = b.repository.revisions
366
458
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
459
raise errors.BzrCommandError(
460
gettext('Repository %r does not support '
461
'access to raw revision texts'))
370
b.repository.lock_read()
463
with b.repository.lock_read():
372
464
# TODO: jam 20060112 should cat-revision always output utf-8?
373
465
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
466
revision_id = cache_utf8.encode(revision_id)
376
468
self.print_revision(revisions, revision_id)
377
469
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
471
"The repository {0} contains no revision {1}.").format(
472
b.repository.base, revision_id.decode('utf-8'))
380
473
raise errors.BzrCommandError(msg)
381
474
elif revision is not None:
382
475
for rev in revision:
384
477
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
478
gettext('You cannot specify a NULL revision.'))
386
479
rev_id = rev.as_revision_id(b)
387
480
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,))
473
483
class cmd_remove_tree(Command):
476
486
Since a lightweight checkout is little more than a working tree
477
487
this will refuse to run against one.
479
To re-create the working tree, use "bzr checkout".
489
To re-create the working tree, use "brz checkout".
481
491
_see_also = ['checkout', 'working-trees']
482
492
takes_args = ['location*']
483
493
takes_options = [
485
495
help='Remove the working tree even if it has '
486
'uncommitted changes.'),
496
'uncommitted or shelved changes.'),
489
499
def run(self, location_list, force=False):
490
500
if not location_list:
501
location_list = ['.']
493
503
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
504
d = controldir.ControlDir.open(location)
497
507
working = d.open_workingtree()
498
508
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
509
raise errors.BzrCommandError(
510
gettext("No working tree to remove"))
500
511
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
512
raise errors.BzrCommandError(
513
gettext("You cannot remove the working tree"
514
" of a remote path"))
504
516
if (working.has_changes()):
505
517
raise errors.UncommittedChanges(working)
518
if working.get_shelf_manager().last_shelf() is not None:
519
raise errors.ShelvedChanges(working)
507
521
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
522
raise errors.BzrCommandError(
523
gettext("You cannot remove the working tree"
524
" from a lightweight checkout"))
511
526
d.destroy_workingtree()
529
class cmd_repair_workingtree(Command):
530
__doc__ = """Reset the working tree state file.
532
This is not meant to be used normally, but more as a way to recover from
533
filesystem corruption, etc. This rebuilds the working inventory back to a
534
'known good' state. Any new modifications (adding a file, renaming, etc)
535
will be lost, though modified files will still be detected as such.
537
Most users will want something more like "brz revert" or "brz update"
538
unless the state file has become corrupted.
540
By default this attempts to recover the current state by looking at the
541
headers of the state file. If the state file is too corrupted to even do
542
that, you can supply --revision to force the state of the tree.
546
'revision', 'directory',
548
help='Reset the tree even if it doesn\'t appear to be'
553
def run(self, revision=None, directory='.', force=False):
554
tree, _ = WorkingTree.open_containing(directory)
555
self.add_cleanup(tree.lock_tree_write().unlock)
559
except errors.BzrError:
560
pass # There seems to be a real error here, so we'll reset
563
raise errors.BzrCommandError(gettext(
564
'The tree does not appear to be corrupt. You probably'
565
' want "brz revert" instead. Use "--force" if you are'
566
' sure you want to reset the working tree.'))
570
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
572
tree.reset_state(revision_ids)
573
except errors.BzrError:
574
if revision_ids is None:
575
extra = gettext(', the header appears corrupt, try passing '
576
'-r -1 to set the state to the last commit')
579
raise errors.BzrCommandError(
580
gettext('failed to reset the tree state{0}').format(extra))
514
583
class cmd_revno(Command):
515
584
__doc__ = """Show current revision number.
659
747
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
660
748
file_ids_from=None):
664
752
if file_ids_from is not None:
666
754
base_tree, base_path = WorkingTree.open_containing(
668
756
except errors.NoWorkingTree:
669
757
base_branch, base_path = Branch.open_containing(
671
759
base_tree = base_branch.basis_tree()
673
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
674
to_file=self.outf, should_print=(not is_quiet()))
676
action = bzrlib.add.AddAction(to_file=self.outf,
761
action = breezy.add.AddFromBaseAction(
762
base_tree, base_path, to_file=self.outf,
677
763
should_print=(not is_quiet()))
765
action = breezy.add.AddWithSkipLargeAction(
766
to_file=self.outf, should_print=(not is_quiet()))
680
769
self.add_cleanup(base_tree.lock_read().unlock)
681
770
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
771
added, ignored = tree.smart_add(
772
file_list, not no_recurse, action=action, save=not dry_run)
684
773
self.cleanup_now()
685
774
if len(ignored) > 0:
687
for glob in sorted(ignored.keys()):
776
for glob in sorted(ignored):
688
777
for path in ignored[glob]:
689
self.outf.write("ignored %s matching \"%s\"\n"
779
gettext("ignored {0} matching \"{1}\"\n").format(
693
783
class cmd_mkdir(Command):
885
self.add_cleanup(tree.lock_read().unlock)
768
886
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
887
paths = tree.find_related_paths_across_trees(
888
file_list, extra_trees, require_versioned=True)
771
889
# find_ids_across_trees may include some paths that don't
772
890
# exist in 'tree'.
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
891
entries = tree.iter_entries_by_dir(specific_files=paths)
776
entries = tree.inventory.entries()
893
entries = tree.iter_entries_by_dir()
779
for path, entry in entries:
895
for path, entry in sorted(entries):
780
896
if kind and kind != entry.kind:
783
self.outf.write('%-50s %s\n' % (path, entry.file_id))
901
self.outf.write('%-50s %s\n' % (
902
path, entry.file_id.decode('utf-8')))
785
904
self.outf.write(path)
786
905
self.outf.write('\n')
908
class cmd_cp(Command):
909
__doc__ = """Copy a file.
912
brz cp OLDNAME NEWNAME
914
brz cp SOURCE... DESTINATION
916
If the last argument is a versioned directory, all the other names
917
are copied into it. Otherwise, there must be exactly two arguments
918
and the file is copied to a new name.
920
Files cannot be copied between branches. Only files can be copied
924
takes_args = ['names*']
927
encoding_type = 'replace'
929
def run(self, names_list):
930
if names_list is None:
932
if len(names_list) < 2:
933
raise errors.BzrCommandError(gettext("missing file argument"))
934
tree, rel_names = WorkingTree.open_containing_paths(
935
names_list, canonicalize=False)
936
for file_name in rel_names[0:-1]:
938
raise errors.BzrCommandError(
939
gettext("can not copy root of branch"))
940
self.add_cleanup(tree.lock_tree_write().unlock)
941
into_existing = osutils.isdir(names_list[-1])
942
if not into_existing:
944
(src, dst) = rel_names
946
raise errors.BzrCommandError(
947
gettext('to copy multiple files the'
948
' destination must be a versioned'
953
(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
954
for n in rel_names[:-1]]
956
for src, dst in pairs:
958
src_kind = tree.stored_kind(src)
959
except errors.NoSuchFile:
960
raise errors.BzrCommandError(
961
gettext('Could not copy %s => %s: %s is not versioned.')
964
raise errors.BzrCommandError(
965
gettext('Could not copy %s => %s . %s is not versioned\\.'
967
if src_kind == 'directory':
968
raise errors.BzrCommandError(
969
gettext('Could not copy %s => %s . %s is a directory.'
971
dst_parent = osutils.split(dst)[0]
974
dst_parent_kind = tree.stored_kind(dst_parent)
975
except errors.NoSuchFile:
976
raise errors.BzrCommandError(
977
gettext('Could not copy %s => %s: %s is not versioned.')
978
% (src, dst, dst_parent))
979
if dst_parent_kind != 'directory':
980
raise errors.BzrCommandError(
981
gettext('Could not copy to %s: %s is not a directory.')
982
% (dst_parent, dst_parent))
984
tree.copy_one(src, dst)
789
987
class cmd_mv(Command):
790
988
__doc__ = """Move or rename a file.
793
bzr mv OLDNAME NEWNAME
991
brz mv OLDNAME NEWNAME
795
bzr mv SOURCE... DESTINATION
993
brz mv SOURCE... DESTINATION
797
995
If the last argument is a versioned directory, all the other names
798
996
are moved into it. Otherwise, there must be exactly two arguments
821
1020
return self.run_auto(names_list, after, dry_run)
823
raise errors.BzrCommandError('--dry-run requires --auto.')
1022
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
824
1023
if names_list is None:
826
1025
if len(names_list) < 2:
827
raise errors.BzrCommandError("missing file argument")
828
tree, rel_names = tree_files(names_list, canonicalize=False)
1026
raise errors.BzrCommandError(gettext("missing file argument"))
1027
tree, rel_names = WorkingTree.open_containing_paths(
1028
names_list, canonicalize=False)
1029
for file_name in rel_names[0:-1]:
1031
raise errors.BzrCommandError(
1032
gettext("can not move root of branch"))
829
1033
self.add_cleanup(tree.lock_tree_write().unlock)
830
1034
self._run(tree, names_list, rel_names, after)
832
1036
def run_auto(self, names_list, after, dry_run):
833
1037
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
1038
raise errors.BzrCommandError(
1039
gettext('Only one path may be specified to --auto.'))
837
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
1041
raise errors.BzrCommandError(
1042
gettext('--after cannot be specified with --auto.'))
1043
work_tree, file_list = WorkingTree.open_containing_paths(
1044
names_list, default_directory='.')
840
1045
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1046
rename_map.RenameMap.guess_renames(
1047
work_tree.basis_tree(), work_tree, dry_run)
843
1049
def _run(self, tree, names_list, rel_names, after):
844
1050
into_existing = osutils.isdir(names_list[-1])
849
1055
# a directory, but now doesn't exist in the working tree
850
1056
# and the target is an existing directory, just rename it)
851
1057
if (not tree.case_sensitive
852
and rel_names[0].lower() == rel_names[1].lower()):
1058
and rel_names[0].lower() == rel_names[1].lower()):
853
1059
into_existing = False
856
1061
# 'fix' the case of a potential 'from'
857
from_id = tree.path2id(
858
tree.get_canonical_inventory_path(rel_names[0]))
1062
from_path = tree.get_canonical_path(rel_names[0])
859
1063
if (not osutils.lexists(names_list[0]) and
860
from_id and inv.get_file_kind(from_id) == "directory"):
1064
tree.is_versioned(from_path) and
1065
tree.stored_kind(from_path) == "directory"):
861
1066
into_existing = False
863
1068
if into_existing:
864
1069
# move into existing directory
865
1070
# All entries reference existing inventory items, so fix them up
866
1071
# for cicp file-systems.
867
rel_names = tree.get_canonical_inventory_paths(rel_names)
1072
rel_names = list(tree.get_canonical_paths(rel_names))
868
1073
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
869
1074
if not is_quiet():
870
1075
self.outf.write("%s => %s\n" % (src, dest))
872
1077
if len(names_list) != 2:
873
raise errors.BzrCommandError('to mv multiple files the'
874
' destination must be a versioned'
1078
raise errors.BzrCommandError(gettext('to mv multiple files the'
1079
' destination must be a versioned'
877
1082
# for cicp file-systems: the src references an existing inventory
879
src = tree.get_canonical_inventory_path(rel_names[0])
1084
src = tree.get_canonical_path(rel_names[0])
880
1085
# Find the canonical version of the destination: In all cases, the
881
1086
# parent of the target must be in the inventory, so we fetch the
882
1087
# canonical version from there (we do not always *use* the
883
1088
# canonicalized tail portion - we may be attempting to rename the
884
1089
# case of the tail)
885
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
1090
canon_dest = tree.get_canonical_path(rel_names[1])
886
1091
dest_parent = osutils.dirname(canon_dest)
887
1092
spec_tail = osutils.basename(rel_names[1])
888
1093
# For a CICP file-system, we need to avoid creating 2 inventory
937
1143
match the remote one, use pull --overwrite. This will work even if the two
938
1144
branches have diverged.
940
If there is no default location set, the first pull will set it. After
941
that, you can omit the location to use the default. To change the
942
default, use --remember. The value will only be saved if the remote
943
location can be accessed.
1146
If there is no default location set, the first pull will set it (use
1147
--no-remember to avoid setting it). After that, you can omit the
1148
location to use the default. To change the default, use --remember. The
1149
value will only be saved if the remote location can be accessed.
1151
The --verbose option will display the revisions pulled using the log_format
1152
configuration option. You can use a different format by overriding it with
1153
-Olog_format=<other_format>.
945
1155
Note: The location can be specified either in the form of a branch,
946
1156
or in the form of a path to a file containing a merge directive generated
950
1160
_see_also = ['push', 'update', 'status-flags', 'send']
951
1161
takes_options = ['remember', 'overwrite', 'revision',
952
custom_help('verbose',
953
help='Show logs of pulled revisions.'),
955
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
961
help="Perform a local pull in a bound "
962
"branch. Local pulls are not applied to "
1162
custom_help('verbose',
1163
help='Show logs of pulled revisions.'),
1164
custom_help('directory',
1165
help='Branch to pull into, '
1166
'rather than the one containing the working directory.'),
1168
help="Perform a local pull in a bound "
1169
"branch. Local pulls are not applied to "
1170
"the master branch."
1173
help="Show base revision text in conflicts."),
1174
Option('overwrite-tags',
1175
help="Overwrite tags only."),
966
1177
takes_args = ['location?']
967
1178
encoding_type = 'replace'
969
def run(self, location=None, remember=False, overwrite=False,
1180
def run(self, location=None, remember=None, overwrite=False,
970
1181
revision=None, verbose=False,
971
directory=None, local=False):
1182
directory=None, local=False,
1183
show_base=False, overwrite_tags=False):
1186
overwrite = ["history", "tags"]
1187
elif overwrite_tags:
1188
overwrite = ["tags"]
972
1191
# FIXME: too much stuff is in the command class
973
1192
revision_id = None
974
1193
mergeable = None
1058
1287
considered diverged if the destination branch's most recent commit is one
1059
1288
that has not been merged (directly or indirectly) by the source branch.
1061
If branches have diverged, you can use 'bzr push --overwrite' to replace
1290
If branches have diverged, you can use 'brz push --overwrite' to replace
1062
1291
the other branch completely, discarding its unmerged changes.
1064
1293
If you want to ensure you have the different changes in the other branch,
1065
do a merge (see bzr help merge) from the other branch, and commit that.
1294
do a merge (see brz help merge) from the other branch, and commit that.
1066
1295
After that you will be able to do a push without '--overwrite'.
1068
If there is no default push location set, the first push will set it.
1069
After that, you can omit the location to use the default. To change the
1070
default, use --remember. The value will only be saved if the remote
1071
location can be accessed.
1297
If there is no default push location set, the first push will set it (use
1298
--no-remember to avoid setting it). After that, you can omit the
1299
location to use the default. To change the default, use --remember. The
1300
value will only be saved if the remote location can be accessed.
1302
The --verbose option will display the revisions pushed using the log_format
1303
configuration option. You can use a different format by overriding it with
1304
-Olog_format=<other_format>.
1074
1307
_see_also = ['pull', 'update', 'working-trees']
1075
1308
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
1076
Option('create-prefix',
1077
help='Create the path leading up to the branch '
1078
'if it does not already exist.'),
1080
help='Branch to push from, '
1081
'rather than the one containing the working directory.',
1085
Option('use-existing-dir',
1086
help='By default push will fail if the target'
1087
' directory exists, but does not already'
1088
' have a control directory. This flag will'
1089
' allow push to proceed.'),
1091
help='Create a stacked branch that references the public location '
1092
'of the parent branch.'),
1093
Option('stacked-on',
1094
help='Create a stacked branch that refers to another branch '
1095
'for the commit history. Only the work not present in the '
1096
'referenced branch is included in the branch created.',
1099
help='Refuse to push if there are uncommitted changes in'
1100
' the working tree, --no-strict disables the check.'),
1309
Option('create-prefix',
1310
help='Create the path leading up to the branch '
1311
'if it does not already exist.'),
1312
custom_help('directory',
1313
help='Branch to push from, '
1314
'rather than the one containing the working directory.'),
1315
Option('use-existing-dir',
1316
help='By default push will fail if the target'
1317
' directory exists, but does not already'
1318
' have a control directory. This flag will'
1319
' allow push to proceed.'),
1321
help='Create a stacked branch that references the public location '
1322
'of the parent branch.'),
1323
Option('stacked-on',
1324
help='Create a stacked branch that refers to another branch '
1325
'for the commit history. Only the work not present in the '
1326
'referenced branch is included in the branch created.',
1329
help='Refuse to push if there are uncommitted changes in'
1330
' the working tree, --no-strict disables the check.'),
1332
help="Don't populate the working tree, even for protocols"
1333
" that support it."),
1334
Option('overwrite-tags',
1335
help="Overwrite tags only."),
1336
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1337
"that can't be represented in the target.")
1102
1339
takes_args = ['location?']
1103
1340
encoding_type = 'replace'
1105
def run(self, location=None, remember=False, overwrite=False,
1106
create_prefix=False, verbose=False, revision=None,
1107
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1109
from bzrlib.push import _show_push_branch
1342
def run(self, location=None, remember=None, overwrite=False,
1343
create_prefix=False, verbose=False, revision=None,
1344
use_existing_dir=False, directory=None, stacked_on=None,
1345
stacked=False, strict=None, no_tree=False,
1346
overwrite_tags=False, lossy=False):
1347
from .push import _show_push_branch
1350
overwrite = ["history", "tags"]
1351
elif overwrite_tags:
1352
overwrite = ["tags"]
1111
1356
if directory is None:
1112
1357
directory = '.'
1113
1358
# Get the source branch
1114
1359
(tree, br_from,
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1360
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1116
1361
# Get the tip's revision_id
1117
1362
revision = _get_one_revision('push', revision)
1118
1363
if revision is not None:
1139
1384
# error by the feedback given to them. RBC 20080227.
1140
1385
stacked_on = parent_url
1141
1386
if not stacked_on:
1142
raise errors.BzrCommandError(
1143
"Could not determine branch to refer to.")
1387
raise errors.BzrCommandError(gettext(
1388
"Could not determine branch to refer to."))
1145
1390
# Get the destination location
1146
1391
if location is None:
1147
1392
stored_loc = br_from.get_push_location()
1148
1393
if stored_loc is None:
1149
raise errors.BzrCommandError(
1150
"No push location known or specified.")
1394
parent_loc = br_from.get_parent()
1396
raise errors.BzrCommandError(gettext(
1397
"No push location known or specified. To push to the "
1398
"parent branch (at %s), use 'brz push :parent'." %
1399
urlutils.unescape_for_display(parent_loc,
1400
self.outf.encoding)))
1402
raise errors.BzrCommandError(gettext(
1403
"No push location known or specified."))
1152
1405
display_url = urlutils.unescape_for_display(stored_loc,
1154
self.outf.write("Using saved push location: %s\n" % display_url)
1407
note(gettext("Using saved push location: %s") % display_url)
1155
1408
location = stored_loc
1157
1410
_show_push_branch(br_from, revision_id, location, self.outf,
1158
verbose=verbose, overwrite=overwrite, remember=remember,
1159
stacked_on=stacked_on, create_prefix=create_prefix,
1160
use_existing_dir=use_existing_dir)
1411
verbose=verbose, overwrite=overwrite, remember=remember,
1412
stacked_on=stacked_on, create_prefix=create_prefix,
1413
use_existing_dir=use_existing_dir, no_tree=no_tree,
1163
1417
class cmd_branch(Command):
1177
1431
_see_also = ['checkout']
1178
1432
takes_args = ['from_location', 'to_location?']
1179
takes_options = ['revision', Option('hardlink',
1180
help='Hard-link working tree files where possible.'),
1182
help="Create a branch without a working-tree."),
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1187
help='Create a stacked branch referring to the source branch. '
1188
'The new branch will depend on the availability of the source '
1189
'branch for all operations.'),
1190
Option('standalone',
1191
help='Do not use a shared repository, even if available.'),
1192
Option('use-existing-dir',
1193
help='By default branch will fail if the target'
1194
' directory exists, but does not already'
1195
' have a control directory. This flag will'
1196
' allow branch to proceed.'),
1198
help="Bind new branch to from location."),
1200
aliases = ['get', 'clone']
1433
takes_options = ['revision',
1435
'hardlink', help='Hard-link working tree files where possible.'),
1436
Option('files-from', type=text_type,
1437
help="Get file contents from this tree."),
1439
help="Create a branch without a working-tree."),
1441
help="Switch the checkout in the current directory "
1442
"to the new branch."),
1444
help='Create a stacked branch referring to the source branch. '
1445
'The new branch will depend on the availability of the source '
1446
'branch for all operations.'),
1447
Option('standalone',
1448
help='Do not use a shared repository, even if available.'),
1449
Option('use-existing-dir',
1450
help='By default branch will fail if the target'
1451
' directory exists, but does not already'
1452
' have a control directory. This flag will'
1453
' allow branch to proceed.'),
1455
help="Bind new branch to from location."),
1202
1458
def run(self, from_location, to_location=None, revision=None,
1203
1459
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1206
from bzrlib.tag import _merge_tags_if_possible
1207
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1460
use_existing_dir=False, switch=False, bind=False,
1462
from breezy import switch as _mod_switch
1463
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1465
if not (hardlink or files_from):
1466
# accelerator_tree is usually slower because you have to read N
1467
# files (no readahead, lots of seeks, etc), but allow the user to
1468
# explicitly request it
1469
accelerator_tree = None
1470
if files_from is not None and files_from != from_location:
1471
accelerator_tree = WorkingTree.open(files_from)
1209
1472
revision = _get_one_revision('branch', revision)
1210
1473
self.add_cleanup(br_from.lock_read().unlock)
1211
1474
if revision is not None:
1222
1485
to_transport.mkdir('.')
1223
1486
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1488
to_dir = controldir.ControlDir.open_from_transport(
1490
except errors.NotBranchError:
1491
if not use_existing_dir:
1492
raise errors.BzrCommandError(gettext('Target directory "%s" '
1493
'already exists.') % to_location)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1498
to_dir.open_branch()
1230
1499
except errors.NotBranchError:
1233
1502
raise errors.AlreadyBranchError(to_location)
1234
1503
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1504
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1510
# preserve whatever source format we have.
1511
to_dir = br_from.controldir.sprout(
1512
to_transport.base, revision_id,
1513
possible_transports=[to_transport],
1514
accelerator_tree=accelerator_tree, hardlink=hardlink,
1515
stacked=stacked, force_new_repo=standalone,
1516
create_tree_if_local=not no_tree, source_branch=br_from)
1517
branch = to_dir.open_branch(
1518
possible_transports=[
1519
br_from.controldir.root_transport, to_transport])
1520
except errors.NoSuchRevision:
1521
to_transport.delete_tree('.')
1522
msg = gettext("The branch {0} has no revision {1}.").format(
1523
from_location, revision)
1524
raise errors.BzrCommandError(msg)
1527
to_repo = to_dir.open_repository()
1528
except errors.NoRepositoryPresent:
1529
to_repo = to_dir.create_repository()
1530
to_repo.fetch(br_from.repository, revision_id=revision_id)
1531
branch = br_from.sprout(to_dir, revision_id=revision_id)
1532
br_from.tags.merge_to(branch.tags)
1253
1534
# If the source branch is stacked, the new branch may
1254
1535
# be stacked whether we asked for that explicitly or not.
1255
1536
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1538
note(gettext('Created new stacked branch referring to %s.') %
1539
branch.get_stacked_on_url())
1540
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1541
errors.UnstackableRepositoryFormat) as e:
1542
revno = branch.revno()
1543
if revno is not None:
1544
note(ngettext('Branched %d revision.',
1545
'Branched %d revisions.',
1546
branch.revno()) % revno)
1548
note(gettext('Created new branch.'))
1263
1550
# Bind to the parent
1264
1551
parent_branch = Branch.open(from_location)
1265
1552
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1553
note(gettext('New branch bound to %s') % from_location)
1268
1555
# Switch to the new branch
1269
1556
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1557
_mod_switch.switch(wt.controldir, branch)
1558
note(gettext('Switched to branch: %s'),
1559
urlutils.unescape_for_display(branch.base, 'utf-8'))
1562
class cmd_branches(Command):
1563
__doc__ = """List the branches available at the current location.
1565
This command will print the names of all the branches at the current
1569
takes_args = ['location?']
1571
Option('recursive', short_name='R',
1572
help='Recursively scan for branches rather than '
1573
'just looking in the specified location.')]
1575
def run(self, location=".", recursive=False):
1577
t = transport.get_transport(location)
1578
if not t.listable():
1579
raise errors.BzrCommandError(
1580
"Can't scan this type of location.")
1581
for b in controldir.ControlDir.find_branches(t):
1582
self.outf.write("%s\n" % urlutils.unescape_for_display(
1583
urlutils.relative_url(t.base, b.base),
1584
self.outf.encoding).rstrip("/"))
1586
dir = controldir.ControlDir.open_containing(location)[0]
1588
active_branch = dir.open_branch(name="")
1589
except errors.NotBranchError:
1590
active_branch = None
1592
for name, branch in iter_sibling_branches(dir):
1595
active = (active_branch is not None and
1596
active_branch.user_url == branch.user_url)
1597
names[name] = active
1598
# Only mention the current branch explicitly if it's not
1599
# one of the colocated branches
1600
if not any(viewvalues(names)) and active_branch is not None:
1601
self.outf.write("* %s\n" % gettext("(default)"))
1602
for name in sorted(names):
1603
active = names[name]
1608
self.outf.write("%s %s\n" % (
1609
prefix, (name if PY3 else name.encode(self.outf.encoding))))
1275
1612
class cmd_checkout(Command):
1276
1613
__doc__ = """Create a new checkout of an existing branch.
1278
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
the branch found in '.'. This is useful if you have removed the working tree
1280
or if it was never created - i.e. if you pushed the branch to its current
1281
location using SFTP.
1615
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree
1616
for the branch found in '.'. This is useful if you have removed the working
1617
tree or if it was never created - i.e. if you pushed the branch to its
1618
current location using SFTP.
1283
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1284
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1285
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1286
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
1287
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
1620
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION
1621
will be used. In other words, "checkout ../foo/bar" will attempt to create
1622
./bar. If the BRANCH_LOCATION has no / or path separator embedded, the
1623
TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading
1624
scheme or drive identifier, if any. For example, "checkout lp:foo-bar" will
1625
attempt to create ./foo-bar.
1290
1627
To retrieve the branch as of a particular revision, supply the --revision
1291
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
1292
out of date [so you cannot commit] but it may be useful (i.e. to examine old
1628
parameter, as in "checkout foo/bar -r 5". Note that this will be
1629
immediately out of date [so you cannot commit] but it may be useful (i.e.
1630
to examine old code.)
1296
_see_also = ['checkouts', 'branch']
1633
_see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1297
1634
takes_args = ['branch_location?', 'to_location?']
1298
1635
takes_options = ['revision',
1299
1636
Option('lightweight',
1374
1713
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1377
This will perform a merge into the working tree, and may generate
1378
conflicts. If you have any local changes, you will still
1379
need to commit them after the update for the update to be complete.
1381
If you want to discard your local changes, you can just do a
1382
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1714
__doc__ = """Update a working tree to a new revision.
1716
This will perform a merge of the destination revision (the tip of the
1717
branch, or the specified revision) into the working tree, and then make
1718
that revision the basis revision for the working tree.
1720
You can use this to visit an older revision, or to update a working tree
1721
that is out of date from its branch.
1723
If there are any uncommitted changes in the tree, they will be carried
1724
across and remain as uncommitted changes after the update. To discard
1725
these changes, use 'brz revert'. The uncommitted changes may conflict
1726
with the changes brought in by the change in basis revision.
1728
If the tree's branch is bound to a master branch, brz will also update
1385
1729
the branch from the master.
1731
You cannot update just a single file or directory, because each Bazaar
1732
working tree has just a single basis revision. If you want to restore a
1733
file that has been removed locally, use 'brz revert' instead of 'brz
1734
update'. If you want to restore a file to its state in a previous
1735
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1736
out the old content of that file to a new location.
1738
The 'dir' argument, if given, must be the location of the root of a
1739
working tree to update. By default, the working tree that contains the
1740
current working directory is used.
1388
1743
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1744
takes_args = ['dir?']
1390
takes_options = ['revision']
1745
takes_options = ['revision',
1747
help="Show base revision text in conflicts."),
1391
1749
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1751
def run(self, dir=None, revision=None, show_base=None):
1394
1752
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1397
tree = WorkingTree.open_containing(dir)[0]
1753
raise errors.BzrCommandError(gettext(
1754
"brz update --revision takes exactly one revision"))
1756
tree = WorkingTree.open_containing('.')[0]
1758
tree, relpath = WorkingTree.open_containing(dir)
1761
raise errors.BzrCommandError(gettext(
1762
"brz update can only update a whole tree, "
1763
"not a file or subdirectory"))
1398
1764
branch = tree.branch
1399
1765
possible_transports = []
1400
1766
master = branch.get_master_branch(
1496
1863
noise_level = get_verbosity_level()
1498
1865
noise_level = 0
1499
from bzrlib.info import show_bzrdir_info
1500
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1866
from .info import show_bzrdir_info
1867
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1501
1868
verbose=noise_level, outfile=self.outf)
1504
1871
class cmd_remove(Command):
1505
1872
__doc__ = """Remove files or directories.
1507
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
them if they can easily be recovered using revert. If no options or
1509
parameters are given bzr will scan for files that are being tracked by bzr
1510
but missing in your tree and stop tracking them for you.
1874
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1875
delete them if they can easily be recovered using revert otherwise they
1876
will be backed up (adding an extension of the form .~#~). If no options or
1877
parameters are given Bazaar will scan for files that are being tracked by
1878
Bazaar but missing in your tree and stop tracking them for you.
1512
1880
takes_args = ['file*']
1513
1881
takes_options = ['verbose',
1514
Option('new', help='Only remove files that have never been committed.'),
1515
RegistryOption.from_kwargs('file-deletion-strategy',
1516
'The file deletion mode to be used.',
1517
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
safe='Only delete files if they can be'
1519
' safely recovered (default).',
1520
keep='Delete from bzr but leave the working copy.',
1521
force='Delete all the specified files, even if they can not be '
1522
'recovered and even if they are non-empty directories.')]
1883
'new', help='Only remove files that have never been committed.'),
1884
RegistryOption.from_kwargs('file-deletion-strategy',
1885
'The file deletion mode to be used.',
1886
title='Deletion Strategy', value_switches=True, enum_switch=False,
1887
safe='Backup changed files (default).',
1888
keep='Delete from brz but leave the working copy.',
1889
no_backup='Don\'t backup changed files.'),
1523
1891
aliases = ['rm', 'del']
1524
1892
encoding_type = 'replace'
1526
1894
def run(self, file_list, verbose=False, new=False,
1527
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1895
file_deletion_strategy='safe'):
1897
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1899
if file_list is not None:
1531
1900
file_list = [f for f in file_list]
1726
2113
to_transport.ensure_base()
1727
2114
except errors.NoSuchFile:
1728
2115
if not create_prefix:
1729
raise errors.BzrCommandError("Parent directory of %s"
1731
"\nYou may supply --create-prefix to create all"
1732
" leading parent directories."
2116
raise errors.BzrCommandError(gettext("Parent directory of %s"
2118
"\nYou may supply --create-prefix to create all"
2119
" leading parent directories.")
1734
2121
to_transport.create_prefix()
1737
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2124
a_controldir = controldir.ControlDir.open_from_transport(
1738
2126
except errors.NotBranchError:
1739
2127
# really a NotBzrDir error...
1740
create_branch = bzrdir.BzrDir.create_branch_convenience
2128
create_branch = controldir.ControlDir.create_branch_convenience
2130
force_new_tree = False
2132
force_new_tree = None
1741
2133
branch = create_branch(to_transport.base, format=format,
1742
possible_transports=[to_transport])
1743
a_bzrdir = branch.bzrdir
2134
possible_transports=[to_transport],
2135
force_new_tree=force_new_tree)
2136
a_controldir = branch.controldir
1745
from bzrlib.transport.local import LocalTransport
1746
if a_bzrdir.has_branch():
2138
from .transport.local import LocalTransport
2139
if a_controldir.has_branch():
1747
2140
if (isinstance(to_transport, LocalTransport)
1748
and not a_bzrdir.has_workingtree()):
1749
raise errors.BranchExistsWithoutWorkingTree(location)
2141
and not a_controldir.has_workingtree()):
2142
raise errors.BranchExistsWithoutWorkingTree(location)
1750
2143
raise errors.AlreadyBranchError(location)
1751
branch = a_bzrdir.create_branch()
1752
a_bzrdir.create_workingtree()
2144
branch = a_controldir.create_branch()
2145
if not no_tree and not a_controldir.has_workingtree():
2146
a_controldir.create_workingtree()
1753
2147
if append_revisions_only:
1755
2149
branch.set_append_revisions_only(True)
1756
2150
except errors.UpgradeRequired:
1757
raise errors.BzrCommandError('This branch format cannot be set'
1758
' to append-revisions-only. Try --default.')
2151
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2152
' to append-revisions-only. Try --default.'))
1759
2153
if not is_quiet():
1760
from bzrlib.info import describe_layout, describe_format
2154
from .info import describe_layout, describe_format
1762
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2156
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1763
2157
except (errors.NoWorkingTree, errors.NotLocalUrl):
1765
2159
repository = branch.repository
1766
2160
layout = describe_layout(repository, branch, tree).lower()
1767
format = describe_format(a_bzrdir, repository, branch, tree)
1768
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2161
format = describe_format(a_controldir, repository, branch, tree)
2162
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1769
2164
if repository.is_shared():
1770
#XXX: maybe this can be refactored into transport.path_or_url()
1771
url = repository.bzrdir.root_transport.external_url()
2165
# XXX: maybe this can be refactored into transport.path_or_url()
2166
url = repository.controldir.root_transport.external_url()
1773
2168
url = urlutils.local_path_from_url(url)
1774
except errors.InvalidURL:
2169
except urlutils.InvalidURL:
1776
self.outf.write("Using shared repository: %s\n" % url)
2171
self.outf.write(gettext("Using shared repository: %s\n") % url)
1779
2174
class cmd_init_repository(Command):
1807
2202
_see_also = ['init', 'branch', 'checkout', 'repositories']
1808
2203
takes_args = ["location"]
1809
2204
takes_options = [RegistryOption('format',
1810
help='Specify a format for this repository. See'
1811
' "bzr help formats" for details.',
1812
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1813
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1814
value_switches=True, title='Repository format'),
2205
help='Specify a format for this repository. See'
2206
' "brz help formats" for details.',
2208
'breezy.controldir', 'format_registry'),
2209
converter=lambda name: controldir.format_registry.make_controldir(
2211
value_switches=True, title='Repository format'),
1815
2212
Option('no-trees',
1816
help='Branches in the repository will default to'
1817
' not having a working tree.'),
2213
help='Branches in the repository will default to'
2214
' not having a working tree.'),
1819
2216
aliases = ["init-repo"]
1821
2218
def run(self, location, format=None, no_trees=False):
1822
2219
if format is None:
1823
format = bzrdir.format_registry.make_bzrdir('default')
2220
format = controldir.format_registry.make_controldir('default')
1825
2222
if location is None:
1828
2225
to_transport = transport.get_transport(location)
1829
to_transport.ensure_base()
1831
newdir = format.initialize_on_transport(to_transport)
1832
repo = newdir.create_repository(shared=True)
1833
repo.set_make_working_trees(not no_trees)
2227
if format.fixed_components:
2228
repo_format_name = None
2230
repo_format_name = format.repository_format.get_format_string()
2232
(repo, newdir, require_stacking, repository_policy) = (
2233
format.initialize_on_transport_ex(to_transport,
2234
create_prefix=True, make_working_trees=not no_trees,
2235
shared_repo=True, force_new_repo=True,
2236
use_existing_dir=True,
2237
repo_format_name=repo_format_name))
1834
2238
if not is_quiet():
1835
from bzrlib.info import show_bzrdir_info
1836
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2239
from .info import show_bzrdir_info
2240
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1839
2243
class cmd_diff(Command):
1859
2270
Shows the difference in the working tree versus the last commit::
1863
2274
Difference between the working tree and revision 1::
1867
2278
Difference between revision 3 and revision 1::
1871
2282
Difference between revision 3 and revision 1 for branch xxx::
1875
To see the changes introduced in revision X::
2286
The changes introduced by revision 2 (equivalent to -r1..2)::
2290
To see the changes introduced by revision X::
1879
2294
Note that in the case of a merge, the -c option shows the changes
1880
2295
compared to the left hand parent. To see the changes against
1881
2296
another parent, use::
1883
bzr diff -r<chosen_parent>..X
1885
The changes introduced by revision 2 (equivalent to -r1..2)::
2298
brz diff -r<chosen_parent>..X
2300
The changes between the current revision and the previous revision
2301
(equivalent to -c-1 and -r-2..-1)
1889
2305
Show just the differences for file NEWS::
1893
2309
Show the differences in working tree xxx for file NEWS::
1897
2313
Show the differences from branch xxx to this working tree:
1901
2317
Show the differences between two branches for file NEWS::
1903
bzr diff --old xxx --new yyy NEWS
1905
Same as 'bzr diff' but prefix paths with old/ and new/::
1907
bzr diff --prefix old/:new/
2319
brz diff --old xxx --new yyy NEWS
2321
Same as 'brz diff' but prefix paths with old/ and new/::
2323
brz diff --prefix old/:new/
2325
Show the differences using a custom diff program with options::
2327
brz diff --using /usr/bin/diff --diff-options -wu
1909
2329
_see_also = ['status']
1910
2330
takes_args = ['file*']
1911
2331
takes_options = [
1912
Option('diff-options', type=str,
2332
Option('diff-options', type=text_type,
1913
2333
help='Pass these options to the external diff program.'),
1914
Option('prefix', type=str,
2334
Option('prefix', type=text_type,
1915
2335
short_name='p',
1916
2336
help='Set prefixes added to old and new filenames, as '
1917
2337
'two values separated by a colon. (eg "old/:new/").'),
1919
help='Branch/tree to compare from.',
2339
help='Branch/tree to compare from.',
1923
help='Branch/tree to compare to.',
2343
help='Branch/tree to compare to.',
1928
2348
Option('using',
1929
help='Use this command to compare files.',
2349
help='Use this command to compare files.',
1932
2352
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
2354
help='Diff format to use.',
2355
lazy_registry=('breezy.diff', 'format_registry'),
2356
title='Diff format'),
2358
help='How many lines of context to show.',
1937
2362
aliases = ['di', 'dif']
1938
2363
encoding_type = 'exact'
1940
2365
@display_command
1941
2366
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2367
prefix=None, old=None, new=None, using=None, format=None,
2369
from .diff import (get_trees_and_branches_to_diff_locked,
1946
if (prefix is None) or (prefix == '0'):
1947
2373
# diff -p0 format
2376
elif prefix == u'1' or prefix is None:
1951
2377
old_label = 'old/'
1952
2378
new_label = 'new/'
1954
old_label, new_label = prefix.split(":")
2379
elif u':' in prefix:
2380
old_label, new_label = prefix.split(u":")
1956
raise errors.BzrCommandError(
2382
raise errors.BzrCommandError(gettext(
1957
2383
'--prefix expects two values separated by a colon'
1958
' (eg "old/:new/")')
2384
' (eg "old/:new/")'))
1960
2386
if revision and len(revision) > 2:
1961
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
' one or two revision specifiers')
2387
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2388
' one or two revision specifiers'))
1964
2390
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
2391
raise errors.BzrCommandError(gettext(
2392
'{0} and {1} are mutually exclusive').format(
2393
'--using', '--format'))
1968
2395
(old_tree, new_tree,
1969
2396
old_branch, new_branch,
1970
2397
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
2398
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1972
return show_diff_trees(old_tree, new_tree, sys.stdout,
2399
# GNU diff on Windows uses ANSI encoding for filenames
2400
path_encoding = osutils.get_diff_header_encoding()
2401
return show_diff_trees(old_tree, new_tree, self.outf,
1973
2402
specific_files=specific_files,
1974
2403
external_diff_options=diff_options,
1975
2404
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
2405
extra_trees=extra_trees,
2406
path_encoding=path_encoding,
2407
using=using, context=context,
1977
2408
format_cls=format)
2204
2627
:Other filtering:
2206
The --message option can be used for finding revisions that match a
2207
regular expression in a commit message.
2629
The --match option can be used for finding revisions that match a
2630
regular expression in a commit message, committer, author or bug.
2631
Specifying the option several times will match any of the supplied
2632
expressions. --match-author, --match-bugs, --match-committer and
2633
--match-message can be used to only match a specific field.
2209
2635
:Tips & tricks:
2211
2637
GUI tools and IDEs are often better at exploring history than command
2212
2638
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2639
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2640
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2641
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2217
You may find it useful to add the aliases below to ``bazaar.conf``::
2643
You may find it useful to add the aliases below to ``breezy.conf``::
2221
2647
top = log -l10 --line
2222
2648
show = log -v -p
2224
``bzr tip`` will then show the latest revision while ``bzr top``
2650
``brz tip`` will then show the latest revision while ``brz top``
2225
2651
will show the last 10 mainline revisions. To see the details of a
2226
particular revision X, ``bzr show -rX``.
2652
particular revision X, ``brz show -rX``.
2228
2654
If you are interested in looking deeper into a particular merge X,
2229
use ``bzr log -n0 -rX``.
2655
use ``brz log -n0 -rX``.
2231
``bzr log -v`` on a branch with lots of history is currently
2657
``brz log -v`` on a branch with lots of history is currently
2232
2658
very slow. A fix for this issue is currently under development.
2233
2659
With or without that fix, it is recommended that a revision range
2234
2660
be given when using the -v option.
2236
bzr has a generic full-text matching plugin, bzr-search, that can be
2662
brz has a generic full-text matching plugin, brz-search, that can be
2237
2663
used to find revisions matching user names, commit messages, etc.
2238
2664
Among other features, this plugin can find all revisions containing
2239
2665
a list of words but not others.
2246
2672
takes_args = ['file*']
2247
2673
_see_also = ['log-formats', 'revisionspec']
2248
2674
takes_options = [
2250
help='Show from oldest to newest.'),
2252
custom_help('verbose',
2253
help='Show files changed in each revision.'),
2257
type=bzrlib.option._parse_revision_str,
2259
help='Show just the specified revision.'
2260
' See also "help revisionspec".'),
2264
help='Number of levels to display - 0 for all, 1 for flat.',
2266
type=_parse_levels),
2676
help='Show from oldest to newest.'),
2678
custom_help('verbose',
2679
help='Show files changed in each revision.'),
2683
type=breezy.option._parse_revision_str,
2685
help='Show just the specified revision.'
2686
' See also "help revisionspec".'),
2688
RegistryOption('authors',
2689
'What names to list as authors - first, all or committer.',
2692
'breezy.log', 'author_list_registry'),
2696
help='Number of levels to display - 0 for all, 1 for flat.',
2698
type=_parse_levels),
2700
help='Show revisions whose message matches this '
2701
'regular expression.',
2706
help='Limit the output to the first N revisions.',
2711
help='Show changes made in each revision as a patch.'),
2712
Option('include-merged',
2713
help='Show merged revisions like --levels 0 does.'),
2714
Option('include-merges', hidden=True,
2715
help='Historical alias for --include-merged.'),
2716
Option('omit-merges',
2717
help='Do not report commits with more than one parent.'),
2718
Option('exclude-common-ancestry',
2719
help='Display only the revisions that are not part'
2720
' of both ancestries (require -rX..Y).'
2722
Option('signatures',
2723
help='Show digital signature validity.'),
2268
2725
short_name='m',
2726
help='Show revisions whose properties match this '
2729
ListOption('match-message',
2269
2730
help='Show revisions whose message matches this '
2270
'regular expression.',
2274
help='Limit the output to the first N revisions.',
2279
help='Show changes made in each revision as a patch.'),
2280
Option('include-merges',
2281
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2733
ListOption('match-committer',
2734
help='Show revisions whose committer matches this '
2737
ListOption('match-author',
2738
help='Show revisions whose authors match this '
2741
ListOption('match-bugs',
2742
help='Show revisions whose bugs match this '
2287
2746
encoding_type = 'replace'
2289
2748
@display_command
2499
2992
_see_also = ['status', 'cat']
2500
2993
takes_args = ['path?']
2501
2994
takes_options = [
2504
Option('recursive', short_name='R',
2505
help='Recurse into subdirectories.'),
2507
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2509
Option('versioned', help='Print versioned files.',
2511
Option('ignored', help='Print ignored files.'),
2513
help='Write an ascii NUL (\\0) separator '
2514
'between files rather than a newline.'),
2516
help='List entries of a particular kind: file, directory, symlink.',
2997
Option('recursive', short_name='R',
2998
help='Recurse into subdirectories.'),
3000
help='Print paths relative to the root of the branch.'),
3001
Option('unknown', short_name='u',
3002
help='Print unknown files.'),
3003
Option('versioned', help='Print versioned files.',
3005
Option('ignored', short_name='i',
3006
help='Print ignored files.'),
3007
Option('kind', short_name='k',
3008
help=('List entries of a particular kind: file, '
3009
'directory, symlink, tree-reference.'),
2520
3016
@display_command
2521
3017
def run(self, revision=None, verbose=False,
2522
3018
recursive=False, from_root=False,
2523
3019
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
3020
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
if kind and kind not in ('file', 'directory', 'symlink'):
2527
raise errors.BzrCommandError('invalid kind specified')
3022
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
3023
raise errors.BzrCommandError(gettext('invalid kind specified'))
2529
3025
if verbose and null:
2530
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3026
raise errors.BzrCommandError(
3027
gettext('Cannot set both --verbose and --null'))
2531
3028
all = not (unknown or versioned or ignored)
2533
selection = {'I':ignored, '?':unknown, 'V':versioned}
3030
selection = {'I': ignored, '?': unknown, 'V': versioned}
2535
3032
if path is None:
2539
raise errors.BzrCommandError('cannot specify both --from-root'
3036
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
2542
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
3039
tree, branch, relpath = \
3040
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2545
3042
# Calculate the prefix to use
2646
3144
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
3145
precedence over regular ignores. Such exceptions are used to specify
2648
3146
files that should be versioned which would otherwise be ignored.
2650
3148
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
3149
precedence over the '!' exception patterns.
2653
Note: ignore patterns containing shell wildcards must be quoted from
3153
* Ignore patterns containing shell wildcards must be quoted from
3156
* Ignore patterns starting with "#" act as comments in the ignore file.
3157
To ignore patterns that begin with that character, use the "RE:" prefix.
2657
3160
Ignore the top level Makefile::
2659
bzr ignore ./Makefile
3162
brz ignore ./Makefile
2661
3164
Ignore .class files in all directories...::
2663
bzr ignore "*.class"
3166
brz ignore "*.class"
2665
3168
...but do not ignore "special.class"::
2667
bzr ignore "!special.class"
2669
Ignore .o files under the lib directory::
2671
bzr ignore "lib/**/*.o"
2673
Ignore .o files under the lib directory::
2675
bzr ignore "RE:lib/.*\.o"
3170
brz ignore "!special.class"
3172
Ignore files whose name begins with the "#" character::
3176
Ignore .o files under the lib directory::
3178
brz ignore "lib/**/*.o"
3180
Ignore .o files under the lib directory::
3182
brz ignore "RE:lib/.*\\.o"
2677
3184
Ignore everything but the "debian" toplevel directory::
2679
bzr ignore "RE:(?!debian/).*"
3186
brz ignore "RE:(?!debian/).*"
2681
3188
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
3189
but always ignore autosave files ending in ~, even under local/::
3192
brz ignore "!./local"
2689
3196
_see_also = ['status', 'ignored', 'patterns']
2690
3197
takes_args = ['name_pattern*']
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
3198
takes_options = ['directory',
3199
Option('default-rules',
3200
help='Display the default ignore rules that brz uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2697
from bzrlib import ignores
3203
def run(self, name_pattern_list=None, default_rules=None,
3205
from breezy import ignores
2698
3206
if default_rules is not None:
2699
3207
# dump the default rules and exit
2700
3208
for pattern in ignores.USER_DEFAULTS:
2701
3209
self.outf.write("%s\n" % pattern)
2703
3211
if not name_pattern_list:
2704
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
3212
raise errors.BzrCommandError(gettext("ignore requires at least one "
3213
"NAME_PATTERN or --default-rules."))
2706
3214
name_pattern_list = [globbing.normalize_pattern(p)
2707
3215
for p in name_pattern_list]
3217
bad_patterns_count = 0
3218
for p in name_pattern_list:
3219
if not globbing.Globster.is_pattern_valid(p):
3220
bad_patterns_count += 1
3221
bad_patterns += ('\n %s' % p)
3223
msg = (ngettext('Invalid ignore pattern found. %s',
3224
'Invalid ignore patterns found. %s',
3225
bad_patterns_count) % bad_patterns)
3226
ui.ui_factory.show_error(msg)
3227
raise lazy_regex.InvalidPattern('')
2708
3228
for name_pattern in name_pattern_list:
2709
3229
if (name_pattern[0] == '/' or
2710
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
3230
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3231
raise errors.BzrCommandError(gettext(
3232
"NAME_PATTERN should not be an absolute path"))
3233
tree, relpath = WorkingTree.open_containing(directory)
2714
3234
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
3235
ignored = globbing.Globster(name_pattern_list)
2718
for entry in tree.list_files():
3237
self.add_cleanup(tree.lock_read().unlock)
3238
for filename, fc, fkind, entry in tree.list_files():
3239
id = getattr(entry, 'file_id', None)
2720
3240
if id is not None:
2722
3241
if ignored.match(filename):
2723
3242
matches.append(filename)
2725
3243
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
2728
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3244
self.outf.write(gettext("Warning: the following files are version "
3245
"controlled and match your ignore pattern:\n%s"
3246
"\nThese files will continue to be version controlled"
3247
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2732
3250
class cmd_ignored(Command):
2804
3325
================= =========================
3328
encoding_type = 'exact'
2806
3329
takes_args = ['dest', 'branch_or_subdir?']
2809
help="Type of file to export to.",
2812
Option('filters', help='Apply content filters to export the '
2813
'convenient form.'),
2816
help="Name of the root directory inside the exported file."),
2817
Option('per-file-timestamps',
2818
help='Set modification time of files to that of the last '
2819
'revision in which it was changed.'),
3330
takes_options = ['directory',
3332
help="Type of file to export to.",
3335
Option('filters', help='Apply content filters to export the '
3336
'convenient form.'),
3339
help="Name of the root directory inside the exported file."),
3340
Option('per-file-timestamps',
3341
help='Set modification time of files to that of the last '
3342
'revision in which it was changed.'),
3343
Option('uncommitted',
3344
help='Export the working tree contents rather than that of the '
2821
3348
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2823
from bzrlib.export import export
3349
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3351
from .export import export, guess_format, get_root_name
2825
3353
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
2830
b, subdir = Branch.open_containing(branch_or_subdir)
2833
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3354
branch_or_subdir = directory
3356
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3358
if tree is not None:
3359
self.add_cleanup(tree.lock_read().unlock)
3363
raise errors.BzrCommandError(
3364
gettext("--uncommitted requires a working tree"))
3367
export_tree = _get_one_revision_tree(
3368
'export', revision, branch=b,
3372
format = guess_format(dest)
3375
root = get_root_name(dest)
3377
if not per_file_timestamps:
3378
force_mtime = time.time()
3383
from breezy.filter_tree import ContentFilterTree
3384
export_tree = ContentFilterTree(
3385
export_tree, export_tree._content_filter_stack)
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
3388
export(export_tree, dest, format, root, subdir,
2836
3389
per_file_timestamps=per_file_timestamps)
2837
except errors.NoSuchExportFormat, e:
2838
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3390
except errors.NoSuchExportFormat as e:
3391
raise errors.BzrCommandError(
3392
gettext('Unsupported export format: %s') % e.format)
2841
3395
class cmd_cat(Command):
2850
3404
_see_also = ['ls']
2852
Option('name-from-revision', help='The path name in the old tree.'),
2853
Option('filters', help='Apply content filters to display the '
2854
'convenience form.'),
3405
takes_options = ['directory',
3406
Option('name-from-revision',
3407
help='The path name in the old tree.'),
3408
Option('filters', help='Apply content filters to display the '
3409
'convenience form.'),
2857
3412
takes_args = ['filename']
2858
3413
encoding_type = 'exact'
2860
3415
@display_command
2861
3416
def run(self, filename, revision=None, name_from_revision=False,
3417
filters=False, directory=None):
2863
3418
if revision is not None and len(revision) != 1:
2864
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
" one revision specifier")
3419
raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"
3420
" one revision specifier"))
2866
3421
tree, branch, relpath = \
2867
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3422
_open_directory_or_containing_tree_or_branch(filename, directory)
2868
3423
self.add_cleanup(branch.lock_read().unlock)
2869
3424
return self._run(tree, branch, relpath, filename, revision,
2870
3425
name_from_revision, filters)
2872
3427
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2874
3430
if tree is None:
2875
3431
tree = b.basis_tree()
2876
3432
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
3433
self.add_cleanup(rev_tree.lock_read().unlock)
2879
old_file_id = rev_tree.path2id(relpath)
2881
3435
if name_from_revision:
2882
3436
# Try in revision if requested
2883
if old_file_id is None:
2884
raise errors.BzrCommandError(
2885
"%r is not present in revision %s" % (
3437
if not rev_tree.is_versioned(relpath):
3438
raise errors.BzrCommandError(gettext(
3439
"{0!r} is not present in revision {1}").format(
2886
3440
filename, rev_tree.get_revision_id()))
2888
content = rev_tree.get_file_text(old_file_id)
3441
rev_tree_path = relpath
2890
cur_file_id = tree.path2id(relpath)
2892
if cur_file_id is not None:
2893
# Then try with the actual file id
2895
content = rev_tree.get_file_text(cur_file_id)
2897
except errors.NoSuchId:
2898
# The actual file id didn't exist at that time
2900
if not found and old_file_id is not None:
2901
# Finally try with the old file id
2902
content = rev_tree.get_file_text(old_file_id)
2905
# Can't be found anywhere
2906
raise errors.BzrCommandError(
2907
"%r is not present in revision %s" % (
2908
filename, rev_tree.get_revision_id()))
3444
rev_tree_path = _mod_tree.find_previous_path(
3445
tree, rev_tree, relpath)
3446
except errors.NoSuchFile:
3447
rev_tree_path = None
3449
if rev_tree_path is None:
3450
# Path didn't exist in working tree
3451
if not rev_tree.is_versioned(relpath):
3452
raise errors.BzrCommandError(gettext(
3453
"{0!r} is not present in revision {1}").format(
3454
filename, rev_tree.get_revision_id()))
3456
# Fall back to the same path in the basis tree, if present.
3457
rev_tree_path = relpath
2910
from bzrlib.filters import (
2911
ContentFilterContext,
2912
filtered_output_bytes,
2914
filters = rev_tree._content_filter_stack(relpath)
2915
chunks = content.splitlines(True)
2916
content = filtered_output_bytes(chunks, filters,
2917
ContentFilterContext(relpath, rev_tree))
2919
self.outf.writelines(content)
3460
from .filter_tree import ContentFilterTree
3461
filter_tree = ContentFilterTree(
3462
rev_tree, rev_tree._content_filter_stack)
3463
fileobj = filter_tree.get_file(rev_tree_path)
2922
self.outf.write(content)
3465
fileobj = rev_tree.get_file(rev_tree_path)
3466
shutil.copyfileobj(fileobj, self.outf)
2925
3470
class cmd_local_time_offset(Command):
2926
3471
__doc__ = """Show the offset in seconds from GMT to local time."""
2928
3474
@display_command
2930
3476
self.outf.write("%s\n" % osutils.local_time_offset())
2934
3479
class cmd_commit(Command):
2935
3480
__doc__ = """Commit changes into a new revision.
2967
3512
"John Doe <jdoe@example.com>". If there is more than one author of
2968
3513
the change you can specify the option multiple times, once for each
2973
3518
A common mistake is to forget to add a new file or directory before
2974
3519
running the commit command. The --strict option checks for unknown
2975
3520
files and aborts the commit if any are found. More advanced pre-commit
2976
checks can be implemented by defining hooks. See ``bzr help hooks``
3521
checks can be implemented by defining hooks. See ``brz help hooks``
2979
3524
:Things to note:
2981
3526
If you accidentially commit the wrong changes or make a spelling
2982
3527
mistake in the commit message say, you can use the uncommit command
2983
to undo it. See ``bzr help uncommit`` for details.
3528
to undo it. See ``brz help uncommit`` for details.
2985
3530
Hooks can also be configured to run after a commit. This allows you
2986
3531
to trigger updates to external systems like bug trackers. The --fixes
2987
3532
option can be used to record the association between a revision and
2988
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3533
one or more bugs. See ``brz help bugs`` for details.
3007
# TODO: Run hooks on tree to-be-committed, and after commit.
3009
# TODO: Strict commit that fails if there are deleted files.
3010
# (what does "deleted files" mean ??)
3012
# TODO: Give better message for -s, --summary, used by tla people
3014
# XXX: verbose currently does nothing
3016
3536
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3017
3537
takes_args = ['selected*']
3018
3538
takes_options = [
3019
ListOption('exclude', type=str, short_name='x',
3020
help="Do not consider changes made to a given path."),
3021
Option('message', type=unicode,
3023
help="Description of the new revision."),
3026
help='Commit even if nothing has changed.'),
3027
Option('file', type=str,
3030
help='Take commit message from this file.'),
3032
help="Refuse to commit if there are unknown "
3033
"files in the working tree."),
3034
Option('commit-time', type=str,
3035
help="Manually set a commit time using commit date "
3036
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3037
ListOption('fixes', type=str,
3038
help="Mark a bug as being fixed by this revision "
3039
"(see \"bzr help bugs\")."),
3040
ListOption('author', type=unicode,
3041
help="Set the author's name, if it's different "
3042
"from the committer."),
3044
help="Perform a local commit in a bound "
3045
"branch. Local commits are not pushed to "
3046
"the master branch until a normal commit "
3049
Option('show-diff', short_name='p',
3050
help='When no message is supplied, show the diff along'
3051
' with the status summary in the message editor.'),
3540
'exclude', type=text_type, short_name='x',
3541
help="Do not consider changes made to a given path."),
3542
Option('message', type=text_type,
3544
help="Description of the new revision."),
3547
help='Commit even if nothing has changed.'),
3548
Option('file', type=text_type,
3551
help='Take commit message from this file.'),
3553
help="Refuse to commit if there are unknown "
3554
"files in the working tree."),
3555
Option('commit-time', type=text_type,
3556
help="Manually set a commit time using commit date "
3557
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3559
'bugs', type=text_type,
3560
help="Link to a related bug. (see \"brz help bugs\")."),
3562
'fixes', type=text_type,
3563
help="Mark a bug as being fixed by this revision "
3564
"(see \"brz help bugs\")."),
3566
'author', type=text_type,
3567
help="Set the author's name, if it's different "
3568
"from the committer."),
3570
help="Perform a local commit in a bound "
3571
"branch. Local commits are not pushed to "
3572
"the master branch until a normal commit "
3575
Option('show-diff', short_name='p',
3576
help='When no message is supplied, show the diff along'
3577
' with the status summary in the message editor.'),
3579
help='When committing to a foreign version control '
3580
'system do not push data that can not be natively '
3053
3582
aliases = ['ci', 'checkin']
3055
def _iter_bug_fix_urls(self, fixes, branch):
3584
def _iter_bug_urls(self, bugs, branch, status):
3585
default_bugtracker = None
3056
3586
# Configure the properties for bug fixing attributes.
3057
for fixed_bug in fixes:
3058
tokens = fixed_bug.split(':')
3059
if len(tokens) != 2:
3060
raise errors.BzrCommandError(
3588
tokens = bug.split(':')
3589
if len(tokens) == 1:
3590
if default_bugtracker is None:
3591
branch_config = branch.get_config_stack()
3592
default_bugtracker = branch_config.get(
3594
if default_bugtracker is None:
3595
raise errors.BzrCommandError(gettext(
3596
"No tracker specified for bug %s. Use the form "
3597
"'tracker:id' or specify a default bug tracker "
3598
"using the `bugtracker` option.\nSee "
3599
"\"brz help bugs\" for more information on this "
3600
"feature. Commit refused.") % bug)
3601
tag = default_bugtracker
3603
elif len(tokens) != 2:
3604
raise errors.BzrCommandError(gettext(
3061
3605
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3062
"See \"bzr help bugs\" for more information on this "
3063
"feature.\nCommit refused." % fixed_bug)
3064
tag, bug_id = tokens
3606
"See \"brz help bugs\" for more information on this "
3607
"feature.\nCommit refused.") % bug)
3609
tag, bug_id = tokens
3066
yield bugtracker.get_bug_url(tag, branch, bug_id)
3067
except errors.UnknownBugTrackerAbbreviation:
3068
raise errors.BzrCommandError(
3069
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3070
except errors.MalformedBugIdentifier, e:
3071
raise errors.BzrCommandError(
3072
"%s\nCommit refused." % (str(e),))
3611
yield bugtracker.get_bug_url(tag, branch, bug_id), status
3612
except bugtracker.UnknownBugTrackerAbbreviation:
3613
raise errors.BzrCommandError(gettext(
3614
'Unrecognized bug %s. Commit refused.') % bug)
3615
except bugtracker.MalformedBugIdentifier as e:
3616
raise errors.BzrCommandError(gettext(
3617
u"%s\nCommit refused.") % (e,))
3074
3619
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
3077
from bzrlib.errors import (
3620
unchanged=False, strict=False, local=False, fixes=None, bugs=None,
3621
author=None, show_diff=False, exclude=None, commit_time=None,
3624
from .commit import (
3078
3625
PointlessCommit,
3627
from .errors import (
3079
3628
ConflictsInTree,
3080
3629
StrictCommitFailed
3082
from bzrlib.msgeditor import (
3631
from .msgeditor import (
3083
3632
edit_commit_message_encoded,
3084
3633
generate_commit_message_template,
3085
make_commit_message_template_encoded
3634
make_commit_message_template_encoded,
3088
3638
commit_stamp = offset = None
3089
3639
if commit_time is not None:
3091
3641
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3092
except ValueError, e:
3093
raise errors.BzrCommandError(
3094
"Could not parse --commit-time: " + str(e))
3096
# TODO: Need a blackbox test for invoking the external editor; may be
3097
# slightly problematic to run this cross-platform.
3099
# TODO: do more checks that the commit will succeed before
3100
# spending the user's valuable time typing a commit message.
3642
except ValueError as e:
3643
raise errors.BzrCommandError(gettext(
3644
"Could not parse --commit-time: " + str(e)))
3102
3646
properties = {}
3104
tree, selected_list = tree_files(selected_list)
3648
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3105
3649
if selected_list == ['']:
3106
3650
# workaround - commit of root of tree should be exactly the same
3107
3651
# as just default commit in that tree, and succeed even though
3130
3678
warning_msg = (
3131
3679
'The commit message is a file name: "%(f)s".\n'
3132
3680
'(use --file "%(f)s" to take commit message from that file)'
3134
3682
ui.ui_factory.show_warning(warning_msg)
3135
3683
if '\r' in message:
3136
3684
message = message.replace('\r\n', '\n')
3137
3685
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3687
raise errors.BzrCommandError(gettext(
3688
"please specify either --message or --file"))
3142
3690
def get_message(commit_obj):
3143
3691
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3693
with open(file, 'rb') as f:
3694
my_message = f.read().decode(osutils.get_user_encoding())
3147
3695
elif message is not None:
3148
3696
my_message = message
3150
3698
# No message supplied: make one up.
3151
3699
# text is the status of the tree
3152
3700
text = make_commit_message_template_encoded(tree,
3153
selected_list, diff=show_diff,
3154
output_encoding=osutils.get_user_encoding())
3701
selected_list, diff=show_diff,
3702
output_encoding=osutils.get_user_encoding())
3155
3703
# start_message is the template generated from hooks
3156
3704
# XXX: Warning - looks like hooks return unicode,
3157
3705
# make_commit_message_template_encoded returns user encoding.
3158
3706
# We probably want to be using edit_commit_message instead to
3160
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3162
start_message=start_message)
3163
if my_message is None:
3164
raise errors.BzrCommandError("please specify a commit"
3165
" message with either --message or --file")
3166
if my_message == "":
3167
raise errors.BzrCommandError("empty commit message specified")
3708
my_message = set_commit_message(commit_obj)
3709
if my_message is None:
3710
start_message = generate_commit_message_template(
3712
if start_message is not None:
3713
start_message = start_message.encode(
3714
osutils.get_user_encoding())
3715
my_message = edit_commit_message_encoded(text,
3716
start_message=start_message)
3717
if my_message is None:
3718
raise errors.BzrCommandError(gettext("please specify a commit"
3719
" message with either --message or --file"))
3720
if my_message == "":
3721
raise errors.BzrCommandError(gettext("Empty commit message specified."
3722
" Please specify a commit message with either"
3723
" --message or --file or leave a blank message"
3724
" with --message \"\"."))
3168
3725
return my_message
3170
3727
# The API permits a commit with a filter of [] to mean 'select nothing'
3270
3829
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3273
The check command or bzr developers may sometimes advise you to run
3274
this command. When the default format has changed you may also be warned
3275
during other operations to upgrade.
3830
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3832
When the default format has changed after a major new release of
3833
Bazaar, you may be informed during certain operations that you
3834
should upgrade. Upgrading to a newer format may improve performance
3835
or make new features available. It may however limit interoperability
3836
with older repositories or with older versions of Bazaar.
3838
If you wish to upgrade to a particular format rather than the
3839
current default, that can be specified using the --format option.
3840
As a consequence, you can use the upgrade command this way to
3841
"downgrade" to an earlier format, though some conversions are
3842
a one way process (e.g. changing from the 1.x default to the
3843
2.x default) so downgrading is not always possible.
3845
A backup.bzr.~#~ directory is created at the start of the conversion
3846
process (where # is a number). By default, this is left there on
3847
completion. If the conversion fails, delete the new .bzr directory
3848
and rename this one back in its place. Use the --clean option to ask
3849
for the backup.bzr directory to be removed on successful conversion.
3850
Alternatively, you can delete it by hand if everything looks good
3853
If the location given is a shared repository, dependent branches
3854
are also converted provided the repository converts successfully.
3855
If the conversion of a branch fails, remaining branches are still
3858
For more information on upgrades, see the Bazaar Upgrade Guide,
3859
https://www.breezy-vcs.org/doc/en/upgrade-guide/.
3278
_see_also = ['check']
3862
_see_also = ['check', 'reconcile', 'formats']
3279
3863
takes_args = ['url?']
3280
3864
takes_options = [
3281
RegistryOption('format',
3282
help='Upgrade to a specific format. See "bzr help'
3283
' formats" for details.',
3284
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3285
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3286
value_switches=True, title='Branch format'),
3865
RegistryOption('format',
3866
help='Upgrade to a specific format. See "brz help'
3867
' formats" for details.',
3868
lazy_registry=('breezy.controldir', 'format_registry'),
3869
converter=lambda name: controldir.format_registry.make_controldir(
3871
value_switches=True, title='Branch format'),
3873
help='Remove the backup.bzr directory if successful.'),
3875
help="Show what would be done, but don't actually do anything."),
3289
def run(self, url='.', format=None):
3290
from bzrlib.upgrade import upgrade
3291
upgrade(url, format)
3878
def run(self, url='.', format=None, clean=False, dry_run=False):
3879
from .upgrade import upgrade
3880
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3882
if len(exceptions) == 1:
3883
# Compatibility with historical behavior
3294
3889
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3890
__doc__ = """Show or set brz user id.
3298
3893
Show the email of the current user::
3302
3897
Set the current user::
3304
bzr whoami "Frank Chu <fchu@example.com>"
3899
brz whoami "Frank Chu <fchu@example.com>"
3306
takes_options = [ Option('email',
3307
help='Display email address only.'),
3309
help='Set identity for the current branch instead of '
3901
takes_options = ['directory',
3903
help='Display email address only.'),
3905
help='Set identity for the current branch instead of '
3312
3908
takes_args = ['name?']
3313
3909
encoding_type = 'replace'
3315
3911
@display_command
3316
def run(self, email=False, branch=False, name=None):
3912
def run(self, email=False, branch=False, name=None, directory=None):
3317
3913
if name is None:
3318
# use branch if we're inside one; otherwise global config
3320
c = Branch.open_containing('.')[0].get_config()
3321
except errors.NotBranchError:
3322
c = config.GlobalConfig()
3914
if directory is None:
3915
# use branch if we're inside one; otherwise global config
3917
c = Branch.open_containing(u'.')[0].get_config_stack()
3918
except errors.NotBranchError:
3919
c = _mod_config.GlobalStack()
3921
c = Branch.open(directory).get_config_stack()
3922
identity = c.get('email')
3324
self.outf.write(c.user_email() + '\n')
3924
self.outf.write(_mod_config.extract_email_address(identity)
3326
self.outf.write(c.username() + '\n')
3927
self.outf.write(identity + '\n')
3931
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3329
3934
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3332
except errors.NoEmailInUsername, e:
3936
_mod_config.extract_email_address(name)
3937
except _mod_config.NoEmailInUsername:
3333
3938
warning('"%s" does not seem to contain an email address. '
3334
3939
'This is allowed, but not recommended.', name)
3336
3941
# use global config unless --branch given
3338
c = Branch.open_containing('.')[0].get_config()
3943
if directory is None:
3944
c = Branch.open_containing(u'.')[0].get_config_stack()
3946
b = Branch.open(directory)
3947
self.add_cleanup(b.lock_write().unlock)
3948
c = b.get_config_stack()
3340
c = config.GlobalConfig()
3341
c.set_user_option('email', name)
3950
c = _mod_config.GlobalStack()
3951
c.set('email', name)
3344
3954
class cmd_nick(Command):
3345
3955
__doc__ = """Print or set the branch nickname.
3347
If unset, the tree root directory name is used as the nickname.
3348
To print the current nickname, execute with no argument.
3957
If unset, the colocated branch name is used for colocated branches, and
3958
the branch directory name is used for other branches. To print the
3959
current nickname, execute with no argument.
3350
3961
Bound branches use the nickname of its master branch unless it is set
3401
4014
if equal_pos == -1:
3402
4015
self.print_alias(name)
3404
self.set_alias(name[:equal_pos], name[equal_pos+1:])
4017
self.set_alias(name[:equal_pos], name[equal_pos + 1:])
3406
4019
def remove_alias(self, alias_name):
3407
4020
if alias_name is None:
3408
raise errors.BzrCommandError(
3409
'bzr alias --remove expects an alias to remove.')
4021
raise errors.BzrCommandError(gettext(
4022
'brz alias --remove expects an alias to remove.'))
3410
4023
# If alias is not found, print something like:
3411
4024
# unalias: foo: not found
3412
c = config.GlobalConfig()
4025
c = _mod_config.GlobalConfig()
3413
4026
c.unset_alias(alias_name)
3415
4028
@display_command
3416
4029
def print_aliases(self):
3417
4030
"""Print out the defined aliases in a similar format to bash."""
3418
aliases = config.GlobalConfig().get_aliases()
3419
for key, value in sorted(aliases.iteritems()):
3420
self.outf.write('bzr alias %s="%s"\n' % (key, value))
4031
aliases = _mod_config.GlobalConfig().get_aliases()
4032
for key, value in sorted(viewitems(aliases)):
4033
self.outf.write('brz alias %s="%s"\n' % (key, value))
3422
4035
@display_command
3423
4036
def print_alias(self, alias_name):
3424
from bzrlib.commands import get_alias
4037
from .commands import get_alias
3425
4038
alias = get_alias(alias_name)
3426
4039
if alias is None:
3427
self.outf.write("bzr alias: %s: not found\n" % alias_name)
4040
self.outf.write("brz alias: %s: not found\n" % alias_name)
3429
4042
self.outf.write(
3430
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
4043
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3432
4045
def set_alias(self, alias_name, alias_command):
3433
4046
"""Save the alias in the global config."""
3434
c = config.GlobalConfig()
4047
c = _mod_config.GlobalConfig()
3435
4048
c.set_alias(alias_name, alias_command)
3526
4141
Option('list-only',
3527
4142
help='List the tests instead of running them.'),
3528
4143
RegistryOption('parallel',
3529
help="Run the test suite in parallel.",
3530
lazy_registry=('bzrlib.tests', 'parallel_registry'),
3531
value_switches=False,
3533
Option('randomize', type=str, argname="SEED",
4144
help="Run the test suite in parallel.",
4146
'breezy.tests', 'parallel_registry'),
4147
value_switches=False,
4149
Option('randomize', type=text_type, argname="SEED",
3534
4150
help='Randomize the order of tests using the given'
3535
4151
' seed or "now" for the current time.'),
3536
Option('exclude', type=str, argname="PATTERN",
3538
help='Exclude tests that match this regular'
3541
help='Output test progress via subunit.'),
4152
ListOption('exclude', type=text_type, argname="PATTERN",
4154
help='Exclude tests that match this regular'
4157
help='Output test progress via subunit v1.'),
4159
help='Output test progress via subunit v2.'),
3542
4160
Option('strict', help='Fail on missing dependencies or '
3543
4161
'known failures.'),
3544
Option('load-list', type=str, argname='TESTLISTFILE',
4162
Option('load-list', type=text_type, argname='TESTLISTFILE',
3545
4163
help='Load a test id list from a text file.'),
3546
ListOption('debugflag', type=str, short_name='E',
4164
ListOption('debugflag', type=text_type, short_name='E',
3547
4165
help='Turn on a selftest debug flag.'),
3548
ListOption('starting-with', type=str, argname='TESTID',
4166
ListOption('starting-with', type=text_type, argname='TESTID',
3549
4167
param_name='starting_with', short_name='s',
3551
'Load only the tests starting with TESTID.'),
4168
help='Load only the tests starting with TESTID.'),
4170
help="By default we disable fsync and fdatasync"
4171
" while running the test suite.")
3553
4173
encoding_type = 'replace'
3559
4179
def run(self, testspecs_list=None, verbose=False, one=False,
3560
4180
transport=None, benchmark=None,
3561
lsprof_timed=None, cache_dir=None,
3562
4182
first=False, list_only=False,
3563
4183
randomize=None, exclude=None, strict=False,
3564
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
parallel=None, lsprof_tests=False):
3566
from bzrlib.tests import selftest
3567
import bzrlib.benchmarks as benchmarks
3568
from bzrlib.benchmarks import tree_creator
3570
# Make deprecation warnings visible, unless -Werror is set
3571
symbol_versioning.activate_deprecation_warnings(override=False)
3573
if cache_dir is not None:
3574
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4184
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4185
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4187
# During selftest, disallow proxying, as it can cause severe
4188
# performance penalties and is only needed for thread
4189
# safety. The selftest command is assumed to not use threads
4190
# too heavily. The call should be as early as possible, as
4191
# error reporting for past duplicate imports won't have useful
4193
if sys.version_info[0] < 3:
4194
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4195
# disallowing it currently leads to failures in many places.
4196
lazy_import.disallow_proxying()
4201
raise errors.BzrCommandError("tests not available. Install the "
4202
"breezy tests to run the breezy testsuite.")
3575
4204
if testspecs_list is not None:
3576
4205
pattern = '|'.join(testspecs_list)
3581
from bzrlib.tests import SubUnitBzrRunner
4210
from .tests import SubUnitBzrRunnerv1
3582
4211
except ImportError:
3583
raise errors.BzrCommandError("subunit not available. subunit "
3584
"needs to be installed to use --subunit.")
3585
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4212
raise errors.BzrCommandError(gettext(
4213
"subunit not available. subunit needs to be installed "
4214
"to use --subunit."))
4215
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3586
4216
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4217
# stdout, which would corrupt the subunit stream.
4218
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4219
# following code can be deleted when it's sufficiently deployed
4220
# -- vila/mgz 20100514
4221
if (sys.platform == "win32"
4222
and getattr(sys.stdout, 'fileno', None) is not None):
3590
4224
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4227
from .tests import SubUnitBzrRunnerv2
4229
raise errors.BzrCommandError(gettext(
4230
"subunit not available. subunit "
4231
"needs to be installed to use --subunit2."))
4232
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3592
4235
self.additional_selftest_args.setdefault(
3593
4236
'suite_decorators', []).append(parallel)
3595
test_suite_factory = benchmarks.test_suite
3596
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
verbose = not is_quiet()
3598
# TODO: should possibly lock the history file...
3599
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
4238
raise errors.BzrCommandError(gettext(
4239
"--benchmark is no longer supported from brz 2.2; "
4240
"use bzr-usertest instead"))
4241
test_suite_factory = None
4243
exclude_pattern = None
3602
test_suite_factory = None
4245
exclude_pattern = '(' + '|'.join(exclude) + ')'
4247
self._disable_fsync()
3604
4248
selftest_kwargs = {"verbose": verbose,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
4250
"stop_on_failure": one,
4251
"transport": transport,
4252
"test_suite_factory": test_suite_factory,
4253
"lsprof_timed": lsprof_timed,
4254
"lsprof_tests": lsprof_tests,
4255
"matching_tests_first": first,
4256
"list_only": list_only,
4257
"random_seed": randomize,
4258
"exclude_pattern": exclude_pattern,
4260
"load_list": load_list,
4261
"debug_flags": debugflag,
4262
"starting_with": starting_with
3621
4264
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
4266
# Make deprecation warnings visible, unless -Werror is set
4267
cleanup = symbol_versioning.activate_deprecation_warnings(
4270
result = tests.selftest(**selftest_kwargs)
3623
4273
return int(not result)
4275
def _disable_fsync(self):
4276
"""Change the 'os' functionality to not synchronize."""
4277
self._orig_fsync = getattr(os, 'fsync', None)
4278
if self._orig_fsync is not None:
4279
os.fsync = lambda filedes: None
4280
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4281
if self._orig_fdatasync is not None:
4282
os.fdatasync = lambda filedes: None
3626
4285
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
4286
__doc__ = """Show version of brz."""
3629
4288
encoding_type = 'replace'
3630
4289
takes_options = [
3680
4340
The source of the merge can be specified either in the form of a branch,
3681
4341
or in the form of a path to a file containing a merge directive generated
3682
with bzr send. If neither is specified, the default is the upstream branch
3683
or the branch most recently merged using --remember.
3685
When merging a branch, by default the tip will be merged. To pick a different
3686
revision, pass --revision. If you specify two values, the first will be used as
3687
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3688
available revisions, like this is commonly referred to as "cherrypicking".
3690
Revision numbers are always relative to the branch being merged.
3692
By default, bzr will try to merge in all new work from the other
3693
branch, automatically determining an appropriate base. If this
3694
fails, you may need to give an explicit base.
4342
with brz send. If neither is specified, the default is the upstream branch
4343
or the branch most recently merged using --remember. The source of the
4344
merge may also be specified in the form of a path to a file in another
4345
branch: in this case, only the modifications to that file are merged into
4346
the current working tree.
4348
When merging from a branch, by default brz will try to merge in all new
4349
work from the other branch, automatically determining an appropriate base
4350
revision. If this fails, you may need to give an explicit base.
4352
To pick a different ending revision, pass "--revision OTHER". brz will
4353
try to merge in all new work up to and including revision OTHER.
4355
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4356
through OTHER, excluding BASE but including OTHER, will be merged. If this
4357
causes some revisions to be skipped, i.e. if the destination branch does
4358
not already contain revision BASE, such a merge is commonly referred to as
4359
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4360
cherrypicks. The changes look like a normal commit, and the history of the
4361
changes from the other branch is not stored in the commit.
4363
Revision numbers are always relative to the source branch.
3696
4365
Merge will do its best to combine the changes in two branches, but there
3697
4366
are some kinds of problems only a human can fix. When it encounters those,
3698
4367
it will mark a conflict. A conflict means that you need to fix something,
3699
before you should commit.
3701
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3703
If there is no default branch set, the first merge will set it. After
3704
that, you can omit the branch to use the default. To change the
3705
default, use --remember. The value will only be saved if the remote
3706
location can be accessed.
4368
before you can commit.
4370
Use brz resolve when you have fixed a problem. See also brz conflicts.
4372
If there is no default branch set, the first merge will set it (use
4373
--no-remember to avoid setting it). After that, you can omit the branch
4374
to use the default. To change the default, use --remember. The value will
4375
only be saved if the remote location can be accessed.
3708
4377
The results of the merge are placed into the destination working
3709
directory, where they can be reviewed (with bzr diff), tested, and then
4378
directory, where they can be reviewed (with brz diff), tested, and then
3710
4379
committed to record the result of the merge.
3712
4381
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
4382
--force is given. If --force is given, then the changes from the source
4383
will be merged with the current working tree, including any uncommitted
4384
changes in the tree. The --force option can also be used to create a
3714
4385
merge revision which has more than two parents.
3716
4387
If one would like to merge changes from the working tree of the other
3812
4480
if location is not None:
3814
4482
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
4483
possible_transports=possible_transports)
3816
4484
except errors.NotABundle:
3817
4485
mergeable = None
3819
4487
if uncommitted:
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
4488
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4489
' with bundles or merge directives.'))
3823
4491
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
4492
raise errors.BzrCommandError(gettext(
4493
'Cannot use -r with merge directives or bundles'))
3826
4494
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3829
4497
if merger is None and uncommitted:
3830
4498
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
4499
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4500
' --revision at the same time.'))
3833
4501
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
4502
allow_pending = False
3836
4504
if merger is None:
3837
4505
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
4506
location, revision, remember, possible_transports, None)
3840
4508
merger.merge_type = merge_type
3841
4509
merger.reprocess = reprocess
3842
4510
merger.show_base = show_base
3843
4511
self.sanity_check_merger(merger)
3844
4512
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
4513
merger.other_rev_id is not None):
4514
# check if location is a nonexistent file (and not a branch) to
4515
# disambiguate the 'Nothing to do'
4516
if merger.interesting_files:
4517
if not merger.other_tree.has_filename(
4518
merger.interesting_files[0]):
4519
note(gettext("merger: ") + str(merger))
4520
raise errors.PathsDoNotExist([location])
4521
note(gettext('Nothing to do.'))
4523
if pull and not preview:
3849
4524
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
4525
raise errors.BzrCommandError(
4526
gettext('Cannot pull individual files'))
3851
4527
if (merger.base_rev_id == tree.last_revision()):
3852
4528
result = tree.pull(merger.other_branch, False,
3853
4529
merger.other_rev_id)
3854
4530
result.report(self.outf)
3856
4532
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
4533
raise errors.BzrCommandError(gettext(
3858
4534
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
4535
" (perhaps you would prefer 'brz pull')"))
3861
4537
return self._do_preview(merger)
3862
4538
elif interactive:
3920
4598
# Use reprocess if the merger supports it
3921
4599
merger.reprocess = merger.merge_type.supports_reprocess
3922
4600
if merger.reprocess and not merger.merge_type.supports_reprocess:
3923
raise errors.BzrCommandError("Conflict reduction is not supported"
3924
" for merge type %s." %
4601
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4602
" for merge type %s.") %
3925
4603
merger.merge_type)
3926
4604
if merger.reprocess and merger.show_base:
3927
raise errors.BzrCommandError("Cannot do conflict reduction and"
4605
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4608
if (merger.merge_type.requires_file_merge_plan and
4609
(not getattr(merger.this_tree, 'plan_file_merge', None) or
4610
not getattr(merger.other_tree, 'plan_file_merge', None) or
4611
(merger.base_tree is not None and
4612
not getattr(merger.base_tree, 'plan_file_merge', None)))):
4613
raise errors.BzrCommandError(
4614
gettext('Plan file merge unsupported: '
4615
'Merge type incompatible with tree formats.'))
3930
4617
def _get_merger_from_branch(self, tree, location, revision, remember,
3931
4618
possible_transports, pb):
3932
4619
"""Produce a merger from a location, assuming it refers to a branch."""
3933
from bzrlib.tag import _merge_tags_if_possible
3934
4620
# find the branch locations
3935
4621
other_loc, user_location = self._select_branch_location(tree, location,
3937
4623
if revision is not None and len(revision) == 2:
3938
4624
base_loc, _unused = self._select_branch_location(tree,
3939
location, revision, 0)
4625
location, revision, 0)
3941
4627
base_loc = other_loc
3942
4628
# Open the branches
3943
4629
other_branch, other_path = Branch.open_containing(other_loc,
3944
possible_transports)
4630
possible_transports)
3945
4631
if base_loc == other_loc:
3946
4632
base_branch = other_branch
3948
4634
base_branch, base_path = Branch.open_containing(base_loc,
3949
possible_transports)
4635
possible_transports)
3950
4636
# Find the revision ids
3951
4637
other_revision_id = None
3952
4638
base_revision_id = None
4049
4744
Re-do the merge of all conflicted files, and show the base text in
4050
4745
conflict regions, in addition to the usual THIS and OTHER texts::
4052
bzr remerge --show-base
4747
brz remerge --show-base
4054
4749
Re-do the merge of "foobar", using the weave merge algorithm, with
4055
4750
additional processing to reduce the size of conflict regions::
4057
bzr remerge --merge-type weave --reprocess foobar
4752
brz remerge --merge-type weave --reprocess foobar
4059
4754
takes_args = ['file*']
4060
4755
takes_options = [
4064
help="Show base revision text in conflicts."),
4759
help="Show base revision text in conflicts."),
4067
4762
def run(self, file_list=None, merge_type=None, show_base=False,
4068
4763
reprocess=False):
4069
from bzrlib.conflicts import restore
4764
from .conflicts import restore
4070
4765
if merge_type is None:
4071
4766
merge_type = _mod_merge.Merge3Merger
4072
tree, file_list = tree_files(file_list)
4767
tree, file_list = WorkingTree.open_containing_paths(file_list)
4073
4768
self.add_cleanup(tree.lock_write().unlock)
4074
4769
parents = tree.get_parent_ids()
4075
4770
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4079
repository = tree.branch.repository
4080
interesting_ids = None
4771
raise errors.BzrCommandError(
4772
gettext("Sorry, remerge only works after normal"
4773
" merges. Not cherrypicking or multi-merges."))
4774
interesting_files = None
4081
4775
new_conflicts = []
4082
4776
conflicts = tree.conflicts()
4083
4777
if file_list is not None:
4084
interesting_ids = set()
4778
interesting_files = set()
4085
4779
for filename in file_list:
4086
file_id = tree.path2id(filename)
4780
if not tree.is_versioned(filename):
4088
4781
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4782
interesting_files.add(filename)
4783
if tree.kind(filename) != "directory":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4786
for path, ie in tree.iter_entries_by_dir(
4787
specific_files=[filename]):
4788
interesting_files.add(path)
4095
4789
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
4791
# Remerge only supports resolving contents conflicts
4098
4792
allowed_conflicts = ('text conflict', 'contents conflict')
4099
4793
restore_files = [c.path for c in conflicts
4100
4794
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4795
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4102
4796
tree.set_conflicts(ConflictList(new_conflicts))
4103
4797
if file_list is not None:
4104
4798
restore_files = file_list
4131
4825
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4827
Set files in the working tree back to the contents of a previous revision.
4134
4829
Giving a list of files will revert only those files. Otherwise, all files
4135
4830
will be reverted. If the revision is not specified with '--revision', the
4136
last committed revision is used.
4831
working tree basis revision is used. A revert operation affects only the
4832
working tree, not any revision history like the branch and repository or
4833
the working tree basis revision.
4138
4835
To remove only some changes, without reverting to a prior version, use
4139
merge instead. For example, "merge . --revision -2..-3" will remove the
4140
changes introduced by -2, without affecting the changes introduced by -1.
4141
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4836
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4837
will remove the changes introduced by the second last commit (-2), without
4838
affecting the changes introduced by the last commit (-1). To remove
4839
certain changes on a hunk-by-hunk basis, see the shelve command.
4840
To update the branch to a specific revision or the latest revision and
4841
update the working tree accordingly while preserving local changes, see the
4143
By default, any files that have been manually changed will be backed up
4144
first. (Files changed only by merge are not backed up.) Backup files have
4145
'.~#~' appended to their name, where # is a number.
4844
Uncommitted changes to files that are reverted will be discarded.
4845
Howver, by default, any files that have been manually changed will be
4846
backed up first. (Files changed only by merge are not backed up.) Backup
4847
files have '.~#~' appended to their name, where # is a number.
4147
4849
When you provide files, you can use their current pathname or the pathname
4148
4850
from the target revision. So you can use revert to "undelete" a file by
4542
5249
Option('long', help='Show commit date in annotations.'),
4546
5254
encoding_type = 'exact'
4548
5256
@display_command
4549
5257
def run(self, filename, all=False, long=False, revision=None,
4551
from bzrlib.annotate import annotate_file, annotate_file_tree
5258
show_ids=False, directory=None):
5259
from .annotate import (
4552
5262
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5263
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
5264
if wt is not None:
4555
5265
self.add_cleanup(wt.lock_read().unlock)
4557
5267
self.add_cleanup(branch.lock_read().unlock)
4558
5268
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
5269
self.add_cleanup(tree.lock_read().unlock)
5270
if wt is not None and revision is None:
4561
5271
file_id = wt.path2id(relpath)
4563
5273
file_id = tree.path2id(relpath)
4564
5274
if file_id is None:
4565
5275
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
5276
if wt is not None and revision is None:
4568
5277
# If there is a tree and we're not annotating historical
4569
5278
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
5279
annotate_file_tree(wt, relpath, self.outf, long, all,
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
5282
annotate_file_tree(tree, relpath, self.outf, long, all,
5283
show_ids=show_ids, branch=branch)
4577
5286
class cmd_re_sign(Command):
4578
5287
__doc__ = """Create a digital signature for an existing revision."""
4579
5288
# TODO be able to replace existing ones.
4581
hidden = True # is this right ?
5290
hidden = True # is this right ?
4582
5291
takes_args = ['revision_id*']
4583
takes_options = ['revision']
5292
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
5294
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
5295
if revision_id_list is not None and revision is not None:
4587
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5296
raise errors.BzrCommandError(
5297
gettext('You can only supply one of revision_id or --revision'))
4588
5298
if revision_id_list is None and revision is None:
4589
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
5299
raise errors.BzrCommandError(
5300
gettext('You must supply either --revision or a revision_id'))
5301
b = WorkingTree.open_containing(directory)[0].branch
4591
5302
self.add_cleanup(b.lock_write().unlock)
4592
5303
return self._run(b, revision_id_list, revision)
4594
5305
def _run(self, b, revision_id_list, revision):
4595
import bzrlib.gpg as gpg
4596
gpg_strategy = gpg.GPGStrategy(b.get_config())
5306
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4597
5307
if revision_id_list is not None:
4598
5308
b.repository.start_write_group()
4600
5310
for revision_id in revision_id_list:
5311
revision_id = cache_utf8.encode(revision_id)
4601
5312
b.repository.sign_revision(revision_id, gpg_strategy)
5313
except BaseException:
4603
5314
b.repository.abort_write_group()
4785
5505
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
5508
self.outf.write(gettext('Dry-run, pretending to remove'
5509
' the above revisions.\n'))
4791
self.outf.write('The above revision(s) will be removed.\n')
5512
gettext('The above revision(s) will be removed.\n'))
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
5515
if not ui.ui_factory.confirm_action(
5516
gettext(u'Uncommit these revisions'),
5517
'breezy.builtins.uncommit',
5519
self.outf.write(gettext('Canceled\n'))
4798
5522
mutter('Uncommitting from {%s} to {%s}',
4799
5523
last_rev_id, rev_id)
4800
5524
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
5525
revno=revno, local=local, keep_tags=keep_tags)
5527
gettext('You can restore the old tip by running:\n'
5528
' brz pull . -r revid:%s\n')
5529
% last_rev_id.decode('utf-8'))
4806
5532
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
5533
__doc__ = """Break a dead lock.
5535
This command breaks a lock on a repository, branch, working directory or
4809
5538
CAUTION: Locks should only be broken when you are sure that the process
4810
5539
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
5541
You can get information on what locks are open via the 'brz info
4813
5542
[location]' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
5546
brz break-lock brz+ssh://example.com/brz/foo
5547
brz break-lock --conf ~/.bazaar
4819
5550
takes_args = ['location?']
5553
help='LOCATION is the directory where the config lock is.'),
5555
help='Do not ask for confirmation before breaking the lock.'),
4821
def run(self, location=None, show=False):
5558
def run(self, location=None, config=False, force=False):
4822
5559
if location is None:
4823
5560
location = u'.'
4824
control, relpath = bzrdir.BzrDir.open_containing(location)
4826
control.break_lock()
4827
except NotImplementedError:
5562
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5564
{'breezy.lockdir.break': True})
5566
conf = _mod_config.LockableConfig(file_name=location)
5569
control, relpath = controldir.ControlDir.open_containing(location)
5571
control.break_lock()
5572
except NotImplementedError:
4831
5576
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5577
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4834
5579
This just prints a line to signal when it is ready, then blocks on stdin.
4852
5597
help='Serve on stdin/out for use from inetd or sshd.'),
4853
5598
RegistryOption('protocol',
4854
help="Protocol to serve.",
4855
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4856
value_switches=True),
5599
help="Protocol to serve.",
5600
lazy_registry=('breezy.transport',
5601
'transport_server_registry'),
5602
value_switches=True),
5604
help='Listen for connections on nominated address.',
4858
help='Listen for connections on nominated port of the form '
4859
'[hostname:]portnumber. Passing 0 as the port number will '
4860
'result in a dynamically allocated port. The default port '
4861
'depends on the protocol.',
4864
help='Serve contents of this directory.',
5607
help='Listen for connections on nominated port. Passing 0 as '
5608
'the port number will result in a dynamically allocated '
5609
'port. The default port depends on the protocol.',
5611
custom_help('directory',
5612
help='Serve contents of this directory.'),
4866
5613
Option('allow-writes',
4867
5614
help='By default the server is a readonly server. Supplying '
4868
5615
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
5616
'the served directory and below. Note that ``brz serve`` '
4870
5617
'does not perform authentication, so unless some form of '
4871
5618
'external authentication is arranged supplying this '
4872
5619
'option leads to global uncontrolled write access to your '
5622
Option('client-timeout', type=float,
5623
help='Override the default idle client timeout (5min).'),
4877
def get_host_and_port(self, port):
4878
"""Return the host and port to run the smart server on.
4880
If 'port' is None, None will be returned for the host and port.
4882
If 'port' has a colon in it, the string before the colon will be
4883
interpreted as the host.
4885
:param port: A string of the port to run the server on.
4886
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
and port is an integer TCP/IP port.
4890
if port is not None:
4892
host, port = port.split(':')
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4898
from bzrlib.transport import get_transport, transport_server_registry
5626
def run(self, listen=None, port=None, inet=False, directory=None,
5627
allow_writes=False, protocol=None, client_timeout=None):
5628
from . import transport
4899
5629
if directory is None:
4900
directory = os.getcwd()
5630
directory = osutils.getcwd()
4901
5631
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
url = urlutils.local_path_to_url(directory)
5632
protocol = transport.transport_server_registry.get()
5633
url = transport.location_to_url(directory)
4905
5634
if not allow_writes:
4906
5635
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
5636
t = transport.get_transport_from_url(url)
5637
protocol(t, listen, port, inet, client_timeout)
4911
5640
class cmd_join(Command):
5013
5744
diff='Normal unified diff.',
5014
5745
plain='No patch, just directive.'),
5015
5746
Option('sign', help='GPG-sign the directive.'), 'revision',
5016
Option('mail-to', type=str,
5017
help='Instead of printing the directive, email to this address.'),
5018
Option('message', type=str, short_name='m',
5019
help='Message to use when committing this merge.')
5747
Option('mail-to', type=text_type,
5748
help='Instead of printing the directive, email to this '
5750
Option('message', type=text_type, short_name='m',
5751
help='Message to use when committing this merge.')
5022
5754
encoding_type = 'exact'
5024
5756
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5025
sign=False, revision=None, mail_to=None, message=None):
5026
from bzrlib.revision import ensure_null, NULL_REVISION
5757
sign=False, revision=None, mail_to=None, message=None,
5759
from .revision import ensure_null, NULL_REVISION
5027
5760
include_patch, include_bundle = {
5028
5761
'plain': (False, False),
5029
5762
'diff': (True, False),
5030
5763
'bundle': (True, True),
5032
branch = Branch.open('.')
5765
branch = Branch.open(directory)
5033
5766
stored_submit_branch = branch.get_submit_branch()
5034
5767
if submit_branch is None:
5035
5768
submit_branch = stored_submit_branch
5120
5862
given, in which case it is sent to a file.
5122
5864
Mail is sent using your preferred mail program. This should be transparent
5123
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5865
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5124
5866
If the preferred client can't be found (or used), your editor will be used.
5126
5868
To use a specific mail program, set the mail_client configuration option.
5127
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5128
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5129
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5130
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5869
Supported values for specific clients are "claws", "evolution", "kmail",
5870
"mail.app" (MacOS X's Mail.app), "mutt", and "thunderbird"; generic options
5871
are "default", "editor", "emacsclient", "mapi", and "xdg-email". Plugins
5872
may also add supported clients.
5133
5874
If mail is being sent, a to address is required. This can be supplied
5134
5875
either on the commandline, by setting the submit_to configuration
5135
5876
option in the branch itself or the child_submit_to configuration option
5136
5877
in the submit branch.
5138
Two formats are currently supported: "4" uses revision bundle format 4 and
5139
merge directive format 2. It is significantly faster and smaller than
5140
older formats. It is compatible with Bazaar 0.19 and later. It is the
5141
default. "0.9" uses revision bundle format 0.9 and merge directive
5142
format 1. It is compatible with Bazaar 0.12 - 0.18.
5144
The merge directives created by bzr send may be applied using bzr merge or
5145
bzr pull by specifying a file containing a merge directive as the location.
5147
bzr send makes extensive use of public locations to map local locations into
5148
URLs that can be used by other people. See `bzr help configuration` to
5149
set them, and use `bzr info` to display them.
5879
The merge directives created by brz send may be applied using brz merge or
5880
brz pull by specifying a file containing a merge directive as the location.
5882
brz send makes extensive use of public locations to map local locations into
5883
URLs that can be used by other people. See `brz help configuration` to
5884
set them, and use `brz info` to display them.
5152
5887
encoding_type = 'exact'
5166
5901
help='Branch to generate the submission from, '
5167
5902
'rather than the one containing the working directory.',
5168
5903
short_name='f',
5170
5905
Option('output', short_name='o',
5171
5906
help='Write merge directive to this file or directory; '
5172
5907
'use - for stdout.',
5174
5909
Option('strict',
5175
5910
help='Refuse to send if there are uncommitted changes in'
5176
5911
' the working tree, --no-strict disables the check.'),
5177
5912
Option('mail-to', help='Mail the request to this address.',
5181
Option('body', help='Body for the email.', type=unicode),
5916
Option('body', help='Body for the email.', type=text_type),
5182
5917
RegistryOption('format',
5183
5918
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
5919
lazy_registry=('breezy.send', 'format_registry')),
5187
5922
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
no_patch=False, revision=None, remember=False, output=None,
5923
no_patch=False, revision=None, remember=None, output=None,
5189
5924
format=None, mail_to=None, message=None, body=None,
5190
5925
strict=None, **kwargs):
5191
from bzrlib.send import send
5926
from .send import send
5192
5927
return send(submit_branch, revision, public_branch, remember,
5193
5928
format, no_bundle, no_patch, output,
5194
5929
kwargs.get('from', '.'), mail_to, message, body,
5350
6087
_see_also = ['tag']
5351
6088
takes_options = [
5353
help='Branch whose tags should be displayed.',
5357
RegistryOption.from_kwargs('sort',
5358
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
6089
custom_help('directory',
6090
help='Branch whose tags should be displayed.'),
6091
RegistryOption('sort',
6092
'Sort tags by different criteria.', title='Sorting',
6093
lazy_registry=('breezy.tag', 'tag_sort_methods')
5366
6099
@display_command
6100
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6101
from .tag import tag_sort_methods
5373
6102
branch, relpath = Branch.open_containing(directory)
5375
tags = branch.tags.get_tag_dict().items()
6104
tags = list(viewitems(branch.tags.get_tag_dict()))
5379
6108
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
6110
# Restrict to the specified range
6111
tags = self._tags_for_range(branch, revision)
6113
sort = tag_sort_methods.get()
5400
6115
if not show_ids:
5401
6116
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
6117
for index, (tag, revid) in enumerate(tags):
5404
6119
revno = branch.revision_id_to_dotted_revno(revid)
5405
6120
if isinstance(revno, tuple):
5406
6121
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
6122
except (errors.NoSuchRevision,
6123
errors.GhostRevisionsHaveNoRevno,
6124
errors.UnsupportedOperation):
5408
6125
# Bad tag data/merges can lead to tagged revisions
5409
6126
# which are not in this branch. Fail gracefully ...
5411
6128
tags[index] = (tag, revno)
6130
tags = [(tag, revid.decode('utf-8')) for (tag, revid) in tags]
5412
6131
self.cleanup_now()
5413
6132
for tag, revspec in tags:
5414
6133
self.outf.write('%-20s %s\n' % (tag, revspec))
6135
def _tags_for_range(self, branch, revision):
6136
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6137
revid1, revid2 = rev1.rev_id, rev2.rev_id
6138
# _get_revision_range will always set revid2 if it's not specified.
6139
# If revid1 is None, it means we want to start from the branch
6140
# origin which is always a valid ancestor. If revid1 == revid2, the
6141
# ancestry check is useless.
6142
if revid1 and revid1 != revid2:
6143
# FIXME: We really want to use the same graph than
6144
# branch.iter_merge_sorted_revisions below, but this is not
6145
# easily available -- vila 2011-09-23
6146
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6147
# We don't want to output anything in this case...
6149
# only show revisions between revid1 and revid2 (inclusive)
6150
tagged_revids = branch.tags.get_reverse_tag_dict()
6152
for r in branch.iter_merge_sorted_revisions(
6153
start_revision_id=revid2, stop_revision_id=revid1,
6154
stop_rule='include'):
6155
revid_tags = tagged_revids.get(r[0], None)
6157
found.extend([(tag, r[0]) for tag in revid_tags])
5417
6161
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
6162
__doc__ = """Reconfigure the type of a brz directory.
5420
6164
A target configuration must be specified.
5432
6176
takes_args = ['location?']
5433
6177
takes_options = [
5434
6178
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
6181
help='The relation between branch and tree.',
5438
6182
value_switches=True, enum_switch=False,
5439
6183
branch='Reconfigure to be an unbound branch with no working tree.',
5440
6184
tree='Reconfigure to be an unbound branch with a working tree.',
5441
6185
checkout='Reconfigure to be a bound branch with a working tree.',
5442
6186
lightweight_checkout='Reconfigure to be a lightweight'
5443
' checkout (with no local history).',
6187
' checkout (with no local history).',
6189
RegistryOption.from_kwargs(
6191
title='Repository type',
6192
help='Location fo the repository.',
6193
value_switches=True, enum_switch=False,
5444
6194
standalone='Reconfigure to be a standalone branch '
5445
'(i.e. stop using shared repository).',
6195
'(i.e. stop using shared repository).',
5446
6196
use_shared='Reconfigure to use a shared repository.',
6198
RegistryOption.from_kwargs(
6200
title='Trees in Repository',
6201
help='Whether new branches in the repository have trees.',
6202
value_switches=True, enum_switch=False,
5447
6203
with_trees='Reconfigure repository to create '
5448
'working trees on branches by default.',
6204
'working trees on branches by default.',
5449
6205
with_no_trees='Reconfigure repository to not create '
5450
'working trees on branches by default.'
6206
'working trees on branches by default.'
5452
Option('bind-to', help='Branch to bind checkout to.', type=str),
6208
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5453
6209
Option('force',
5454
help='Perform reconfiguration even if local changes'
6210
help='Perform reconfiguration even if local changes'
5456
6212
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
6213
help='Reconfigure a branch to be stacked on another branch.',
5460
6216
Option('unstacked',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
6217
help='Reconfigure a branch to be unstacked. This '
6218
'may require copying substantial data into it.',
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5469
directory = bzrdir.BzrDir.open(location)
6222
def run(self, location=None, bind_to=None, force=False,
6223
tree_type=None, repository_type=None, repository_trees=None,
6224
stacked_on=None, unstacked=None):
6225
directory = controldir.ControlDir.open(location)
5470
6226
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6227
raise errors.BzrCommandError(
6228
gettext("Can't use both --stacked-on and --unstacked"))
5472
6229
elif stacked_on is not None:
5473
6230
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5474
6231
elif unstacked:
5476
6233
# At the moment you can use --stacked-on and a different
5477
6234
# reconfiguration shape at the same time; there seems no good reason
5479
if target_type is None:
6236
if (tree_type is None and
6237
repository_type is None and
6238
repository_trees is None):
5480
6239
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5485
elif target_type == 'branch':
6242
raise errors.BzrCommandError(gettext('No target configuration '
6244
reconfiguration = None
6245
if tree_type == 'branch':
5486
6246
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
elif target_type == 'tree':
6247
elif tree_type == 'tree':
5488
6248
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
elif target_type == 'checkout':
6249
elif tree_type == 'checkout':
5490
6250
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
6251
directory, bind_to)
5492
elif target_type == 'lightweight-checkout':
6252
elif tree_type == 'lightweight-checkout':
5493
6253
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
6254
directory, bind_to)
5495
elif target_type == 'use-shared':
6256
reconfiguration.apply(force)
6257
reconfiguration = None
6258
if repository_type == 'use-shared':
5496
6259
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
elif target_type == 'standalone':
6260
elif repository_type == 'standalone':
5498
6261
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
6263
reconfiguration.apply(force)
6264
reconfiguration = None
6265
if repository_trees == 'with-trees':
5500
6266
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
6267
directory, True)
5502
elif target_type == 'with-no-trees':
6268
elif repository_trees == 'with-no-trees':
5503
6269
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
6270
directory, False)
5505
reconfiguration.apply(force)
6272
reconfiguration.apply(force)
6273
reconfiguration = None
5508
6276
class cmd_switch(Command):
5531
6299
takes_args = ['to_location?']
5532
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
6300
takes_options = ['directory',
6302
help='Switch even if local commits will be lost.'),
5535
6304
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
6305
help='Create the target branch from this one before'
6306
' switching to it.'),
6308
help='Store and restore uncommitted changes in the'
5540
6312
def run(self, to_location=None, force=False, create_branch=False,
5542
from bzrlib import switch
6313
revision=None, directory=u'.', store=False):
6314
from . import switch
6315
tree_location = directory
5544
6316
revision = _get_one_revision('switch', revision)
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6317
possible_transports = []
6318
control_dir = controldir.ControlDir.open_containing(tree_location,
6319
possible_transports=possible_transports)[0]
5546
6320
if to_location is None:
5547
6321
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
6322
raise errors.BzrCommandError(gettext('You must supply either a'
6323
' revision or a location'))
6324
to_location = tree_location
5552
branch = control_dir.open_branch()
6326
branch = control_dir.open_branch(
6327
possible_transports=possible_transports)
5553
6328
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
6329
except errors.NotBranchError:
5556
6331
had_explicit_nick = False
5557
6332
if create_branch:
5558
6333
if branch is None:
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
6334
raise errors.BzrCommandError(
6335
gettext('cannot create branch without source branch'))
6336
to_location = lookup_new_sibling_branch(
6337
control_dir, to_location,
6338
possible_transports=possible_transports)
6339
if revision is not None:
6340
revision = revision.as_revision_id(branch)
6341
to_branch = branch.controldir.sprout(
6343
possible_transports=possible_transports,
6344
revision_id=revision,
6345
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
6348
to_branch = Branch.open(to_location,
6349
possible_transports=possible_transports)
5573
6350
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
6351
to_branch = open_sibling_branch(
6352
control_dir, to_location,
6353
possible_transports=possible_transports)
6354
if revision is not None:
6355
revision = revision.as_revision_id(to_branch)
6357
switch.switch(control_dir, to_branch, force, revision_id=revision,
6358
store_uncommitted=store)
6359
except controldir.BranchReferenceLoop:
6360
raise errors.BzrCommandError(
6361
gettext('switching would create a branch reference loop. '
6362
'Use the "bzr up" command to switch to a '
6363
'different revision.'))
5580
6364
if had_explicit_nick:
5581
branch = control_dir.open_branch() #get the new branch!
6365
branch = control_dir.open_branch() # get the new branch!
5582
6366
branch.nick = to_branch.nick
5583
note('Switched to branch: %s',
5584
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
6367
note(gettext('Switched to branch: %s'),
6368
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5604
6371
class cmd_view(Command):
5691
tree, file_list = tree_files(file_list, apply_view=False)
6458
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
6460
current_view, view_dict = tree.views.get_view_info()
5693
6461
if name is None:
5694
6462
name = current_view
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
6465
raise errors.BzrCommandError(gettext(
6466
"Both --delete and a file list specified"))
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
6468
raise errors.BzrCommandError(gettext(
6469
"Both --delete and --switch specified"))
5703
6471
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
6472
self.outf.write(gettext("Deleted all views.\n"))
5705
6473
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
6474
raise errors.BzrCommandError(
6475
gettext("No current view to delete"))
5708
6477
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
6478
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
6481
raise errors.BzrCommandError(gettext(
6482
"Both --switch and a file list specified"))
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
6484
raise errors.BzrCommandError(gettext(
6485
"Both --switch and --all specified"))
5717
6486
elif switch == 'off':
5718
6487
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
6488
raise errors.BzrCommandError(
6489
gettext("No current view to disable"))
5720
6490
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
6491
self.outf.write(gettext("Disabled '%s' view.\n") %
5723
6494
tree.views.set_view_info(switch, view_dict)
5724
6495
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6497
gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5728
self.outf.write('Views defined:\n')
6500
self.outf.write(gettext('Views defined:\n'))
5729
6501
for view in sorted(view_dict):
5730
6502
if view == current_view:
5824
6608
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6609
restore the most recently shelved changes.
6611
For complicated changes, it is possible to edit the changes in a separate
6612
editor program to decide what the file remaining in the working copy
6613
should look like. To do this, add the configuration option
6615
change_editor = PROGRAM @new_path @old_path
6617
where @new_path is replaced with the path of the new version of the
6618
file and @old_path is replaced with the path of the old version of
6619
the file. The PROGRAM should save the new file with the desired
6620
contents of the file in the working tree.
5828
6624
takes_args = ['file*']
5830
6626
takes_options = [
5832
6629
Option('all', help='Shelve all changes.'),
5834
6631
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
6632
breezy.option.diff_writer_registry,
5836
6633
value_switches=True, enum_switch=False),
5838
6635
Option('list', help='List shelved changes.'),
5839
6636
Option('destroy',
5840
6637
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6639
_see_also = ['unshelve', 'configuration']
5844
6641
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6642
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
6644
return self.run_for_list(directory=directory)
6645
from .shelf_ui import Shelver
5849
6646
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
6647
writer = breezy.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6649
shelver = Shelver.from_args(writer(self.outf), revision, all,
6650
file_list, message, destroy=destroy, directory=directory)
5922
6722
To check what clean-tree will do, use --dry-run.
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
Option('detritus', help='Delete conflict files, merge'
6724
takes_options = ['directory',
6725
Option('ignored', help='Delete all ignored files.'),
6726
Option('detritus', help='Delete conflict files, merge and revert'
5926
6727
' backups, and failed selftest dirs.'),
5927
6728
Option('unknown',
5928
help='Delete files unknown to bzr (default).'),
6729
help='Delete files unknown to brz (default).'),
5929
6730
Option('dry-run', help='Show files to delete instead of'
5930
6731
' deleting them.'),
5931
6732
Option('force', help='Do not prompt before deleting.')]
5932
6734
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
from bzrlib.clean_tree import clean_tree
6735
force=False, directory=u'.'):
6736
from .clean_tree import clean_tree
5935
6737
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
6741
clean_tree(directory, unknown=unknown, ignored=ignored,
6742
detritus=detritus, dry_run=dry_run, no_prompt=force)
5943
6745
class cmd_reference(Command):
5953
6755
takes_args = ['path?', 'location?']
6757
Option('force-unversioned',
6758
help='Set reference even if path is not versioned.'),
5955
def run(self, path=None, location=None):
6761
def run(self, path=None, location=None, force_unversioned=False):
5956
6762
branchdir = '.'
5957
6763
if path is not None:
5958
6764
branchdir = path
5959
tree, branch, relpath =(
5960
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6765
tree, branch, relpath = (
6766
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
5961
6767
if path is not None:
5963
6769
if tree is None:
5964
6770
tree = branch.basis_tree()
5965
6771
if path is None:
5966
info = branch._get_all_reference_info().iteritems()
6772
info = viewitems(branch._get_all_reference_info())
5967
6773
self._display_reference_info(tree, branch, info)
5969
file_id = tree.path2id(path)
6775
if not tree.is_versioned(path) and not force_unversioned:
5971
6776
raise errors.NotVersionedError(path)
5972
6777
if location is None:
5973
info = [(file_id, branch.get_reference_info(file_id))]
6778
info = [(path, branch.get_reference_info(path))]
5974
6779
self._display_reference_info(tree, branch, info)
5976
branch.set_reference_info(file_id, path, location)
6781
branch.set_reference_info(
6782
path, location, file_id=tree.path2id(path))
5978
6784
def _display_reference_info(self, tree, branch, info):
5980
for file_id, (path, location) in info:
5982
path = tree.id2path(file_id)
5983
except errors.NoSuchId:
6786
for path, (location, file_id) in info:
5985
6787
ref_list.append((path, location))
5986
6788
for path, location in sorted(ref_list):
5987
6789
self.outf.write('%s %s\n' % (path, location))
6792
class cmd_export_pot(Command):
6793
__doc__ = """Export command helps and error messages in po format."""
6796
takes_options = [Option('plugin',
6797
help='Export help text from named command '
6798
'(defaults to all built in commands).',
6800
Option('include-duplicates',
6801
help='Output multiple copies of the same msgid '
6802
'string if it appears more than once.'),
6805
def run(self, plugin=None, include_duplicates=False):
6806
from .export_pot import export_pot
6807
export_pot(self.outf, plugin, include_duplicates)
6810
class cmd_import(Command):
6811
__doc__ = """Import sources from a directory, tarball or zip file
6813
This command will import a directory, tarball or zip file into a bzr
6814
tree, replacing any versioned files already present. If a directory is
6815
specified, it is used as the target. If the directory does not exist, or
6816
is not versioned, it is created.
6818
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6820
If the tarball or zip has a single root directory, that directory is
6821
stripped when extracting the tarball. This is not done for directories.
6824
takes_args = ['source', 'tree?']
6826
def run(self, source, tree=None):
6827
from .upstream_import import do_import
6828
do_import(source, tree)
6831
class cmd_link_tree(Command):
6832
__doc__ = """Hardlink matching files to another tree.
6834
Only files with identical content and execute bit will be linked.
6837
takes_args = ['location']
6839
def run(self, location):
6840
from .transform import link_tree
6841
target_tree = WorkingTree.open_containing(".")[0]
6842
source_tree = WorkingTree.open(location)
6843
with target_tree.lock_write(), source_tree.lock_read():
6844
link_tree(target_tree, source_tree)
6847
class cmd_fetch_ghosts(Command):
6848
__doc__ = """Attempt to retrieve ghosts from another branch.
6850
If the other branch is not supplied, the last-pulled branch is used.
6854
aliases = ['fetch-missing']
6855
takes_args = ['branch?']
6856
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6858
def run(self, branch=None, no_fix=False):
6859
from .fetch_ghosts import GhostFetcher
6860
installed, failed = GhostFetcher.from_cmdline(branch).run()
6861
if len(installed) > 0:
6862
self.outf.write("Installed:\n")
6863
for rev in installed:
6864
self.outf.write(rev.decode('utf-8') + "\n")
6866
self.outf.write("Still missing:\n")
6868
self.outf.write(rev.decode('utf-8') + "\n")
6869
if not no_fix and len(installed) > 0:
6870
cmd_reconcile().run(".")
5990
6873
def _register_lazy_builtins():
5991
6874
# register lazy builtins from other modules; called at startup and should
5992
6875
# be only called once.
5993
6876
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6877
('cmd_bisect', [], 'breezy.bisect'),
6878
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6879
('cmd_config', [], 'breezy.config'),
6880
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
6881
('cmd_version_info', [], 'breezy.cmd_version_info'),
6882
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6883
('cmd_conflicts', [], 'breezy.conflicts'),
6884
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6885
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6886
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6887
('cmd_test_script', [], 'breezy.cmd_test_script'),
6001
6889
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
