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 (
93
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
96
def _get_branch_location(control_dir, possible_transports=None):
97
"""Return location of branch for this control dir."""
99
target = control_dir.get_branch_reference()
100
except errors.NotBranchError:
101
return control_dir.root_transport.base
102
if target is not None:
104
this_branch = control_dir.open_branch(
105
possible_transports=possible_transports)
106
# This may be a heavy checkout, where we want the master branch
107
master_location = this_branch.get_bound_location()
108
if master_location is not None:
109
return master_location
110
# If not, use a local sibling
111
return this_branch.base
114
def _is_colocated(control_dir, possible_transports=None):
115
"""Check if the branch in control_dir is colocated.
117
:param control_dir: Control directory
118
:return: Tuple with boolean indicating whether the branch is colocated
119
and the full URL to the actual branch
121
# This path is meant to be relative to the existing branch
122
this_url = _get_branch_location(control_dir,
123
possible_transports=possible_transports)
124
# Perhaps the target control dir supports colocated branches?
126
root = controldir.ControlDir.open(this_url,
127
possible_transports=possible_transports)
128
except errors.NotBranchError:
129
return (False, this_url)
132
wt = control_dir.open_workingtree()
133
except (errors.NoWorkingTree, errors.NotLocalUrl):
134
return (False, this_url)
137
root._format.colocated_branches and
138
control_dir.control_url == root.control_url,
142
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
143
"""Lookup the location for a new sibling branch.
145
:param control_dir: Control directory to find sibling branches from
146
:param location: Name of the new branch
147
:return: Full location to the new branch
149
location = directory_service.directories.dereference(location)
150
if '/' not in location and '\\' not in location:
151
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
154
return urlutils.join_segment_parameters(this_url,
155
{"branch": urlutils.escape(location)})
157
return urlutils.join(this_url, '..', urlutils.escape(location))
161
def open_sibling_branch(control_dir, location, possible_transports=None):
162
"""Open a branch, possibly a sibling of another.
164
:param control_dir: Control directory relative to which to lookup the
166
:param location: Location to look up
167
:return: branch to open
170
# Perhaps it's a colocated branch?
171
return control_dir.open_branch(location,
172
possible_transports=possible_transports)
173
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
174
this_url = _get_branch_location(control_dir)
177
this_url, '..', urlutils.escape(location)))
180
def open_nearby_branch(near=None, location=None, possible_transports=None):
181
"""Open a nearby branch.
183
:param near: Optional location of container from which to open branch
184
:param location: Location of the branch
185
:return: Branch instance
191
return Branch.open(location,
192
possible_transports=possible_transports)
193
except errors.NotBranchError:
195
cdir = controldir.ControlDir.open(near,
196
possible_transports=possible_transports)
197
return open_sibling_branch(cdir, location,
198
possible_transports=possible_transports)
201
def iter_sibling_branches(control_dir, possible_transports=None):
202
"""Iterate over the siblings of a branch.
204
:param control_dir: Control directory for which to look up the siblings
205
:return: Iterator over tuples with branch name and branch object
209
reference = control_dir.get_branch_reference()
210
except errors.NotBranchError:
211
# There is no active branch, just return the colocated branches.
212
for name, branch in viewitems(control_dir.get_branches()):
215
if reference is not None:
216
ref_branch = Branch.open(reference,
217
possible_transports=possible_transports)
220
if ref_branch is None or ref_branch.name:
221
if ref_branch is not None:
222
control_dir = ref_branch.controldir
223
for name, branch in viewitems(control_dir.get_branches()):
226
repo = ref_branch.controldir.find_repository()
227
for branch in repo.find_branches(using=True):
228
name = urlutils.relative_url(repo.user_url,
229
branch.user_url).rstrip("/")
88
233
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
298
def _get_view_info_for_change_reporter(tree):
224
299
"""Get the view information from a tree for change reporting."""
342
435
takes_args = ['revision_id?']
343
takes_options = ['revision']
436
takes_options = ['directory', 'revision']
344
437
# cat-revision is more for frontends so should be exact
345
438
encoding = 'strict'
347
440
def print_revision(self, revisions, revid):
348
441
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
442
record = next(stream)
350
443
if record.storage_kind == 'absent':
351
444
raise errors.NoSuchRevision(revisions, revid)
352
445
revtext = record.get_bytes_as('fulltext')
353
446
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
449
def run(self, revision_id=None, revision=None, directory=u'.'):
357
450
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')
451
raise errors.BzrCommandError(gettext('You can only supply one of'
452
' revision_id or --revision'))
360
453
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
454
raise errors.BzrCommandError(gettext('You must supply either'
455
' --revision or a revision_id'))
457
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
459
revisions = b.repository.revisions
366
460
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
461
raise errors.BzrCommandError(gettext('Repository %r does not support '
462
'access to raw revision texts'))
370
b.repository.lock_read()
464
with b.repository.lock_read():
372
465
# TODO: jam 20060112 should cat-revision always output utf-8?
373
466
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
467
revision_id = cache_utf8.encode(revision_id)
376
469
self.print_revision(revisions, revision_id)
377
470
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
471
msg = gettext("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):
491
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(gettext("No working tree to remove"))
500
510
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
511
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
512
" of a remote path"))
504
514
if (working.has_changes()):
505
515
raise errors.UncommittedChanges(working)
516
if working.get_shelf_manager().last_shelf() is not None:
517
raise errors.ShelvedChanges(working)
507
519
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
520
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
521
" from a lightweight checkout"))
511
523
d.destroy_workingtree()
526
class cmd_repair_workingtree(Command):
527
__doc__ = """Reset the working tree state file.
529
This is not meant to be used normally, but more as a way to recover from
530
filesystem corruption, etc. This rebuilds the working inventory back to a
531
'known good' state. Any new modifications (adding a file, renaming, etc)
532
will be lost, though modified files will still be detected as such.
534
Most users will want something more like "brz revert" or "brz update"
535
unless the state file has become corrupted.
537
By default this attempts to recover the current state by looking at the
538
headers of the state file. If the state file is too corrupted to even do
539
that, you can supply --revision to force the state of the tree.
542
takes_options = ['revision', 'directory',
544
help='Reset the tree even if it doesn\'t appear to be'
549
def run(self, revision=None, directory='.', force=False):
550
tree, _ = WorkingTree.open_containing(directory)
551
self.add_cleanup(tree.lock_tree_write().unlock)
555
except errors.BzrError:
556
pass # There seems to be a real error here, so we'll reset
559
raise errors.BzrCommandError(gettext(
560
'The tree does not appear to be corrupt. You probably'
561
' want "brz revert" instead. Use "--force" if you are'
562
' sure you want to reset the working tree.'))
566
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
568
tree.reset_state(revision_ids)
569
except errors.BzrError as e:
570
if revision_ids is None:
571
extra = (gettext(', the header appears corrupt, try passing -r -1'
572
' to set the state to the last commit'))
575
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
578
class cmd_revno(Command):
515
579
__doc__ = """Show current revision number.
520
584
_see_also = ['info']
521
585
takes_args = ['location?']
522
586
takes_options = [
523
Option('tree', help='Show revno of working tree'),
587
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
592
def run(self, tree=False, location=u'.', revision=None):
593
if revision is not None and tree:
594
raise errors.BzrCommandError(gettext("--tree and --revision can "
595
"not be used together"))
530
599
wt = WorkingTree.open_containing(location)[0]
600
self.add_cleanup(wt.lock_read().unlock)
532
601
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
602
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
604
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
606
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
607
self.add_cleanup(b.lock_read().unlock)
609
if len(revision) != 1:
610
raise errors.BzrCommandError(gettext(
611
"Revision numbers only make sense for single "
612
"revisions, not ranges"))
613
revid = revision[0].as_revision_id(b)
615
revid = b.last_revision()
617
revno_t = b.revision_id_to_dotted_revno(revid)
618
except errors.NoSuchRevision:
620
revno = ".".join(str(n) for n in revno_t)
546
621
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
622
self.outf.write(revno + '\n')
550
625
class cmd_revision_info(Command):
675
753
base_tree = base_branch.basis_tree()
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
755
action = breezy.add.AddFromBaseAction(base_tree, base_path,
678
756
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
758
action = breezy.add.AddWithSkipLargeAction(to_file=self.outf,
681
759
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
762
self.add_cleanup(base_tree.lock_read().unlock)
686
763
tree, file_list = tree_files_for_add(file_list)
687
764
added, ignored = tree.smart_add(file_list, not
688
765
no_recurse, action=action, save=not dry_run)
689
766
self.cleanup_now()
690
767
if len(ignored) > 0:
692
for glob in sorted(ignored.keys()):
769
for glob in sorted(ignored):
693
770
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
772
gettext("ignored {0} matching \"{1}\"\n").format(
698
776
class cmd_mkdir(Command):
751
854
help='List entries of a particular kind: file, directory, symlink.',
754
857
takes_args = ['file*']
757
860
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
861
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
862
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
864
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
865
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
866
self.add_cleanup(work_tree.lock_read().unlock)
765
867
if revision is not None:
766
868
tree = revision.as_tree(work_tree.branch)
768
870
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
871
self.add_cleanup(tree.lock_read().unlock)
876
self.add_cleanup(tree.lock_read().unlock)
775
877
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
878
paths = tree.find_related_paths_across_trees(
879
file_list, extra_trees, require_versioned=True)
778
880
# find_ids_across_trees may include some paths that don't
779
881
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
882
entries = tree.iter_entries_by_dir(specific_files=paths)
783
entries = tree.inventory.entries()
884
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
886
for path, entry in sorted(entries):
787
887
if kind and kind != entry.kind:
790
self.outf.write('%-50s %s\n' % (path, entry.file_id))
892
self.outf.write('%-50s %s\n' % (path, entry.file_id.decode('utf-8')))
792
894
self.outf.write(path)
793
895
self.outf.write('\n')
898
class cmd_cp(Command):
899
__doc__ = """Copy a file.
902
brz cp OLDNAME NEWNAME
904
brz cp SOURCE... DESTINATION
906
If the last argument is a versioned directory, all the other names
907
are copied into it. Otherwise, there must be exactly two arguments
908
and the file is copied to a new name.
910
Files cannot be copied between branches. Only files can be copied
914
takes_args = ['names*']
917
encoding_type = 'replace'
919
def run(self, names_list):
921
if names_list is None:
923
if len(names_list) < 2:
924
raise errors.BzrCommandError(gettext("missing file argument"))
925
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
926
for file_name in rel_names[0:-1]:
928
raise errors.BzrCommandError(gettext("can not copy root of branch"))
929
self.add_cleanup(tree.lock_tree_write().unlock)
930
into_existing = osutils.isdir(names_list[-1])
931
if not into_existing:
933
(src, dst) = rel_names
935
raise errors.BzrCommandError(gettext('to copy multiple files the'
936
' destination must be a versioned'
940
pairs = [(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
941
for n in rel_names[:-1]]
943
for src, dst in pairs:
945
src_kind = tree.stored_kind(src)
946
except errors.NoSuchFile:
947
raise errors.BzrCommandError(
948
gettext('Could not copy %s => %s: %s is not versioned.')
951
raise errors.BzrCommandError(
952
gettext('Could not copy %s => %s . %s is not versioned\\.'
954
if src_kind == 'directory':
955
raise errors.BzrCommandError(
956
gettext('Could not copy %s => %s . %s is a directory.'
958
dst_parent = osutils.split(dst)[0]
961
dst_parent_kind = tree.stored_kind(dst_parent)
962
except errors.NoSuchFile:
963
raise errors.BzrCommandError(
964
gettext('Could not copy %s => %s: %s is not versioned.')
965
% (src, dst, dst_parent))
966
if dst_parent_kind != 'directory':
967
raise errors.BzrCommandError(
968
gettext('Could not copy to %s: %s is not a directory.')
969
% (dst_parent, dst_parent))
971
tree.copy_one(src, dst)
796
974
class cmd_mv(Command):
797
975
__doc__ = """Move or rename a file.
800
bzr mv OLDNAME NEWNAME
978
brz mv OLDNAME NEWNAME
802
bzr mv SOURCE... DESTINATION
980
brz mv SOURCE... DESTINATION
804
982
If the last argument is a versioned directory, all the other names
805
983
are moved into it. Otherwise, there must be exactly two arguments
828
1006
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1008
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1009
if names_list is None:
833
1011
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1012
raise errors.BzrCommandError(gettext("missing file argument"))
1013
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1014
for file_name in rel_names[0:-1]:
1016
raise errors.BzrCommandError(gettext("can not move root of branch"))
1017
self.add_cleanup(tree.lock_tree_write().unlock)
838
1018
self._run(tree, names_list, rel_names, after)
840
1020
def run_auto(self, names_list, after, dry_run):
841
1021
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1022
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1025
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1027
work_tree, file_list = WorkingTree.open_containing_paths(
1028
names_list, default_directory='.')
1029
self.add_cleanup(work_tree.lock_tree_write().unlock)
1030
rename_map.RenameMap.guess_renames(
1031
work_tree.basis_tree(), work_tree, dry_run)
852
1033
def _run(self, tree, names_list, rel_names, after):
853
1034
into_existing = osutils.isdir(names_list[-1])
946
1126
match the remote one, use pull --overwrite. This will work even if the two
947
1127
branches have diverged.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
1129
If there is no default location set, the first pull will set it (use
1130
--no-remember to avoid setting it). After that, you can omit the
1131
location to use the default. To change the default, use --remember. The
1132
value will only be saved if the remote location can be accessed.
1134
The --verbose option will display the revisions pulled using the log_format
1135
configuration option. You can use a different format by overriding it with
1136
-Olog_format=<other_format>.
954
1138
Note: The location can be specified either in the form of a branch,
955
1139
or in the form of a path to a file containing a merge directive generated
959
1143
_see_also = ['push', 'update', 'status-flags', 'send']
960
1144
takes_options = ['remember', 'overwrite', 'revision',
961
1145
custom_help('verbose',
962
1146
help='Show logs of pulled revisions.'),
1147
custom_help('directory',
964
1148
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1149
'rather than the one containing the working directory.'),
970
1151
help="Perform a local pull in a bound "
971
1152
"branch. Local pulls are not applied to "
972
1153
"the master branch."
1156
help="Show base revision text in conflicts."),
1157
Option('overwrite-tags',
1158
help="Overwrite tags only."),
975
1160
takes_args = ['location?']
976
1161
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1163
def run(self, location=None, remember=None, overwrite=False,
979
1164
revision=None, verbose=False,
980
directory=None, local=False):
1165
directory=None, local=False,
1166
show_base=False, overwrite_tags=False):
1169
overwrite = ["history", "tags"]
1170
elif overwrite_tags:
1171
overwrite = ["tags"]
981
1174
# FIXME: too much stuff is in the command class
982
1175
revision_id = None
983
1176
mergeable = None
1070
1269
considered diverged if the destination branch's most recent commit is one
1071
1270
that has not been merged (directly or indirectly) by the source branch.
1073
If branches have diverged, you can use 'bzr push --overwrite' to replace
1272
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1273
the other branch completely, discarding its unmerged changes.
1076
1275
If you want to ensure you have the different changes in the other branch,
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1276
do a merge (see brz help merge) from the other branch, and commit that.
1078
1277
After that you will be able to do a push without '--overwrite'.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1279
If there is no default push location set, the first push will set it (use
1280
--no-remember to avoid setting it). After that, you can omit the
1281
location to use the default. To change the default, use --remember. The
1282
value will only be saved if the remote location can be accessed.
1284
The --verbose option will display the revisions pushed using the log_format
1285
configuration option. You can use a different format by overriding it with
1286
-Olog_format=<other_format>.
1086
1289
_see_also = ['pull', 'update', 'working-trees']
1106
1306
help='Create a stacked branch that refers to another branch '
1107
1307
'for the commit history. Only the work not present in the '
1108
1308
'referenced branch is included in the branch created.',
1110
1310
Option('strict',
1111
1311
help='Refuse to push if there are uncommitted changes in'
1112
1312
' the working tree, --no-strict disables the check.'),
1314
help="Don't populate the working tree, even for protocols"
1315
" that support it."),
1316
Option('overwrite-tags',
1317
help="Overwrite tags only."),
1318
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1319
"that can't be represented in the target.")
1114
1321
takes_args = ['location?']
1115
1322
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1324
def run(self, location=None, remember=None, overwrite=False,
1118
1325
create_prefix=False, verbose=False, revision=None,
1119
1326
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1327
stacked=False, strict=None, no_tree=False,
1328
overwrite_tags=False, lossy=False):
1329
from .push import _show_push_branch
1332
overwrite = ["history", "tags"]
1333
elif overwrite_tags:
1334
overwrite = ["tags"]
1123
1338
if directory is None:
1124
1339
directory = '.'
1125
1340
# Get the source branch
1126
1341
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1342
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1343
# Get the tip's revision_id
1129
1344
revision = _get_one_revision('push', revision)
1130
1345
if revision is not None:
1151
1366
# error by the feedback given to them. RBC 20080227.
1152
1367
stacked_on = parent_url
1153
1368
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1369
raise errors.BzrCommandError(gettext(
1370
"Could not determine branch to refer to."))
1157
1372
# Get the destination location
1158
1373
if location is None:
1159
1374
stored_loc = br_from.get_push_location()
1160
1375
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1376
parent_loc = br_from.get_parent()
1378
raise errors.BzrCommandError(gettext(
1379
"No push location known or specified. To push to the "
1380
"parent branch (at %s), use 'brz push :parent'." %
1381
urlutils.unescape_for_display(parent_loc,
1382
self.outf.encoding)))
1384
raise errors.BzrCommandError(gettext(
1385
"No push location known or specified."))
1164
1387
display_url = urlutils.unescape_for_display(stored_loc,
1165
1388
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1389
note(gettext("Using saved push location: %s") % display_url)
1167
1390
location = stored_loc
1169
1392
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1393
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1394
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1395
use_existing_dir=use_existing_dir, no_tree=no_tree,
1175
1399
class cmd_branch(Command):
1210
1436
help="Bind new branch to from location."),
1212
aliases = ['get', 'clone']
1214
1439
def run(self, from_location, to_location=None, revision=None,
1215
1440
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1218
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1441
use_existing_dir=False, switch=False, bind=False,
1443
from breezy import switch as _mod_switch
1444
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1446
if not (hardlink or files_from):
1447
# accelerator_tree is usually slower because you have to read N
1448
# files (no readahead, lots of seeks, etc), but allow the user to
1449
# explicitly request it
1450
accelerator_tree = None
1451
if files_from is not None and files_from != from_location:
1452
accelerator_tree = WorkingTree.open(files_from)
1221
1453
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1454
self.add_cleanup(br_from.lock_read().unlock)
1224
1455
if revision is not None:
1225
1456
revision_id = revision.as_revision_id(br_from)
1230
1461
revision_id = br_from.last_revision()
1231
1462
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1463
to_location = getattr(br_from, "name", None)
1465
to_location = urlutils.derive_to_location(from_location)
1233
1466
to_transport = transport.get_transport(to_location)
1235
1468
to_transport.mkdir('.')
1236
1469
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1471
to_dir = controldir.ControlDir.open_from_transport(
1473
except errors.NotBranchError:
1474
if not use_existing_dir:
1475
raise errors.BzrCommandError(gettext('Target directory "%s" '
1476
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1481
to_dir.open_branch()
1243
1482
except errors.NotBranchError:
1246
1485
raise errors.AlreadyBranchError(to_location)
1247
1486
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1487
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1493
# preserve whatever source format we have.
1494
to_dir = br_from.controldir.sprout(
1495
to_transport.base, revision_id,
1496
possible_transports=[to_transport],
1497
accelerator_tree=accelerator_tree, hardlink=hardlink,
1498
stacked=stacked, force_new_repo=standalone,
1499
create_tree_if_local=not no_tree, source_branch=br_from)
1500
branch = to_dir.open_branch(
1501
possible_transports=[
1502
br_from.controldir.root_transport, to_transport])
1503
except errors.NoSuchRevision:
1504
to_transport.delete_tree('.')
1505
msg = gettext("The branch {0} has no revision {1}.").format(
1506
from_location, revision)
1507
raise errors.BzrCommandError(msg)
1510
to_repo = to_dir.open_repository()
1511
except errors.NoRepositoryPresent:
1512
to_repo = to_dir.create_repository()
1513
to_repo.fetch(br_from.repository, revision_id=revision_id)
1514
branch = br_from.sprout(to_dir, revision_id=revision_id)
1515
br_from.tags.merge_to(branch.tags)
1266
1517
# If the source branch is stacked, the new branch may
1267
1518
# be stacked whether we asked for that explicitly or not.
1268
1519
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1521
note(gettext('Created new stacked branch referring to %s.') %
1271
1522
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1523
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1524
errors.UnstackableRepositoryFormat) as e:
1525
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1527
# Bind to the parent
1277
1528
parent_branch = Branch.open(from_location)
1278
1529
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1530
note(gettext('New branch bound to %s') % from_location)
1281
1532
# Switch to the new branch
1282
1533
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1534
_mod_switch.switch(wt.controldir, branch)
1535
note(gettext('Switched to branch: %s'),
1285
1536
urlutils.unescape_for_display(branch.base, 'utf-8'))
1539
class cmd_branches(Command):
1540
__doc__ = """List the branches available at the current location.
1542
This command will print the names of all the branches at the current
1546
takes_args = ['location?']
1548
Option('recursive', short_name='R',
1549
help='Recursively scan for branches rather than '
1550
'just looking in the specified location.')]
1552
def run(self, location=".", recursive=False):
1554
t = transport.get_transport(location)
1555
if not t.listable():
1556
raise errors.BzrCommandError(
1557
"Can't scan this type of location.")
1558
for b in controldir.ControlDir.find_branches(t):
1559
self.outf.write("%s\n" % urlutils.unescape_for_display(
1560
urlutils.relative_url(t.base, b.base),
1561
self.outf.encoding).rstrip("/"))
1563
dir = controldir.ControlDir.open_containing(location)[0]
1565
active_branch = dir.open_branch(name="")
1566
except errors.NotBranchError:
1567
active_branch = None
1569
for name, branch in iter_sibling_branches(dir):
1572
active = (active_branch is not None and
1573
active_branch.user_url == branch.user_url)
1574
names[name] = active
1575
# Only mention the current branch explicitly if it's not
1576
# one of the colocated branches
1577
if not any(viewvalues(names)) and active_branch is not None:
1578
self.outf.write("* %s\n" % gettext("(default)"))
1579
for name in sorted(names):
1580
active = names[name]
1585
self.outf.write("%s %s\n" % (
1586
prefix, (name if PY3 else name.encode(self.outf.encoding))))
1288
1589
class cmd_checkout(Command):
1289
1590
__doc__ = """Create a new checkout of an existing branch.
1389
1691
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1692
__doc__ = """Update a working tree to a new revision.
1694
This will perform a merge of the destination revision (the tip of the
1695
branch, or the specified revision) into the working tree, and then make
1696
that revision the basis revision for the working tree.
1698
You can use this to visit an older revision, or to update a working tree
1699
that is out of date from its branch.
1701
If there are any uncommitted changes in the tree, they will be carried
1702
across and remain as uncommitted changes after the update. To discard
1703
these changes, use 'brz revert'. The uncommitted changes may conflict
1704
with the changes brought in by the change in basis revision.
1706
If the tree's branch is bound to a master branch, brz will also update
1400
1707
the branch from the master.
1709
You cannot update just a single file or directory, because each Bazaar
1710
working tree has just a single basis revision. If you want to restore a
1711
file that has been removed locally, use 'brz revert' instead of 'brz
1712
update'. If you want to restore a file to its state in a previous
1713
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1714
out the old content of that file to a new location.
1716
The 'dir' argument, if given, must be the location of the root of a
1717
working tree to update. By default, the working tree that contains the
1718
current working directory is used.
1403
1721
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1722
takes_args = ['dir?']
1405
takes_options = ['revision']
1723
takes_options = ['revision',
1725
help="Show base revision text in conflicts."),
1406
1727
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1729
def run(self, dir=None, revision=None, show_base=None):
1409
1730
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1731
raise errors.BzrCommandError(gettext(
1732
"brz update --revision takes exactly one revision"))
1734
tree = WorkingTree.open_containing('.')[0]
1736
tree, relpath = WorkingTree.open_containing(dir)
1739
raise errors.BzrCommandError(gettext(
1740
"brz update can only update a whole tree, "
1741
"not a file or subdirectory"))
1413
1742
branch = tree.branch
1414
1743
possible_transports = []
1415
1744
master = branch.get_master_branch(
1416
1745
possible_transports=possible_transports)
1417
1746
if master is not None:
1419
1747
branch_location = master.base
1750
branch_location = tree.branch.base
1421
1751
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1752
self.add_cleanup(tree.unlock)
1424
1753
# get rid of the final '/' and be ready for display
1425
1754
branch_location = urlutils.unescape_for_display(
1451
1780
change_reporter,
1452
1781
possible_transports=possible_transports,
1453
1782
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1784
show_base=show_base)
1785
except errors.NoSuchRevision as e:
1786
raise errors.BzrCommandError(gettext(
1457
1787
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1788
"brz update --revision only works"
1789
" for a revision in the branch history")
1460
1790
% (e.revision))
1461
1791
revno = tree.branch.revision_id_to_dotted_revno(
1462
1792
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1793
note(gettext('Updated to revision {0} of branch {1}').format(
1794
'.'.join(map(str, revno)), branch_location))
1465
1795
parent_ids = tree.get_parent_ids()
1466
1796
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1797
note(gettext('Your local commits will now show as pending merges with '
1798
"'brz status', and can be committed with 'brz commit'."))
1469
1799
if conflicts != 0:
1530
1861
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1862
'The file deletion mode to be used.',
1532
1863
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1535
keep='Delete from bzr but leave the working copy.',
1536
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1864
safe='Backup changed files (default).',
1865
keep='Delete from brz but leave the working copy.',
1866
no_backup='Don\'t backup changed files.'),
1538
1868
aliases = ['rm', 'del']
1539
1869
encoding_type = 'replace'
1541
1871
def run(self, file_list, verbose=False, new=False,
1542
1872
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1874
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1876
if file_list is not None:
1546
1877
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1879
self.add_cleanup(tree.lock_write().unlock)
1550
1880
# Heuristics should probably all move into tree.remove_smart or
1742
2088
to_transport.ensure_base()
1743
2089
except errors.NoSuchFile:
1744
2090
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2091
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2092
" does not exist."
1747
2093
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2094
" leading parent directories.")
1750
2096
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2099
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1754
2100
except errors.NotBranchError:
1755
2101
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2102
create_branch = controldir.ControlDir.create_branch_convenience
2104
force_new_tree = False
2106
force_new_tree = None
1757
2107
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2108
possible_transports=[to_transport],
2109
force_new_tree=force_new_tree)
2110
a_controldir = branch.controldir
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2112
from .transport.local import LocalTransport
2113
if a_controldir.has_branch():
1763
2114
if (isinstance(to_transport, LocalTransport)
1764
and not a_bzrdir.has_workingtree()):
2115
and not a_controldir.has_workingtree()):
1765
2116
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2117
raise errors.AlreadyBranchError(location)
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2118
branch = a_controldir.create_branch()
2119
if not no_tree and not a_controldir.has_workingtree():
2120
a_controldir.create_workingtree()
1769
2121
if append_revisions_only:
1771
2123
branch.set_append_revisions_only(True)
1772
2124
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2125
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2126
' to append-revisions-only. Try --default.'))
1775
2127
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2128
from .info import describe_layout, describe_format
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2130
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1779
2131
except (errors.NoWorkingTree, errors.NotLocalUrl):
1781
2133
repository = branch.repository
1782
2134
layout = describe_layout(repository, branch, tree).lower()
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2135
format = describe_format(a_controldir, repository, branch, tree)
2136
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
2138
if repository.is_shared():
1786
2139
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
2140
url = repository.controldir.root_transport.external_url()
1789
2142
url = urlutils.local_path_from_url(url)
1790
except errors.InvalidURL:
2143
except urlutils.InvalidURL:
1792
self.outf.write("Using shared repository: %s\n" % url)
2145
self.outf.write(gettext("Using shared repository: %s\n") % url)
1795
2148
class cmd_init_repository(Command):
1837
2190
def run(self, location, format=None, no_trees=False):
1838
2191
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2192
format = controldir.format_registry.make_controldir('default')
1841
2194
if location is None:
1844
2197
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2199
if format.fixed_components:
2200
repo_format_name = None
2202
repo_format_name = format.repository_format.get_format_string()
2204
(repo, newdir, require_stacking, repository_policy) = (
2205
format.initialize_on_transport_ex(to_transport,
2206
create_prefix=True, make_working_trees=not no_trees,
2207
shared_repo=True, force_new_repo=True,
2208
use_existing_dir=True,
2209
repo_format_name=repo_format_name))
1850
2210
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2211
from .info import show_bzrdir_info
2212
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2215
class cmd_diff(Command):
1875
2242
Shows the difference in the working tree versus the last commit::
1879
2246
Difference between the working tree and revision 1::
1883
2250
Difference between revision 3 and revision 1::
1887
2254
Difference between revision 3 and revision 1 for branch xxx::
1891
To see the changes introduced in revision X::
2258
The changes introduced by revision 2 (equivalent to -r1..2)::
2262
To see the changes introduced by revision X::
1895
2266
Note that in the case of a merge, the -c option shows the changes
1896
2267
compared to the left hand parent. To see the changes against
1897
2268
another parent, use::
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2270
brz diff -r<chosen_parent>..X
2272
The changes between the current revision and the previous revision
2273
(equivalent to -c-1 and -r-2..-1)
1905
2277
Show just the differences for file NEWS::
1909
2281
Show the differences in working tree xxx for file NEWS::
1913
2285
Show the differences from branch xxx to this working tree:
1917
2289
Show the differences between two branches for file NEWS::
1919
bzr diff --old xxx --new yyy NEWS
1921
Same as 'bzr diff' but prefix paths with old/ and new/::
1923
bzr diff --prefix old/:new/
2291
brz diff --old xxx --new yyy NEWS
2293
Same as 'brz diff' but prefix paths with old/ and new/::
2295
brz diff --prefix old/:new/
2297
Show the differences using a custom diff program with options::
2299
brz diff --using /usr/bin/diff --diff-options -wu
1925
2301
_see_also = ['status']
1926
2302
takes_args = ['file*']
1927
2303
takes_options = [
1928
Option('diff-options', type=str,
2304
Option('diff-options', type=text_type,
1929
2305
help='Pass these options to the external diff program.'),
1930
Option('prefix', type=str,
2306
Option('prefix', type=text_type,
1931
2307
short_name='p',
1932
2308
help='Set prefixes added to old and new filenames, as '
1933
2309
'two values separated by a colon. (eg "old/:new/").'),
1935
2311
help='Branch/tree to compare from.',
1939
2315
help='Branch/tree to compare to.',
1944
2320
Option('using',
1945
2321
help='Use this command to compare files.',
1948
2324
RegistryOption('format',
1949
2326
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2327
lazy_registry=('breezy.diff', 'format_registry'),
2328
title='Diff format'),
2330
help='How many lines of context to show.',
1953
2334
aliases = ['di', 'dif']
1954
2335
encoding_type = 'exact'
1956
2337
@display_command
1957
2338
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2339
prefix=None, old=None, new=None, using=None, format=None,
2341
from .diff import (get_trees_and_branches_to_diff_locked,
1960
2342
show_diff_trees)
1962
if (prefix is None) or (prefix == '0'):
1963
2345
# diff -p0 format
2348
elif prefix == u'1' or prefix is None:
1967
2349
old_label = 'old/'
1968
2350
new_label = 'new/'
1970
old_label, new_label = prefix.split(":")
2351
elif u':' in prefix:
2352
old_label, new_label = prefix.split(u":")
1972
raise errors.BzrCommandError(
2354
raise errors.BzrCommandError(gettext(
1973
2355
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2356
' (eg "old/:new/")'))
1976
2358
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2359
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2360
' one or two revision specifiers'))
1980
2362
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2363
raise errors.BzrCommandError(gettext(
2364
'{0} and {1} are mutually exclusive').format(
2365
'--using', '--format'))
1984
2367
(old_tree, new_tree,
1985
2368
old_branch, new_branch,
1986
2369
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2370
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2371
# GNU diff on Windows uses ANSI encoding for filenames
2372
path_encoding = osutils.get_diff_header_encoding()
2373
return show_diff_trees(old_tree, new_tree, self.outf,
1989
2374
specific_files=specific_files,
1990
2375
external_diff_options=diff_options,
1991
2376
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2377
extra_trees=extra_trees,
2378
path_encoding=path_encoding,
2379
using=using, context=context,
1993
2380
format_cls=format)
2053
2436
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2437
takes_options = ['directory', 'null']
2060
2439
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2440
def run(self, null=False, directory=u'.'):
2441
wt = WorkingTree.open_containing(directory)[0]
2442
self.add_cleanup(wt.lock_read().unlock)
2065
2443
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2071
if file_id in basis_inv:
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2444
self.add_cleanup(basis.lock_read().unlock)
2445
root_id = wt.get_root_id()
2446
for path in wt.all_versioned_paths():
2447
if basis.has_filename(path):
2451
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2454
self.outf.write(path + '\0')
2224
2599
:Other filtering:
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2601
The --match option can be used for finding revisions that match a
2602
regular expression in a commit message, committer, author or bug.
2603
Specifying the option several times will match any of the supplied
2604
expressions. --match-author, --match-bugs, --match-committer and
2605
--match-message can be used to only match a specific field.
2229
2607
:Tips & tricks:
2231
2609
GUI tools and IDEs are often better at exploring history than command
2232
2610
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2611
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2612
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
2613
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2615
You may find it useful to add the aliases below to ``breezy.conf``::
2241
2619
top = log -l10 --line
2242
2620
show = log -v -p
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2622
``brz tip`` will then show the latest revision while ``brz top``
2245
2623
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2624
particular revision X, ``brz show -rX``.
2248
2626
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2627
use ``brz log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2629
``brz log -v`` on a branch with lots of history is currently
2252
2630
very slow. A fix for this issue is currently under development.
2253
2631
With or without that fix, it is recommended that a revision range
2254
2632
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2634
brz has a generic full-text matching plugin, brz-search, that can be
2257
2635
used to find revisions matching user names, commit messages, etc.
2258
2636
Among other features, this plugin can find all revisions containing
2259
2637
a list of words but not others.
2297
2680
Option('show-diff',
2298
2681
short_name='p',
2299
2682
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2683
Option('include-merged',
2301
2684
help='Show merged revisions like --levels 0 does.'),
2685
Option('include-merges', hidden=True,
2686
help='Historical alias for --include-merged.'),
2687
Option('omit-merges',
2688
help='Do not report commits with more than one parent.'),
2302
2689
Option('exclude-common-ancestry',
2303
2690
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2691
' of both ancestries (require -rX..Y).'
2693
Option('signatures',
2694
help='Show digital signature validity.'),
2697
help='Show revisions whose properties match this '
2700
ListOption('match-message',
2701
help='Show revisions whose message matches this '
2704
ListOption('match-committer',
2705
help='Show revisions whose committer matches this '
2708
ListOption('match-author',
2709
help='Show revisions whose authors match this '
2712
ListOption('match-bugs',
2713
help='Show revisions whose bugs match this '
2307
2717
encoding_type = 'replace'
2528
2967
help='Recurse into subdirectories.'),
2529
2968
Option('from-root',
2530
2969
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2970
Option('unknown', short_name='u',
2971
help='Print unknown files.'),
2532
2972
Option('versioned', help='Print versioned files.',
2533
2973
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2974
Option('ignored', short_name='i',
2975
help='Print ignored files.'),
2976
Option('kind', short_name='k',
2539
2977
help='List entries of a particular kind: file, directory, symlink.',
2543
2983
@display_command
2544
2984
def run(self, revision=None, verbose=False,
2545
2985
recursive=False, from_root=False,
2546
2986
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2987
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2989
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
2990
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2992
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2993
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2994
all = not (unknown or versioned or ignored)
2556
2996
selection = {'I':ignored, '?':unknown, 'V':versioned}
2674
3114
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3115
precedence over the '!' exception patterns.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3119
* Ignore patterns containing shell wildcards must be quoted from
3122
* Ignore patterns starting with "#" act as comments in the ignore file.
3123
To ignore patterns that begin with that character, use the "RE:" prefix.
2681
3126
Ignore the top level Makefile::
2683
bzr ignore ./Makefile
3128
brz ignore ./Makefile
2685
3130
Ignore .class files in all directories...::
2687
bzr ignore "*.class"
3132
brz ignore "*.class"
2689
3134
...but do not ignore "special.class"::
2691
bzr ignore "!special.class"
2693
Ignore .o files under the lib directory::
2695
bzr ignore "lib/**/*.o"
2697
Ignore .o files under the lib directory::
2699
bzr ignore "RE:lib/.*\.o"
3136
brz ignore "!special.class"
3138
Ignore files whose name begins with the "#" character::
3142
Ignore .o files under the lib directory::
3144
brz ignore "lib/**/*.o"
3146
Ignore .o files under the lib directory::
3148
brz ignore "RE:lib/.*\\.o"
2701
3150
Ignore everything but the "debian" toplevel directory::
2703
bzr ignore "RE:(?!debian/).*"
3152
brz ignore "RE:(?!debian/).*"
2705
3154
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
3155
but always ignore autosave files ending in ~, even under local/::
2709
bzr ignore "!./local"
3158
brz ignore "!./local"
2713
3162
_see_also = ['status', 'ignored', 'patterns']
2714
3163
takes_args = ['name_pattern*']
3164
takes_options = ['directory',
2716
3165
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3166
help='Display the default ignore rules that brz uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
3169
def run(self, name_pattern_list=None, default_rules=None,
3171
from breezy import ignores
2722
3172
if default_rules is not None:
2723
3173
# dump the default rules and exit
2724
3174
for pattern in ignores.USER_DEFAULTS:
2725
3175
self.outf.write("%s\n" % pattern)
2727
3177
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3178
raise errors.BzrCommandError(gettext("ignore requires at least one "
3179
"NAME_PATTERN or --default-rules."))
2730
3180
name_pattern_list = [globbing.normalize_pattern(p)
2731
3181
for p in name_pattern_list]
3183
bad_patterns_count = 0
3184
for p in name_pattern_list:
3185
if not globbing.Globster.is_pattern_valid(p):
3186
bad_patterns_count += 1
3187
bad_patterns += ('\n %s' % p)
3189
msg = (ngettext('Invalid ignore pattern found. %s',
3190
'Invalid ignore patterns found. %s',
3191
bad_patterns_count) % bad_patterns)
3192
ui.ui_factory.show_error(msg)
3193
raise lazy_regex.InvalidPattern('')
2732
3194
for name_pattern in name_pattern_list:
2733
3195
if (name_pattern[0] == '/' or
2734
3196
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3197
raise errors.BzrCommandError(gettext(
3198
"NAME_PATTERN should not be an absolute path"))
3199
tree, relpath = WorkingTree.open_containing(directory)
2738
3200
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3201
ignored = globbing.Globster(name_pattern_list)
3203
self.add_cleanup(tree.lock_read().unlock)
2742
3204
for entry in tree.list_files():
2744
3206
if id is not None:
2745
3207
filename = entry[0]
2746
3208
if ignored.match(filename):
2747
3209
matches.append(filename)
2749
3210
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3211
self.outf.write(gettext("Warning: the following files are version "
3212
"controlled and match your ignore pattern:\n%s"
2752
3213
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3214
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2756
3217
class cmd_ignored(Command):
2829
3291
================= =========================
3294
encoding_type = 'exact'
2831
3295
takes_args = ['dest', 'branch_or_subdir?']
3296
takes_options = ['directory',
2833
3297
Option('format',
2834
3298
help="Type of file to export to.",
2837
3301
Option('filters', help='Apply content filters to export the '
2838
3302
'convenient form.'),
2841
3305
help="Name of the root directory inside the exported file."),
2842
3306
Option('per-file-timestamps',
2843
3307
help='Set modification time of files to that of the last '
2844
3308
'revision in which it was changed.'),
3309
Option('uncommitted',
3310
help='Export the working tree contents rather than that of the '
2846
3313
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2848
from bzrlib.export import export
3314
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3316
from .export import export, guess_format, get_root_name
2850
3318
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3319
branch_or_subdir = directory
3321
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3323
if tree is not None:
3324
self.add_cleanup(tree.lock_read().unlock)
3328
raise errors.BzrCommandError(
3329
gettext("--uncommitted requires a working tree"))
3332
export_tree = _get_one_revision_tree(
3333
'export', revision, branch=b,
3337
format = guess_format(dest)
3340
root = get_root_name(dest)
3342
if not per_file_timestamps:
3343
force_mtime = time.time()
3348
from breezy.filter_tree import ContentFilterTree
3349
export_tree = ContentFilterTree(
3350
export_tree, export_tree._content_filter_stack)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3353
export(export_tree, dest, format, root, subdir,
2861
3354
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3355
except errors.NoSuchExportFormat as e:
3356
raise errors.BzrCommandError(
3357
gettext('Unsupported export format: %s') % e.format)
2866
3360
class cmd_cat(Command):
2885
3379
@display_command
2886
3380
def run(self, filename, revision=None, name_from_revision=False,
3381
filters=False, directory=None):
2888
3382
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3383
raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"
3384
" one revision specifier"))
2891
3385
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3386
_open_directory_or_containing_tree_or_branch(filename, directory)
3387
self.add_cleanup(branch.lock_read().unlock)
2895
3388
return self._run(tree, branch, relpath, filename, revision,
2896
3389
name_from_revision, filters)
2898
3391
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2900
3394
if tree is None:
2901
3395
tree = b.basis_tree()
2902
3396
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3397
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3399
old_file_id = rev_tree.path2id(relpath)
3401
# TODO: Split out this code to something that generically finds the
3402
# best id for a path across one or more trees; it's like
3403
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3405
if name_from_revision:
2909
3406
# Try in revision if requested
2910
3407
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3408
raise errors.BzrCommandError(gettext(
3409
"{0!r} is not present in revision {1}").format(
2913
3410
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3412
actual_file_id = old_file_id
2917
3414
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3415
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3416
actual_file_id = cur_file_id
3417
elif old_file_id is not None:
3418
actual_file_id = old_file_id
3420
raise errors.BzrCommandError(gettext(
3421
"{0!r} is not present in revision {1}").format(
2935
3422
filename, rev_tree.get_revision_id()))
3423
relpath = rev_tree.id2path(actual_file_id)
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3425
from .filter_tree import ContentFilterTree
3426
filter_tree = ContentFilterTree(rev_tree,
3427
rev_tree._content_filter_stack)
3428
fileobj = filter_tree.get_file(relpath, actual_file_id)
2949
self.outf.write(content)
3430
fileobj = rev_tree.get_file(relpath, actual_file_id)
3431
shutil.copyfileobj(fileobj, self.outf)
2952
3435
class cmd_local_time_offset(Command):
3000
3483
A common mistake is to forget to add a new file or directory before
3001
3484
running the commit command. The --strict option checks for unknown
3002
3485
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3486
checks can be implemented by defining hooks. See ``brz help hooks``
3006
3489
:Things to note:
3008
3491
If you accidentially commit the wrong changes or make a spelling
3009
3492
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3493
to undo it. See ``brz help uncommit`` for details.
3012
3495
Hooks can also be configured to run after a commit. This allows you
3013
3496
to trigger updates to external systems like bug trackers. The --fixes
3014
3497
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3498
one or more bugs. See ``brz help bugs`` for details.
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3501
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3502
takes_args = ['selected*']
3045
3503
takes_options = [
3046
ListOption('exclude', type=str, short_name='x',
3504
ListOption('exclude', type=text_type, short_name='x',
3047
3505
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3506
Option('message', type=text_type,
3049
3507
short_name='m',
3050
3508
help="Description of the new revision."),
3052
3510
Option('unchanged',
3053
3511
help='Commit even if nothing has changed.'),
3054
Option('file', type=str,
3512
Option('file', type=text_type,
3055
3513
short_name='F',
3056
3514
argname='msgfile',
3057
3515
help='Take commit message from this file.'),
3058
3516
Option('strict',
3059
3517
help="Refuse to commit if there are unknown "
3060
3518
"files in the working tree."),
3061
Option('commit-time', type=str,
3519
Option('commit-time', type=text_type,
3062
3520
help="Manually set a commit time using commit date "
3063
3521
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
ListOption('fixes', type=str,
3522
ListOption('fixes', type=text_type,
3065
3523
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3524
"(see \"brz help bugs\")."),
3525
ListOption('author', type=text_type,
3068
3526
help="Set the author's name, if it's different "
3069
3527
"from the committer."),
3070
3528
Option('local',
3076
3534
Option('show-diff', short_name='p',
3077
3535
help='When no message is supplied, show the diff along'
3078
3536
' with the status summary in the message editor.'),
3538
help='When committing to a foreign version control '
3539
'system do not push data that can not be natively '
3080
3542
aliases = ['ci', 'checkin']
3082
3544
def _iter_bug_fix_urls(self, fixes, branch):
3545
default_bugtracker = None
3083
3546
# Configure the properties for bug fixing attributes.
3084
3547
for fixed_bug in fixes:
3085
3548
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3549
if len(tokens) == 1:
3550
if default_bugtracker is None:
3551
branch_config = branch.get_config_stack()
3552
default_bugtracker = branch_config.get(
3554
if default_bugtracker is None:
3555
raise errors.BzrCommandError(gettext(
3556
"No tracker specified for bug %s. Use the form "
3557
"'tracker:id' or specify a default bug tracker "
3558
"using the `bugtracker` option.\nSee "
3559
"\"brz help bugs\" for more information on this "
3560
"feature. Commit refused.") % fixed_bug)
3561
tag = default_bugtracker
3563
elif len(tokens) != 2:
3564
raise errors.BzrCommandError(gettext(
3088
3565
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3566
"See \"brz help bugs\" for more information on this "
3567
"feature.\nCommit refused.") % fixed_bug)
3569
tag, bug_id = tokens
3093
3571
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3572
except bugtracker.UnknownBugTrackerAbbreviation:
3573
raise errors.BzrCommandError(gettext(
3574
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3575
except bugtracker.MalformedBugIdentifier as e:
3576
raise errors.BzrCommandError(gettext(
3577
u"%s\nCommit refused.") % (e,))
3101
3579
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3580
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3581
author=None, show_diff=False, exclude=None, commit_time=None,
3583
from .commit import (
3105
3584
PointlessCommit,
3586
from .errors import (
3106
3587
ConflictsInTree,
3107
3588
StrictCommitFailed
3109
from bzrlib.msgeditor import (
3590
from .msgeditor import (
3110
3591
edit_commit_message_encoded,
3111
3592
generate_commit_message_template,
3112
make_commit_message_template_encoded
3593
make_commit_message_template_encoded,
3115
3597
commit_stamp = offset = None
3116
3598
if commit_time is not None:
3118
3600
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3601
except ValueError as e:
3602
raise errors.BzrCommandError(gettext(
3603
"Could not parse --commit-time: " + str(e)))
3129
3605
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3607
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3608
if selected_list == ['']:
3133
3609
# workaround - commit of root of tree should be exactly the same
3134
3610
# as just default commit in that tree, and succeed even though
3184
3660
# make_commit_message_template_encoded returns user encoding.
3185
3661
# We probably want to be using edit_commit_message instead to
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3663
my_message = set_commit_message(commit_obj)
3664
if my_message is None:
3665
start_message = generate_commit_message_template(commit_obj)
3666
if start_message is not None:
3667
start_message = start_message.encode(
3668
osutils.get_user_encoding())
3669
my_message = edit_commit_message_encoded(text,
3670
start_message=start_message)
3671
if my_message is None:
3672
raise errors.BzrCommandError(gettext("please specify a commit"
3673
" message with either --message or --file"))
3674
if my_message == "":
3675
raise errors.BzrCommandError(gettext("Empty commit message specified."
3676
" Please specify a commit message with either"
3677
" --message or --file or leave a blank message"
3678
" with --message \"\"."))
3195
3679
return my_message
3197
3681
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3689
reporter=None, verbose=verbose, revprops=properties,
3206
3690
authors=author, timestamp=commit_stamp,
3207
3691
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3692
exclude=tree.safe_relpath_files(exclude),
3209
3694
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3695
raise errors.BzrCommandError(gettext("No changes to commit."
3696
" Please 'brz add' the files you want to commit, or use"
3697
" --unchanged to force an empty commit."))
3212
3698
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3699
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3700
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3216
3702
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3219
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3703
raise errors.BzrCommandError(gettext("Commit refused because there are"
3704
" unknown files in the working tree."))
3705
except errors.BoundBranchOutOfDate as e:
3706
e.extra_help = (gettext("\n"
3221
3707
'To commit to master branch, run update and then commit.\n'
3222
3708
'You can also pass --local to commit to continue working '
3297
3783
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3784
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3786
When the default format has changed after a major new release of
3787
Bazaar, you may be informed during certain operations that you
3788
should upgrade. Upgrading to a newer format may improve performance
3789
or make new features available. It may however limit interoperability
3790
with older repositories or with older versions of Bazaar.
3792
If you wish to upgrade to a particular format rather than the
3793
current default, that can be specified using the --format option.
3794
As a consequence, you can use the upgrade command this way to
3795
"downgrade" to an earlier format, though some conversions are
3796
a one way process (e.g. changing from the 1.x default to the
3797
2.x default) so downgrading is not always possible.
3799
A backup.bzr.~#~ directory is created at the start of the conversion
3800
process (where # is a number). By default, this is left there on
3801
completion. If the conversion fails, delete the new .bzr directory
3802
and rename this one back in its place. Use the --clean option to ask
3803
for the backup.bzr directory to be removed on successful conversion.
3804
Alternatively, you can delete it by hand if everything looks good
3807
If the location given is a shared repository, dependent branches
3808
are also converted provided the repository converts successfully.
3809
If the conversion of a branch fails, remaining branches are still
3812
For more information on upgrades, see the Bazaar Upgrade Guide,
3813
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3816
_see_also = ['check', 'reconcile', 'formats']
3306
3817
takes_args = ['url?']
3307
3818
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3819
RegistryOption('format',
3820
help='Upgrade to a specific format. See "brz help'
3821
' formats" for details.',
3822
lazy_registry=('breezy.controldir', 'format_registry'),
3823
converter=lambda name: controldir.format_registry.make_controldir(name),
3824
value_switches=True, title='Branch format'),
3826
help='Remove the backup.bzr directory if successful.'),
3828
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3317
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3831
def run(self, url='.', format=None, clean=False, dry_run=False):
3832
from .upgrade import upgrade
3833
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3835
if len(exceptions) == 1:
3836
# Compatibility with historical behavior
3321
3842
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3843
__doc__ = """Show or set brz user id.
3325
3846
Show the email of the current user::
3329
3850
Set the current user::
3331
bzr whoami "Frank Chu <fchu@example.com>"
3852
brz whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3854
takes_options = [ 'directory',
3334
3856
help='Display email address only.'),
3335
3857
Option('branch',
3336
3858
help='Set identity for the current branch instead of '
3340
3862
encoding_type = 'replace'
3342
3864
@display_command
3343
def run(self, email=False, branch=False, name=None):
3865
def run(self, email=False, branch=False, name=None, directory=None):
3344
3866
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3867
if directory is None:
3868
# use branch if we're inside one; otherwise global config
3870
c = Branch.open_containing(u'.')[0].get_config_stack()
3871
except errors.NotBranchError:
3872
c = _mod_config.GlobalStack()
3874
c = Branch.open(directory).get_config_stack()
3875
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3877
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3880
self.outf.write(identity + '\n')
3884
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3887
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3359
except errors.NoEmailInUsername, e:
3889
_mod_config.extract_email_address(name)
3890
except _mod_config.NoEmailInUsername as e:
3360
3891
warning('"%s" does not seem to contain an email address. '
3361
3892
'This is allowed, but not recommended.', name)
3363
3894
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3896
if directory is None:
3897
c = Branch.open_containing(u'.')[0].get_config_stack()
3899
b = Branch.open(directory)
3900
self.add_cleanup(b.lock_write().unlock)
3901
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3903
c = _mod_config.GlobalStack()
3904
c.set('email', name)
3371
3907
class cmd_nick(Command):
3372
3908
__doc__ = """Print or set the branch nickname.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3910
If unset, the colocated branch name is used for colocated branches, and
3911
the branch directory name is used for other branches. To print the
3912
current nickname, execute with no argument.
3377
3914
Bound branches use the nickname of its master branch unless it is set
3433
3971
def remove_alias(self, alias_name):
3434
3972
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3973
raise errors.BzrCommandError(gettext(
3974
'brz alias --remove expects an alias to remove.'))
3437
3975
# If alias is not found, print something like:
3438
3976
# unalias: foo: not found
3439
c = config.GlobalConfig()
3977
c = _mod_config.GlobalConfig()
3440
3978
c.unset_alias(alias_name)
3442
3980
@display_command
3443
3981
def print_aliases(self):
3444
3982
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3446
for key, value in sorted(aliases.iteritems()):
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3983
aliases = _mod_config.GlobalConfig().get_aliases()
3984
for key, value in sorted(viewitems(aliases)):
3985
self.outf.write('brz alias %s="%s"\n' % (key, value))
3449
3987
@display_command
3450
3988
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
3989
from .commands import get_alias
3452
3990
alias = get_alias(alias_name)
3453
3991
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3992
self.outf.write("brz alias: %s: not found\n" % alias_name)
3456
3994
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3995
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3459
3997
def set_alias(self, alias_name, alias_command):
3460
3998
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3999
c = _mod_config.GlobalConfig()
3462
4000
c.set_alias(alias_name, alias_command)
3496
4034
Tests that need working space on disk use a common temporary directory,
3497
4035
typically inside $TMPDIR or /tmp.
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4037
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4038
into a pdb postmortem session.
4040
The --coverage=DIRNAME global option produces a report with covered code
3503
4044
Run only tests relating to 'ignore'::
3507
4048
Disable plugins and list tests as they're run::
3509
bzr --no-plugins selftest -v
4050
brz --no-plugins selftest -v
3511
4052
# NB: this is used from the class without creating an instance, which is
3512
4053
# why it does not have a self parameter.
3513
4054
def get_transport_type(typestring):
3514
4055
"""Parse and return a transport specifier."""
3515
4056
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4057
from .tests import stub_sftp
3517
4058
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4059
elif typestring == "memory":
4060
from .tests import test_server
3520
4061
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4062
elif typestring == "fakenfs":
4063
from .tests import test_server
3523
4064
return test_server.FakeNFSServer
3524
4065
msg = "No known transport type %s. Supported types are: sftp\n" %\
3554
4093
help='List the tests instead of running them.'),
3555
4094
RegistryOption('parallel',
3556
4095
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4096
lazy_registry=('breezy.tests', 'parallel_registry'),
3558
4097
value_switches=False,
3560
Option('randomize', type=str, argname="SEED",
4099
Option('randomize', type=text_type, argname="SEED",
3561
4100
help='Randomize the order of tests using the given'
3562
4101
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3568
help='Output test progress via subunit.'),
4102
ListOption('exclude', type=text_type, argname="PATTERN",
4104
help='Exclude tests that match this regular'
4107
help='Output test progress via subunit v1.'),
4109
help='Output test progress via subunit v2.'),
3569
4110
Option('strict', help='Fail on missing dependencies or '
3570
4111
'known failures.'),
3571
Option('load-list', type=str, argname='TESTLISTFILE',
4112
Option('load-list', type=text_type, argname='TESTLISTFILE',
3572
4113
help='Load a test id list from a text file.'),
3573
ListOption('debugflag', type=str, short_name='E',
4114
ListOption('debugflag', type=text_type, short_name='E',
3574
4115
help='Turn on a selftest debug flag.'),
3575
ListOption('starting-with', type=str, argname='TESTID',
4116
ListOption('starting-with', type=text_type, argname='TESTID',
3576
4117
param_name='starting_with', short_name='s',
3578
4119
'Load only the tests starting with TESTID.'),
4121
help="By default we disable fsync and fdatasync"
4122
" while running the test suite.")
3580
4124
encoding_type = 'replace'
3586
4130
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4131
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4133
first=False, list_only=False,
3590
4134
randomize=None, exclude=None, strict=False,
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4135
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4136
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4138
# During selftest, disallow proxying, as it can cause severe
4139
# performance penalties and is only needed for thread
4140
# safety. The selftest command is assumed to not use threads
4141
# too heavily. The call should be as early as possible, as
4142
# error reporting for past duplicate imports won't have useful
4144
if sys.version_info[0] < 3:
4145
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4146
# disallowing it currently leads to failures in many places.
4147
lazy_import.disallow_proxying()
4152
raise errors.BzrCommandError("tests not available. Install the "
4153
"breezy tests to run the breezy testsuite.")
3602
4155
if testspecs_list is not None:
3603
4156
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
4161
from .tests import SubUnitBzrRunnerv1
3609
4162
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4163
raise errors.BzrCommandError(gettext(
4164
"subunit not available. subunit needs to be installed "
4165
"to use --subunit."))
4166
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3613
4167
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4168
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4169
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4170
# following code can be deleted when it's sufficiently deployed
4171
# -- vila/mgz 20100514
4172
if (sys.platform == "win32"
4173
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4175
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4178
from .tests import SubUnitBzrRunnerv2
4180
raise errors.BzrCommandError(gettext(
4181
"subunit not available. subunit "
4182
"needs to be installed to use --subunit2."))
4183
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3619
4186
self.additional_selftest_args.setdefault(
3620
4187
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4189
raise errors.BzrCommandError(gettext(
4190
"--benchmark is no longer supported from brz 2.2; "
4191
"use bzr-usertest instead"))
4192
test_suite_factory = None
4194
exclude_pattern = None
3629
test_suite_factory = None
4196
exclude_pattern = '(' + '|'.join(exclude) + ')'
4198
self._disable_fsync()
3631
4199
selftest_kwargs = {"verbose": verbose,
3632
4200
"pattern": pattern,
3633
4201
"stop_on_failure": one,
3635
4203
"test_suite_factory": test_suite_factory,
3636
4204
"lsprof_timed": lsprof_timed,
3637
4205
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4206
"matching_tests_first": first,
3640
4207
"list_only": list_only,
3641
4208
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4209
"exclude_pattern": exclude_pattern,
3643
4210
"strict": strict,
3644
4211
"load_list": load_list,
3645
4212
"debug_flags": debugflag,
3646
4213
"starting_with": starting_with
3648
4215
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4217
# Make deprecation warnings visible, unless -Werror is set
4218
cleanup = symbol_versioning.activate_deprecation_warnings(
4221
result = tests.selftest(**selftest_kwargs)
3650
4224
return int(not result)
4226
def _disable_fsync(self):
4227
"""Change the 'os' functionality to not synchronize."""
4228
self._orig_fsync = getattr(os, 'fsync', None)
4229
if self._orig_fsync is not None:
4230
os.fsync = lambda filedes: None
4231
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4232
if self._orig_fdatasync is not None:
4233
os.fdatasync = lambda filedes: None
3653
4236
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4237
__doc__ = """Show version of brz."""
3656
4239
encoding_type = 'replace'
3657
4240
takes_options = [
3709
4291
The source of the merge can be specified either in the form of a branch,
3710
4292
or in the form of a path to a file containing a merge directive generated
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4293
with brz send. If neither is specified, the default is the upstream branch
4294
or the branch most recently merged using --remember. The source of the
4295
merge may also be specified in the form of a path to a file in another
4296
branch: in this case, only the modifications to that file are merged into
4297
the current working tree.
4299
When merging from a branch, by default brz will try to merge in all new
4300
work from the other branch, automatically determining an appropriate base
4301
revision. If this fails, you may need to give an explicit base.
4303
To pick a different ending revision, pass "--revision OTHER". brz will
4304
try to merge in all new work up to and including revision OTHER.
4306
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4307
through OTHER, excluding BASE but including OTHER, will be merged. If this
4308
causes some revisions to be skipped, i.e. if the destination branch does
4309
not already contain revision BASE, such a merge is commonly referred to as
4310
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4311
cherrypicks. The changes look like a normal commit, and the history of the
4312
changes from the other branch is not stored in the commit.
4314
Revision numbers are always relative to the source branch.
3725
4316
Merge will do its best to combine the changes in two branches, but there
3726
4317
are some kinds of problems only a human can fix. When it encounters those,
3727
4318
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4319
before you can commit.
4321
Use brz resolve when you have fixed a problem. See also brz conflicts.
4323
If there is no default branch set, the first merge will set it (use
4324
--no-remember to avoid setting it). After that, you can omit the branch
4325
to use the default. To change the default, use --remember. The value will
4326
only be saved if the remote location can be accessed.
3737
4328
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4329
directory, where they can be reviewed (with brz diff), tested, and then
3739
4330
committed to record the result of the merge.
3741
4332
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4333
--force is given. If --force is given, then the changes from the source
4334
will be merged with the current working tree, including any uncommitted
4335
changes in the tree. The --force option can also be used to create a
3743
4336
merge revision which has more than two parents.
3745
4338
If one would like to merge changes from the working tree of the other
3873
4466
self.sanity_check_merger(merger)
3874
4467
if (merger.base_rev_id == merger.other_rev_id and
3875
4468
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4469
# check if location is a nonexistent file (and not a branch) to
4470
# disambiguate the 'Nothing to do'
4471
if merger.interesting_files:
4472
if not merger.other_tree.has_filename(
4473
merger.interesting_files[0]):
4474
note(gettext("merger: ") + str(merger))
4475
raise errors.PathsDoNotExist([location])
4476
note(gettext('Nothing to do.'))
4478
if pull and not preview:
3879
4479
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4480
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4481
if (merger.base_rev_id == tree.last_revision()):
3882
4482
result = tree.pull(merger.other_branch, False,
3883
4483
merger.other_rev_id)
3884
4484
result.report(self.outf)
3886
4486
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4487
raise errors.BzrCommandError(gettext(
3888
4488
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4489
" (perhaps you would prefer 'brz pull')"))
3891
4491
return self._do_preview(merger)
3892
4492
elif interactive:
3950
4552
# Use reprocess if the merger supports it
3951
4553
merger.reprocess = merger.merge_type.supports_reprocess
3952
4554
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4555
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4556
" for merge type %s.") %
3955
4557
merger.merge_type)
3956
4558
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4559
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4562
if (merger.merge_type.requires_file_merge_plan and
4563
(not getattr(merger.this_tree, 'plan_file_merge', None) or
4564
not getattr(merger.other_tree, 'plan_file_merge', None) or
4565
(merger.base_tree is not None and
4566
not getattr(merger.base_tree, 'plan_file_merge', None)))):
4567
raise errors.BzrCommandError(
4568
gettext('Plan file merge unsupported: '
4569
'Merge type incompatible with tree formats.'))
3960
4571
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4572
possible_transports, pb):
3962
4573
"""Produce a merger from a location, assuming it refers to a branch."""
3963
from bzrlib.tag import _merge_tags_if_possible
3964
4574
# find the branch locations
3965
4575
other_loc, user_location = self._select_branch_location(tree, location,
3988
4598
if other_revision_id is None:
3989
4599
other_revision_id = _mod_revision.ensure_null(
3990
4600
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4601
# Remember where we merge from. We need to remember if:
4602
# - user specify a location (and we don't merge from the parent
4604
# - user ask to remember or there is no previous location set to merge
4605
# from and user didn't ask to *not* remember
4606
if (user_location is not None
4608
or (remember is None
4609
and tree.branch.get_submit_branch() is None)))):
3994
4610
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4611
# Merge tags (but don't set them in the master branch yet, the user
4612
# might revert this merge). Commit will propagate them.
4613
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4614
merger = _mod_merge.Merger.from_revision_ids(tree,
3997
4615
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4616
if other_path != '':
3999
4617
allow_pending = False
4097
4715
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4716
reprocess=False):
4099
from bzrlib.conflicts import restore
4717
from .conflicts import restore
4100
4718
if merge_type is None:
4101
4719
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4720
tree, file_list = WorkingTree.open_containing_paths(file_list)
4721
self.add_cleanup(tree.lock_write().unlock)
4105
4722
parents = tree.get_parent_ids()
4106
4723
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4724
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4108
4725
" merges. Not cherrypicking or"
4110
4727
repository = tree.branch.repository
4111
interesting_ids = None
4728
interesting_files = None
4112
4729
new_conflicts = []
4113
4730
conflicts = tree.conflicts()
4114
4731
if file_list is not None:
4115
interesting_ids = set()
4732
interesting_files = set()
4116
4733
for filename in file_list:
4117
file_id = tree.path2id(filename)
4734
if not tree.is_versioned(filename):
4119
4735
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4736
interesting_files.add(filename)
4737
if tree.kind(filename) != "directory":
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4740
for path, ie in tree.iter_entries_by_dir(specific_files=[filename]):
4741
interesting_files.add(path)
4126
4742
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
4744
# Remerge only supports resolving contents conflicts
4129
4745
allowed_conflicts = ('text conflict', 'contents conflict')
4130
4746
restore_files = [c.path for c in conflicts
4131
4747
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4748
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4133
4749
tree.set_conflicts(ConflictList(new_conflicts))
4134
4750
if file_list is not None:
4135
4751
restore_files = file_list
4162
4778
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4780
Set files in the working tree back to the contents of a previous revision.
4165
4782
Giving a list of files will revert only those files. Otherwise, all files
4166
4783
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4784
working tree basis revision is used. A revert operation affects only the
4785
working tree, not any revision history like the branch and repository or
4786
the working tree basis revision.
4169
4788
To remove only some changes, without reverting to a prior version, use
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4789
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4790
will remove the changes introduced by the second last commit (-2), without
4791
affecting the changes introduced by the last commit (-1). To remove
4792
certain changes on a hunk-by-hunk basis, see the shelve command.
4793
To update the branch to a specific revision or the latest revision and
4794
update the working tree accordingly while preserving local changes, see the
4174
By default, any files that have been manually changed will be backed up
4175
first. (Files changed only by merge are not backed up.) Backup files have
4176
'.~#~' appended to their name, where # is a number.
4797
Uncommitted changes to files that are reverted will be discarded.
4798
Howver, by default, any files that have been manually changed will be
4799
backed up first. (Files changed only by merge are not backed up.) Backup
4800
files have '.~#~' appended to their name, where # is a number.
4178
4802
When you provide files, you can use their current pathname or the pathname
4179
4803
from the target revision. So you can use revert to "undelete" a file by
4419
5052
if remote_extra and not mine_only:
4420
5053
if printed_local is True:
4421
5054
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5055
message(ngettext("You are missing %d revision:\n",
5056
"You are missing %d revisions:\n",
5057
len(remote_extra)) %
4423
5058
len(remote_extra))
5059
if remote_branch.supports_tags():
5060
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5061
for revision in iter_log_revisions(remote_extra,
4425
5062
remote_branch.repository,
4427
5065
lf.log_revision(revision)
4428
5066
status_code = 1
4430
5068
if mine_only and not local_extra:
4431
5069
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5070
message(gettext('This branch has no new revisions.\n'))
4433
5071
elif theirs_only and not remote_extra:
4434
5072
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5073
message(gettext('Other branch has no new revisions.\n'))
4436
5074
elif not (mine_only or theirs_only or local_extra or
4438
5076
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5078
message(gettext("Branches are up to date.\n"))
4441
5079
self.cleanup_now()
4442
5080
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5081
self.add_cleanup(local_branch.lock_write().unlock)
4445
5082
# handle race conditions - a parent might be set while we run.
4446
5083
if local_branch.get_parent() is None:
4447
5084
local_branch.set_parent(remote_branch.base)
4578
5199
Option('long', help='Show commit date in annotations.'),
4582
5204
encoding_type = 'exact'
4584
5206
@display_command
4585
5207
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5208
show_ids=False, directory=None):
5209
from .annotate import (
4588
5212
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5213
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5214
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5215
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5217
self.add_cleanup(branch.lock_read().unlock)
4596
5218
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5219
self.add_cleanup(tree.lock_read().unlock)
5220
if wt is not None and revision is None:
4600
5221
file_id = wt.path2id(relpath)
4602
5223
file_id = tree.path2id(relpath)
4603
5224
if file_id is None:
4604
5225
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5226
if wt is not None and revision is None:
4607
5227
# If there is a tree and we're not annotating historical
4608
5228
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5229
annotate_file_tree(wt, relpath, self.outf, long, all,
5230
show_ids=show_ids, file_id=file_id)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5232
annotate_file_tree(tree, relpath, self.outf, long, all,
5233
show_ids=show_ids, branch=branch, file_id=file_id)
4616
5236
class cmd_re_sign(Command):
4620
5240
hidden = True # is this right ?
4621
5241
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5242
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5244
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5245
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5246
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5247
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5248
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5249
b = WorkingTree.open_containing(directory)[0].branch
5250
self.add_cleanup(b.lock_write().unlock)
4632
5251
return self._run(b, revision_id_list, revision)
4634
5253
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5254
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5255
if revision_id_list is not None:
4638
5256
b.repository.start_write_group()
4640
5258
for revision_id in revision_id_list:
5259
revision_id = cache_utf8.encode(revision_id)
4641
5260
b.repository.sign_revision(revision_id, gpg_strategy)
4643
5262
b.repository.abort_write_group()
4694
5313
_see_also = ['checkouts', 'unbind']
4695
5314
takes_args = ['location?']
5315
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5317
def run(self, location=None, directory=u'.'):
5318
b, relpath = Branch.open_containing(directory)
4700
5319
if location is None:
4702
5321
location = b.get_old_bound_location()
4703
5322
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5323
raise errors.BzrCommandError(gettext('No location supplied. '
5324
'This format does not remember old locations.'))
4707
5326
if location is None:
4708
5327
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5328
raise errors.BzrCommandError(
5329
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5331
raise errors.BzrCommandError(
5332
gettext('No location supplied'
5333
' and no previous location known'))
4713
5334
b_other = Branch.open(location)
4715
5336
b.bind(b_other)
4716
5337
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5338
raise errors.BzrCommandError(gettext('These branches have diverged.'
5339
' Try merging, and then bind again.'))
4719
5340
if b.get_config().has_explicit_nickname():
4720
5341
b.nick = b_other.nick
4784
5406
b = control.open_branch()
4786
5408
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5409
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5411
self.add_cleanup(b.lock_write().unlock)
5412
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
from bzrlib.log import log_formatter, show_log
4796
from bzrlib.uncommit import uncommit
5415
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5417
from .log import log_formatter, show_log
5418
from .uncommit import uncommit
4798
5420
last_revno, last_rev_id = b.last_revision_info()
4827
5449
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5452
self.outf.write(gettext('Dry-run, pretending to remove'
5453
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5455
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5458
if not ui.ui_factory.confirm_action(
5459
gettext(u'Uncommit these revisions'),
5460
'breezy.builtins.uncommit',
5462
self.outf.write(gettext('Canceled\n'))
4840
5465
mutter('Uncommitting from {%s} to {%s}',
4841
5466
last_rev_id, rev_id)
4842
5467
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5468
revno=revno, local=local, keep_tags=keep_tags)
5469
self.outf.write(gettext('You can restore the old tip by running:\n'
5470
' brz pull . -r revid:%s\n') % last_rev_id.decode('utf-8'))
4848
5473
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5474
__doc__ = """Break a dead lock.
5476
This command breaks a lock on a repository, branch, working directory or
4851
5479
CAUTION: Locks should only be broken when you are sure that the process
4852
5480
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
5482
You can get information on what locks are open via the 'brz info
4855
5483
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5487
brz break-lock brz+ssh://example.com/brz/foo
5488
brz break-lock --conf ~/.bazaar
4861
5491
takes_args = ['location?']
5494
help='LOCATION is the directory where the config lock is.'),
5496
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5499
def run(self, location=None, config=False, force=False):
4864
5500
if location is None:
4865
5501
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5503
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5505
{'breezy.lockdir.break': True})
5507
conf = _mod_config.LockableConfig(file_name=location)
5510
control, relpath = controldir.ControlDir.open_containing(location)
5512
control.break_lock()
5513
except NotImplementedError:
4873
5517
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5518
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4876
5520
This just prints a line to signal when it is ready, then blocks on stdin.
4894
5538
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5539
RegistryOption('protocol',
4896
5540
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5541
lazy_registry=('breezy.transport', 'transport_server_registry'),
4898
5542
value_switches=True),
5544
help='Listen for connections on nominated address.', type=text_type),
4900
help='Listen for connections on nominated port of the form '
4901
'[hostname:]portnumber. Passing 0 as the port number will '
4902
'result in a dynamically allocated port. The default port '
4903
'depends on the protocol.',
4906
help='Serve contents of this directory.',
5546
help='Listen for connections on nominated port. Passing 0 as '
5547
'the port number will result in a dynamically allocated '
5548
'port. The default port depends on the protocol.',
5550
custom_help('directory',
5551
help='Serve contents of this directory.'),
4908
5552
Option('allow-writes',
4909
5553
help='By default the server is a readonly server. Supplying '
4910
5554
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5555
'the served directory and below. Note that ``brz serve`` '
4912
5556
'does not perform authentication, so unless some form of '
4913
5557
'external authentication is arranged supplying this '
4914
5558
'option leads to global uncontrolled write access to your '
5561
Option('client-timeout', type=float,
5562
help='Override the default idle client timeout (5min).'),
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4932
if port is not None:
4934
host, port = port.split(':')
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5565
def run(self, listen=None, port=None, inet=False, directory=None,
5566
allow_writes=False, protocol=None, client_timeout=None):
5567
from . import transport
4941
5568
if directory is None:
4942
directory = os.getcwd()
5569
directory = osutils.getcwd()
4943
5570
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5571
protocol = transport.transport_server_registry.get()
5572
url = transport.location_to_url(directory)
4947
5573
if not allow_writes:
4948
5574
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5575
t = transport.get_transport_from_url(url)
5576
protocol(t, listen, port, inet, client_timeout)
4953
5579
class cmd_join(Command):
4973
5599
def run(self, tree, reference=False):
5600
from breezy.mutabletree import BadReferenceTarget
4974
5601
sub_tree = WorkingTree.open(tree)
4975
5602
parent_dir = osutils.dirname(sub_tree.basedir)
4976
5603
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5604
repo = containing_tree.branch.repository
4978
5605
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5606
raise errors.BzrCommandError(gettext(
4980
5607
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5608
"You can use brz upgrade on the repository.")
4985
5612
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5613
except BadReferenceTarget as e:
4987
5614
# XXX: Would be better to just raise a nicely printable
4988
5615
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5616
raise errors.BzrCommandError(
5617
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5620
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5621
except errors.BadSubsumeSource as e:
5622
raise errors.BzrCommandError(
5623
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5626
class cmd_split(Command):
5055
5683
diff='Normal unified diff.',
5056
5684
plain='No patch, just directive.'),
5057
5685
Option('sign', help='GPG-sign the directive.'), 'revision',
5058
Option('mail-to', type=str,
5686
Option('mail-to', type=text_type,
5059
5687
help='Instead of printing the directive, email to this address.'),
5060
Option('message', type=str, short_name='m',
5688
Option('message', type=text_type, short_name='m',
5061
5689
help='Message to use when committing this merge.')
5064
5692
encoding_type = 'exact'
5066
5694
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5695
sign=False, revision=None, mail_to=None, message=None,
5697
from .revision import ensure_null, NULL_REVISION
5069
5698
include_patch, include_bundle = {
5070
5699
'plain': (False, False),
5071
5700
'diff': (True, False),
5072
5701
'bundle': (True, True),
5074
branch = Branch.open('.')
5703
branch = Branch.open(directory)
5075
5704
stored_submit_branch = branch.get_submit_branch()
5076
5705
if submit_branch is None:
5077
5706
submit_branch = stored_submit_branch
5208
5844
help='Branch to generate the submission from, '
5209
5845
'rather than the one containing the working directory.',
5210
5846
short_name='f',
5212
5848
Option('output', short_name='o',
5213
5849
help='Write merge directive to this file or directory; '
5214
5850
'use - for stdout.',
5216
5852
Option('strict',
5217
5853
help='Refuse to send if there are uncommitted changes in'
5218
5854
' the working tree, --no-strict disables the check.'),
5219
5855
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5859
Option('body', help='Body for the email.', type=text_type),
5224
5860
RegistryOption('format',
5225
5861
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5862
lazy_registry=('breezy.send', 'format_registry')),
5229
5865
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5866
no_patch=False, revision=None, remember=None, output=None,
5231
5867
format=None, mail_to=None, message=None, body=None,
5232
5868
strict=None, **kwargs):
5233
from bzrlib.send import send
5869
from .send import send
5234
5870
return send(submit_branch, revision, public_branch, remember,
5235
5871
format, no_bundle, no_patch, output,
5236
5872
kwargs.get('from', '.'), mail_to, message, body,
5359
5992
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5993
self.add_cleanup(branch.lock_write().unlock)
5363
5995
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5996
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5997
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5998
note(gettext('Deleted tag %s.') % tag_name)
5369
6001
if len(revision) != 1:
5370
raise errors.BzrCommandError(
6002
raise errors.BzrCommandError(gettext(
5371
6003
"Tags can only be placed on a single revision, "
5373
6005
revision_id = revision[0].as_revision_id(branch)
5375
6007
revision_id = branch.last_revision()
5376
6008
if tag_name is None:
5377
6009
tag_name = branch.automatic_tag_name(revision_id)
5378
6010
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
6011
raise errors.BzrCommandError(gettext(
6012
"Please specify a tag name."))
6014
existing_target = branch.tags.lookup_tag(tag_name)
6015
except errors.NoSuchTag:
6016
existing_target = None
6017
if not force and existing_target not in (None, revision_id):
5382
6018
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6019
if existing_target == revision_id:
6020
note(gettext('Tag %s already exists for that revision.') % tag_name)
6022
branch.tags.set_tag(tag_name, revision_id)
6023
if existing_target is None:
6024
note(gettext('Created tag %s.') % tag_name)
6026
note(gettext('Updated tag %s.') % tag_name)
5387
6029
class cmd_tags(Command):
5393
6035
_see_also = ['tag']
5394
6036
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6037
custom_help('directory',
6038
help='Branch whose tags should be displayed.'),
6039
RegistryOption('sort',
5401
6040
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6041
lazy_registry=('breezy.tag', 'tag_sort_methods')
5409
6047
@display_command
6048
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6049
from .tag import tag_sort_methods
5416
6050
branch, relpath = Branch.open_containing(directory)
5418
tags = branch.tags.get_tag_dict().items()
6052
tags = list(viewitems(branch.tags.get_tag_dict()))
5423
self.add_cleanup(branch.unlock)
6056
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6058
# Restrict to the specified range
6059
tags = self._tags_for_range(branch, revision)
6061
sort = tag_sort_methods.get()
5444
6063
if not show_ids:
5445
6064
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6065
for index, (tag, revid) in enumerate(tags):
5448
6067
revno = branch.revision_id_to_dotted_revno(revid)
5449
6068
if isinstance(revno, tuple):
5450
6069
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
6070
except (errors.NoSuchRevision,
6071
errors.GhostRevisionsHaveNoRevno,
6072
errors.UnsupportedOperation):
5452
6073
# Bad tag data/merges can lead to tagged revisions
5453
6074
# which are not in this branch. Fail gracefully ...
5455
6076
tags[index] = (tag, revno)
6078
tags = [(tag, revid.decode('utf-8')) for (tag, revid) in tags]
5456
6079
self.cleanup_now()
5457
6080
for tag, revspec in tags:
5458
6081
self.outf.write('%-20s %s\n' % (tag, revspec))
6083
def _tags_for_range(self, branch, revision):
6085
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6086
revid1, revid2 = rev1.rev_id, rev2.rev_id
6087
# _get_revision_range will always set revid2 if it's not specified.
6088
# If revid1 is None, it means we want to start from the branch
6089
# origin which is always a valid ancestor. If revid1 == revid2, the
6090
# ancestry check is useless.
6091
if revid1 and revid1 != revid2:
6092
# FIXME: We really want to use the same graph than
6093
# branch.iter_merge_sorted_revisions below, but this is not
6094
# easily available -- vila 2011-09-23
6095
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6096
# We don't want to output anything in this case...
6098
# only show revisions between revid1 and revid2 (inclusive)
6099
tagged_revids = branch.tags.get_reverse_tag_dict()
6101
for r in branch.iter_merge_sorted_revisions(
6102
start_revision_id=revid2, stop_revision_id=revid1,
6103
stop_rule='include'):
6104
revid_tags = tagged_revids.get(r[0], None)
6106
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6110
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6111
__doc__ = """Reconfigure the type of a brz directory.
5464
6113
A target configuration must be specified.
5476
6125
takes_args = ['location?']
5477
6126
takes_options = [
5478
6127
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6130
help='The relation between branch and tree.',
5482
6131
value_switches=True, enum_switch=False,
5483
6132
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6133
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6134
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6135
lightweight_checkout='Reconfigure to be a lightweight'
5487
6136
' checkout (with no local history).',
6138
RegistryOption.from_kwargs(
6140
title='Repository type',
6141
help='Location fo the repository.',
6142
value_switches=True, enum_switch=False,
5488
6143
standalone='Reconfigure to be a standalone branch '
5489
6144
'(i.e. stop using shared repository).',
5490
6145
use_shared='Reconfigure to use a shared repository.',
6147
RegistryOption.from_kwargs(
6149
title='Trees in Repository',
6150
help='Whether new branches in the repository have trees.',
6151
value_switches=True, enum_switch=False,
5491
6152
with_trees='Reconfigure repository to create '
5492
6153
'working trees on branches by default.',
5493
6154
with_no_trees='Reconfigure repository to not create '
5494
6155
'working trees on branches by default.'
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
6157
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5497
6158
Option('force',
5498
6159
help='Perform reconfiguration even if local changes'
5499
6160
' will be lost.'),
5500
6161
Option('stacked-on',
5501
6162
help='Reconfigure a branch to be stacked on another branch.',
5504
6165
Option('unstacked',
5505
6166
help='Reconfigure a branch to be unstacked. This '
5520
6181
# At the moment you can use --stacked-on and a different
5521
6182
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6184
if (tree_type is None and
6185
repository_type is None and
6186
repository_trees is None):
5524
6187
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6190
raise errors.BzrCommandError(gettext('No target configuration '
6192
reconfiguration = None
6193
if tree_type == 'branch':
5530
6194
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6195
elif tree_type == 'tree':
5532
6196
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6197
elif tree_type == 'checkout':
5534
6198
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6199
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6200
elif tree_type == 'lightweight-checkout':
5537
6201
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6202
directory, bind_to)
5539
elif target_type == 'use-shared':
6204
reconfiguration.apply(force)
6205
reconfiguration = None
6206
if repository_type == 'use-shared':
5540
6207
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6208
elif repository_type == 'standalone':
5542
6209
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6211
reconfiguration.apply(force)
6212
reconfiguration = None
6213
if repository_trees == 'with-trees':
5544
6214
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6215
directory, True)
5546
elif target_type == 'with-no-trees':
6216
elif repository_trees == 'with-no-trees':
5547
6217
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6218
directory, False)
5549
reconfiguration.apply(force)
6220
reconfiguration.apply(force)
6221
reconfiguration = None
5552
6224
class cmd_switch(Command):
5575
6247
takes_args = ['to_location?']
5576
takes_options = [Option('force',
6248
takes_options = ['directory',
5577
6250
help='Switch even if local commits will be lost.'),
5579
6252
Option('create-branch', short_name='b',
5580
6253
help='Create the target branch from this one before'
5581
6254
' switching to it.'),
6256
help='Store and restore uncommitted changes in the'
5584
6260
def run(self, to_location=None, force=False, create_branch=False,
5586
from bzrlib import switch
6261
revision=None, directory=u'.', store=False):
6262
from . import switch
6263
tree_location = directory
5588
6264
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6265
possible_transports = []
6266
control_dir = controldir.ControlDir.open_containing(tree_location,
6267
possible_transports=possible_transports)[0]
5590
6268
if to_location is None:
5591
6269
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6270
raise errors.BzrCommandError(gettext('You must supply either a'
6271
' revision or a location'))
6272
to_location = tree_location
5596
branch = control_dir.open_branch()
6274
branch = control_dir.open_branch(
6275
possible_transports=possible_transports)
5597
6276
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6277
except errors.NotBranchError:
5600
6279
had_explicit_nick = False
5601
6280
if create_branch:
5602
6281
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6282
raise errors.BzrCommandError(
6283
gettext('cannot create branch without source branch'))
6284
to_location = lookup_new_sibling_branch(control_dir, to_location,
6285
possible_transports=possible_transports)
6286
to_branch = branch.controldir.sprout(to_location,
6287
possible_transports=possible_transports,
6288
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6291
to_branch = Branch.open(to_location,
6292
possible_transports=possible_transports)
5617
6293
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6294
to_branch = open_sibling_branch(control_dir, to_location,
6295
possible_transports=possible_transports)
5621
6296
if revision is not None:
5622
6297
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6299
switch.switch(control_dir, to_branch, force, revision_id=revision,
6300
store_uncommitted=store)
6301
except controldir.BranchReferenceLoop:
6302
raise errors.BzrCommandError(
6303
gettext('switching would create a branch reference loop. '
6304
'Use the "bzr up" command to switch to a '
6305
'different revision.'))
5624
6306
if had_explicit_nick:
5625
6307
branch = control_dir.open_branch() #get the new branch!
5626
6308
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6309
note(gettext('Switched to branch: %s'),
5628
6310
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5648
6314
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6401
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6403
current_view, view_dict = tree.views.get_view_info()
5737
6404
if name is None:
5738
6405
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6408
raise errors.BzrCommandError(gettext(
6409
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6411
raise errors.BzrCommandError(gettext(
6412
"Both --delete and --switch specified"))
5747
6414
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6415
self.outf.write(gettext("Deleted all views.\n"))
5749
6416
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6417
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6419
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6420
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6423
raise errors.BzrCommandError(gettext(
6424
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6426
raise errors.BzrCommandError(gettext(
6427
"Both --switch and --all specified"))
5761
6428
elif switch == 'off':
5762
6429
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6430
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6431
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6432
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6434
tree.views.set_view_info(switch, view_dict)
5768
6435
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6436
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6439
self.outf.write(gettext('Views defined:\n'))
5773
6440
for view in sorted(view_dict):
5774
6441
if view == current_view:
5778
6445
view_str = views.view_display_str(view_dict[view])
5779
6446
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6448
self.outf.write(gettext('No views defined.\n'))
5782
6449
elif file_list:
5783
6450
if name is None:
5784
6451
# No name given and no current view set
5786
6453
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6454
raise errors.BzrCommandError(gettext(
6455
"Cannot change the 'off' pseudo view"))
5789
6456
tree.views.set_view(name, sorted(file_list))
5790
6457
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6458
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6460
# list the files
5794
6461
if name is None:
5795
6462
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6463
self.outf.write(gettext('No current view.\n'))
5798
6465
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6466
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6469
class cmd_hooks(Command):
5830
6497
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
6499
brz remove-branch repo/trunk
5836
6503
takes_args = ["location?"]
6505
takes_options = ['directory',
6506
Option('force', help='Remove branch even if it is the active branch.')]
5838
6508
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
6510
def run(self, directory=None, location=None, force=False):
6511
br = open_nearby_branch(near=directory, location=location)
6512
if not force and br.controldir.has_workingtree():
6514
active_branch = br.controldir.open_branch(name="")
6515
except errors.NotBranchError:
6516
active_branch = None
6517
if (active_branch is not None and
6518
br.control_url == active_branch.control_url):
6519
raise errors.BzrCommandError(
6520
gettext("Branch is active. Use --force to remove it."))
6521
br.controldir.destroy_branch(br.name)
5847
6524
class cmd_shelve(Command):
5848
6525
__doc__ = """Temporarily set aside some changes from the current tree.
5868
6545
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6546
restore the most recently shelved changes.
6548
For complicated changes, it is possible to edit the changes in a separate
6549
editor program to decide what the file remaining in the working copy
6550
should look like. To do this, add the configuration option
6552
change_editor = PROGRAM @new_path @old_path
6554
where @new_path is replaced with the path of the new version of the
6555
file and @old_path is replaced with the path of the old version of
6556
the file. The PROGRAM should save the new file with the desired
6557
contents of the file in the working tree.
5872
6561
takes_args = ['file*']
5874
6563
takes_options = [
5876
6566
Option('all', help='Shelve all changes.'),
5878
6568
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6569
breezy.option.diff_writer_registry,
5880
6570
value_switches=True, enum_switch=False),
5882
6572
Option('list', help='List shelved changes.'),
5883
6573
Option('destroy',
5884
6574
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6576
_see_also = ['unshelve', 'configuration']
5888
6578
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6579
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6581
return self.run_for_list(directory=directory)
6582
from .shelf_ui import Shelver
5893
6583
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6584
writer = breezy.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6586
shelver = Shelver.from_args(writer(self.outf), revision, all,
6587
file_list, message, destroy=destroy, directory=directory)
5967
6659
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6661
takes_options = ['directory',
6662
Option('ignored', help='Delete all ignored files.'),
6663
Option('detritus', help='Delete conflict files, merge and revert'
5971
6664
' backups, and failed selftest dirs.'),
5972
6665
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6666
help='Delete files unknown to brz (default).'),
5974
6667
Option('dry-run', help='Show files to delete instead of'
5975
6668
' deleting them.'),
5976
6669
Option('force', help='Do not prompt before deleting.')]
5977
6670
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
6671
force=False, directory=u'.'):
6672
from .clean_tree import clean_tree
5980
6673
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6677
clean_tree(directory, unknown=unknown, ignored=ignored,
6678
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6681
class cmd_reference(Command):
6002
6695
if path is not None:
6003
6696
branchdir = path
6004
6697
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6698
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6006
6699
if path is not None:
6008
6701
if tree is None:
6009
6702
tree = branch.basis_tree()
6010
6703
if path is None:
6011
info = branch._get_all_reference_info().iteritems()
6704
info = viewitems(branch._get_all_reference_info())
6012
6705
self._display_reference_info(tree, branch, info)
6014
file_id = tree.path2id(path)
6707
if not tree.is_versioned(path):
6016
6708
raise errors.NotVersionedError(path)
6017
6709
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6710
info = [(path, branch.get_reference_info(path))]
6019
6711
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6713
branch.set_reference_info(
6714
path, location, file_id=tree.path2id(path))
6023
6716
def _display_reference_info(self, tree, branch, info):
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6718
for path, (location, file_id) in info:
6030
6719
ref_list.append((path, location))
6031
6720
for path, location in sorted(ref_list):
6032
6721
self.outf.write('%s %s\n' % (path, location))
6724
class cmd_export_pot(Command):
6725
__doc__ = """Export command helps and error messages in po format."""
6728
takes_options = [Option('plugin',
6729
help='Export help text from named command '\
6730
'(defaults to all built in commands).',
6732
Option('include-duplicates',
6733
help='Output multiple copies of the same msgid '
6734
'string if it appears more than once.'),
6737
def run(self, plugin=None, include_duplicates=False):
6738
from .export_pot import export_pot
6739
export_pot(self.outf, plugin, include_duplicates)
6742
class cmd_import(Command):
6743
__doc__ = """Import sources from a directory, tarball or zip file
6745
This command will import a directory, tarball or zip file into a bzr
6746
tree, replacing any versioned files already present. If a directory is
6747
specified, it is used as the target. If the directory does not exist, or
6748
is not versioned, it is created.
6750
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6752
If the tarball or zip has a single root directory, that directory is
6753
stripped when extracting the tarball. This is not done for directories.
6756
takes_args = ['source', 'tree?']
6758
def run(self, source, tree=None):
6759
from .upstream_import import do_import
6760
do_import(source, tree)
6763
class cmd_link_tree(Command):
6764
__doc__ = """Hardlink matching files to another tree.
6766
Only files with identical content and execute bit will be linked.
6769
takes_args = ['location']
6771
def run(self, location):
6772
from .transform import link_tree
6773
target_tree = WorkingTree.open_containing(".")[0]
6774
source_tree = WorkingTree.open(location)
6775
with target_tree.lock_write(), source_tree.lock_read():
6776
link_tree(target_tree, source_tree)
6779
class cmd_fetch_ghosts(Command):
6780
__doc__ = """Attempt to retrieve ghosts from another branch.
6782
If the other branch is not supplied, the last-pulled branch is used.
6786
aliases = ['fetch-missing']
6787
takes_args = ['branch?']
6788
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6790
def run(self, branch=None, no_fix=False):
6791
from .fetch_ghosts import GhostFetcher
6792
installed, failed = GhostFetcher.from_cmdline(branch).run()
6793
if len(installed) > 0:
6794
self.outf.write("Installed:\n")
6795
for rev in installed:
6796
self.outf.write(rev.decode('utf-8') + "\n")
6798
self.outf.write("Still missing:\n")
6800
self.outf.write(rev.decode('utf-8') + "\n")
6801
if not no_fix and len(installed) > 0:
6802
cmd_reconcile().run(".")
6035
6805
def _register_lazy_builtins():
6036
6806
# register lazy builtins from other modules; called at startup and should
6037
6807
# be only called once.
6038
6808
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6809
('cmd_bisect', [], 'breezy.bisect'),
6810
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6811
('cmd_config', [], 'breezy.config'),
6812
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
6813
('cmd_version_info', [], 'breezy.cmd_version_info'),
6814
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6815
('cmd_conflicts', [], 'breezy.conflicts'),
6816
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6817
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6818
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6819
('cmd_test_script', [], 'breezy.cmd_test_script'),
6046
6821
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
