46
52
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
61
from breezy.branch import Branch
62
from breezy.conflicts import ConflictList
63
from breezy.transport import memory
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
69
from .commands import (
65
71
builtin_command_registry,
68
from bzrlib.option import (
73
79
_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]))
81
from .revisionspec import (
92
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
95
def _get_branch_location(control_dir, possible_transports=None):
96
"""Return location of branch for this control dir."""
98
target = control_dir.get_branch_reference()
99
except errors.NotBranchError:
100
return control_dir.root_transport.base
101
if target is not None:
103
this_branch = control_dir.open_branch(
104
possible_transports=possible_transports)
105
# This may be a heavy checkout, where we want the master branch
106
master_location = this_branch.get_bound_location()
107
if master_location is not None:
108
return master_location
109
# If not, use a local sibling
110
return this_branch.base
113
def _is_colocated(control_dir, possible_transports=None):
114
"""Check if the branch in control_dir is colocated.
116
:param control_dir: Control directory
117
:return: Tuple with boolean indicating whether the branch is colocated
118
and the full URL to the actual branch
120
# This path is meant to be relative to the existing branch
121
this_url = _get_branch_location(control_dir,
122
possible_transports=possible_transports)
123
# Perhaps the target control dir supports colocated branches?
125
root = controldir.ControlDir.open(this_url,
126
possible_transports=possible_transports)
127
except errors.NotBranchError:
128
return (False, this_url)
131
wt = control_dir.open_workingtree()
132
except (errors.NoWorkingTree, errors.NotLocalUrl):
133
return (False, this_url)
136
root._format.colocated_branches and
137
control_dir.control_url == root.control_url,
141
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
142
"""Lookup the location for a new sibling branch.
144
:param control_dir: Control directory to find sibling branches from
145
:param location: Name of the new branch
146
:return: Full location to the new branch
148
location = directory_service.directories.dereference(location)
149
if '/' not in location and '\\' not in location:
150
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
153
return urlutils.join_segment_parameters(this_url,
154
{"branch": urlutils.escape(location)})
156
return urlutils.join(this_url, '..', urlutils.escape(location))
160
def open_sibling_branch(control_dir, location, possible_transports=None):
161
"""Open a branch, possibly a sibling of another.
163
:param control_dir: Control directory relative to which to lookup the
165
:param location: Location to look up
166
:return: branch to open
169
# Perhaps it's a colocated branch?
170
return control_dir.open_branch(location,
171
possible_transports=possible_transports)
172
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
173
this_url = _get_branch_location(control_dir)
176
this_url, '..', urlutils.escape(location)))
179
def open_nearby_branch(near=None, location=None, possible_transports=None):
180
"""Open a nearby branch.
182
:param near: Optional location of container from which to open branch
183
:param location: Location of the branch
184
:return: Branch instance
190
return Branch.open(location,
191
possible_transports=possible_transports)
192
except errors.NotBranchError:
194
cdir = controldir.ControlDir.open(near,
195
possible_transports=possible_transports)
196
return open_sibling_branch(cdir, location,
197
possible_transports=possible_transports)
200
def iter_sibling_branches(control_dir, possible_transports=None):
201
"""Iterate over the siblings of a branch.
203
:param control_dir: Control directory for which to look up the siblings
204
:return: Iterator over tuples with branch name and branch object
208
reference = control_dir.get_branch_reference()
209
except errors.NotBranchError:
210
# There is no active branch, just return the colocated branches.
211
for name, branch in viewitems(control_dir.get_branches()):
214
if reference is not None:
215
ref_branch = Branch.open(reference,
216
possible_transports=possible_transports)
219
if ref_branch is None or ref_branch.name:
220
if ref_branch is not None:
221
control_dir = ref_branch.controldir
222
for name, branch in viewitems(control_dir.get_branches()):
225
repo = ref_branch.controldir.find_repository()
226
for branch in repo.find_branches(using=True):
227
name = urlutils.relative_url(repo.user_url,
228
branch.user_url).rstrip("/")
88
232
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
223
297
def _get_view_info_for_change_reporter(tree):
224
298
"""Get the view information from a tree for change reporting."""
342
434
takes_args = ['revision_id?']
343
takes_options = ['revision']
435
takes_options = ['directory', 'revision']
344
436
# cat-revision is more for frontends so should be exact
345
437
encoding = 'strict'
347
439
def print_revision(self, revisions, revid):
348
440
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
441
record = next(stream)
350
442
if record.storage_kind == 'absent':
351
443
raise errors.NoSuchRevision(revisions, revid)
352
444
revtext = record.get_bytes_as('fulltext')
353
445
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
448
def run(self, revision_id=None, revision=None, directory=u'.'):
357
449
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')
450
raise errors.BzrCommandError(gettext('You can only supply one of'
451
' revision_id or --revision'))
360
452
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
453
raise errors.BzrCommandError(gettext('You must supply either'
454
' --revision or a revision_id'))
456
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
458
revisions = b.repository.revisions
366
459
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
460
raise errors.BzrCommandError(gettext('Repository %r does not support '
461
'access to raw revision texts'))
370
b.repository.lock_read()
463
with b.repository.lock_read():
372
464
# TODO: jam 20060112 should cat-revision always output utf-8?
373
465
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
466
revision_id = cache_utf8.encode(revision_id)
376
468
self.print_revision(revisions, revision_id)
377
469
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
470
msg = gettext("The repository {0} contains no revision {1}.").format(
471
b.repository.base, revision_id.decode('utf-8'))
380
472
raise errors.BzrCommandError(msg)
381
473
elif revision is not None:
382
474
for rev in revision:
384
476
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
477
gettext('You cannot specify a NULL revision.'))
386
478
rev_id = rev.as_revision_id(b)
387
479
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
482
class cmd_remove_tree(Command):
491
500
location_list=['.']
493
502
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
503
d = controldir.ControlDir.open(location)
497
506
working = d.open_workingtree()
498
507
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
508
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
509
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
510
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
511
" of a remote path"))
504
513
if (working.has_changes()):
505
514
raise errors.UncommittedChanges(working)
515
if working.get_shelf_manager().last_shelf() is not None:
516
raise errors.ShelvedChanges(working)
507
518
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
519
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
520
" from a lightweight checkout"))
511
522
d.destroy_workingtree()
525
class cmd_repair_workingtree(Command):
526
__doc__ = """Reset the working tree state file.
528
This is not meant to be used normally, but more as a way to recover from
529
filesystem corruption, etc. This rebuilds the working inventory back to a
530
'known good' state. Any new modifications (adding a file, renaming, etc)
531
will be lost, though modified files will still be detected as such.
533
Most users will want something more like "brz revert" or "brz update"
534
unless the state file has become corrupted.
536
By default this attempts to recover the current state by looking at the
537
headers of the state file. If the state file is too corrupted to even do
538
that, you can supply --revision to force the state of the tree.
541
takes_options = ['revision', 'directory',
543
help='Reset the tree even if it doesn\'t appear to be'
548
def run(self, revision=None, directory='.', force=False):
549
tree, _ = WorkingTree.open_containing(directory)
550
self.add_cleanup(tree.lock_tree_write().unlock)
554
except errors.BzrError:
555
pass # There seems to be a real error here, so we'll reset
558
raise errors.BzrCommandError(gettext(
559
'The tree does not appear to be corrupt. You probably'
560
' want "brz revert" instead. Use "--force" if you are'
561
' sure you want to reset the working tree.'))
565
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
567
tree.reset_state(revision_ids)
568
except errors.BzrError as e:
569
if revision_ids is None:
570
extra = (gettext(', the header appears corrupt, try passing -r -1'
571
' to set the state to the last commit'))
574
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
577
class cmd_revno(Command):
515
578
__doc__ = """Show current revision number.
520
583
_see_also = ['info']
521
584
takes_args = ['location?']
522
585
takes_options = [
523
Option('tree', help='Show revno of working tree'),
586
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
591
def run(self, tree=False, location=u'.', revision=None):
592
if revision is not None and tree:
593
raise errors.BzrCommandError(gettext("--tree and --revision can "
594
"not be used together"))
530
598
wt = WorkingTree.open_containing(location)[0]
599
self.add_cleanup(wt.lock_read().unlock)
532
600
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
601
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
603
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
605
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
606
self.add_cleanup(b.lock_read().unlock)
608
if len(revision) != 1:
609
raise errors.BzrCommandError(gettext(
610
"Revision numbers only make sense for single "
611
"revisions, not ranges"))
612
revid = revision[0].as_revision_id(b)
614
revid = b.last_revision()
616
revno_t = b.revision_id_to_dotted_revno(revid)
617
except errors.NoSuchRevision:
619
revno = ".".join(str(n) for n in revno_t)
546
620
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
621
self.outf.write(revno + '\n')
550
624
class cmd_revision_info(Command):
675
752
base_tree = base_branch.basis_tree()
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
754
action = breezy.add.AddFromBaseAction(base_tree, base_path,
678
755
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
757
action = breezy.add.AddWithSkipLargeAction(to_file=self.outf,
681
758
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
761
self.add_cleanup(base_tree.lock_read().unlock)
686
762
tree, file_list = tree_files_for_add(file_list)
687
763
added, ignored = tree.smart_add(file_list, not
688
764
no_recurse, action=action, save=not dry_run)
689
765
self.cleanup_now()
690
766
if len(ignored) > 0:
692
for glob in sorted(ignored.keys()):
768
for glob in sorted(ignored):
693
769
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
771
gettext("ignored {0} matching \"{1}\"\n").format(
698
775
class cmd_mkdir(Command):
751
853
help='List entries of a particular kind: file, directory, symlink.',
754
856
takes_args = ['file*']
757
859
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
860
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
861
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
863
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)
864
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
865
self.add_cleanup(work_tree.lock_read().unlock)
765
866
if revision is not None:
766
867
tree = revision.as_tree(work_tree.branch)
768
869
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
870
self.add_cleanup(tree.lock_read().unlock)
875
self.add_cleanup(tree.lock_read().unlock)
775
876
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
877
paths = tree.find_related_paths_across_trees(
878
file_list, extra_trees, require_versioned=True)
778
879
# find_ids_across_trees may include some paths that don't
779
880
# 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)
881
entries = tree.iter_entries_by_dir(specific_files=paths)
783
entries = tree.inventory.entries()
883
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
885
for path, entry in sorted(entries):
787
886
if kind and kind != entry.kind:
790
891
self.outf.write('%-50s %s\n' % (path, entry.file_id))
793
894
self.outf.write('\n')
897
class cmd_cp(Command):
898
__doc__ = """Copy a file.
901
brz cp OLDNAME NEWNAME
903
brz cp SOURCE... DESTINATION
905
If the last argument is a versioned directory, all the other names
906
are copied into it. Otherwise, there must be exactly two arguments
907
and the file is copied to a new name.
909
Files cannot be copied between branches. Only files can be copied
913
takes_args = ['names*']
916
encoding_type = 'replace'
918
def run(self, names_list):
920
if names_list is None:
922
if len(names_list) < 2:
923
raise errors.BzrCommandError(gettext("missing file argument"))
924
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
925
for file_name in rel_names[0:-1]:
927
raise errors.BzrCommandError(gettext("can not copy root of branch"))
928
self.add_cleanup(tree.lock_tree_write().unlock)
929
into_existing = osutils.isdir(names_list[-1])
930
if not into_existing:
932
(src, dst) = rel_names
934
raise errors.BzrCommandError(gettext('to copy multiple files the'
935
' destination must be a versioned'
939
pairs = [(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
940
for n in rel_names[:-1]]
942
for src, dst in pairs:
944
src_kind = tree.stored_kind(src)
945
except errors.NoSuchFile:
946
raise errors.BzrCommandError(
947
gettext('Could not copy %s => %s: %s is not versioned.')
950
raise errors.BzrCommandError(
951
gettext('Could not copy %s => %s . %s is not versioned\\.'
953
if src_kind == 'directory':
954
raise errors.BzrCommandError(
955
gettext('Could not copy %s => %s . %s is a directory.'
957
dst_parent = osutils.split(dst)[0]
960
dst_parent_kind = tree.stored_kind(dst_parent)
961
except errors.NoSuchFile:
962
raise errors.BzrCommandError(
963
gettext('Could not copy %s => %s: %s is not versioned.')
964
% (src, dst, dst_parent))
965
if dst_parent_kind != 'directory':
966
raise errors.BzrCommandError(
967
gettext('Could not copy to %s: %s is not a directory.')
968
% (dst_parent, dst_parent))
970
tree.copy_one(src, dst)
796
973
class cmd_mv(Command):
797
974
__doc__ = """Move or rename a file.
800
bzr mv OLDNAME NEWNAME
977
brz mv OLDNAME NEWNAME
802
bzr mv SOURCE... DESTINATION
979
brz mv SOURCE... DESTINATION
804
981
If the last argument is a versioned directory, all the other names
805
982
are moved into it. Otherwise, there must be exactly two arguments
828
1005
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1007
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1008
if names_list is None:
833
1010
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)
1011
raise errors.BzrCommandError(gettext("missing file argument"))
1012
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1013
for file_name in rel_names[0:-1]:
1015
raise errors.BzrCommandError(gettext("can not move root of branch"))
1016
self.add_cleanup(tree.lock_tree_write().unlock)
838
1017
self._run(tree, names_list, rel_names, after)
840
1019
def run_auto(self, names_list, after, dry_run):
841
1020
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1021
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)
1024
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1026
work_tree, file_list = WorkingTree.open_containing_paths(
1027
names_list, default_directory='.')
1028
self.add_cleanup(work_tree.lock_tree_write().unlock)
1029
rename_map.RenameMap.guess_renames(
1030
work_tree.basis_tree(), work_tree, dry_run)
852
1032
def _run(self, tree, names_list, rel_names, after):
853
1033
into_existing = osutils.isdir(names_list[-1])
946
1125
match the remote one, use pull --overwrite. This will work even if the two
947
1126
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.
1128
If there is no default location set, the first pull will set it (use
1129
--no-remember to avoid setting it). After that, you can omit the
1130
location to use the default. To change the default, use --remember. The
1131
value will only be saved if the remote location can be accessed.
1133
The --verbose option will display the revisions pulled using the log_format
1134
configuration option. You can use a different format by overriding it with
1135
-Olog_format=<other_format>.
954
1137
Note: The location can be specified either in the form of a branch,
955
1138
or in the form of a path to a file containing a merge directive generated
959
1142
_see_also = ['push', 'update', 'status-flags', 'send']
960
1143
takes_options = ['remember', 'overwrite', 'revision',
961
1144
custom_help('verbose',
962
1145
help='Show logs of pulled revisions.'),
1146
custom_help('directory',
964
1147
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1148
'rather than the one containing the working directory.'),
970
1150
help="Perform a local pull in a bound "
971
1151
"branch. Local pulls are not applied to "
972
1152
"the master branch."
1155
help="Show base revision text in conflicts."),
1156
Option('overwrite-tags',
1157
help="Overwrite tags only."),
975
1159
takes_args = ['location?']
976
1160
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1162
def run(self, location=None, remember=None, overwrite=False,
979
1163
revision=None, verbose=False,
980
directory=None, local=False):
1164
directory=None, local=False,
1165
show_base=False, overwrite_tags=False):
1168
overwrite = ["history", "tags"]
1169
elif overwrite_tags:
1170
overwrite = ["tags"]
981
1173
# FIXME: too much stuff is in the command class
982
1174
revision_id = None
983
1175
mergeable = None
1070
1268
considered diverged if the destination branch's most recent commit is one
1071
1269
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
1271
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1272
the other branch completely, discarding its unmerged changes.
1076
1274
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.
1275
do a merge (see brz help merge) from the other branch, and commit that.
1078
1276
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.
1278
If there is no default push location set, the first push will set it (use
1279
--no-remember to avoid setting it). After that, you can omit the
1280
location to use the default. To change the default, use --remember. The
1281
value will only be saved if the remote location can be accessed.
1283
The --verbose option will display the revisions pushed using the log_format
1284
configuration option. You can use a different format by overriding it with
1285
-Olog_format=<other_format>.
1086
1288
_see_also = ['pull', 'update', 'working-trees']
1106
1305
help='Create a stacked branch that refers to another branch '
1107
1306
'for the commit history. Only the work not present in the '
1108
1307
'referenced branch is included in the branch created.',
1110
1309
Option('strict',
1111
1310
help='Refuse to push if there are uncommitted changes in'
1112
1311
' the working tree, --no-strict disables the check.'),
1313
help="Don't populate the working tree, even for protocols"
1314
" that support it."),
1315
Option('overwrite-tags',
1316
help="Overwrite tags only."),
1317
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1318
"that can't be represented in the target.")
1114
1320
takes_args = ['location?']
1115
1321
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1323
def run(self, location=None, remember=None, overwrite=False,
1118
1324
create_prefix=False, verbose=False, revision=None,
1119
1325
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1326
stacked=False, strict=None, no_tree=False,
1327
overwrite_tags=False, lossy=False):
1328
from .push import _show_push_branch
1331
overwrite = ["history", "tags"]
1332
elif overwrite_tags:
1333
overwrite = ["tags"]
1123
1337
if directory is None:
1124
1338
directory = '.'
1125
1339
# Get the source branch
1126
1340
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1341
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1342
# Get the tip's revision_id
1129
1343
revision = _get_one_revision('push', revision)
1130
1344
if revision is not None:
1151
1365
# error by the feedback given to them. RBC 20080227.
1152
1366
stacked_on = parent_url
1153
1367
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1368
raise errors.BzrCommandError(gettext(
1369
"Could not determine branch to refer to."))
1157
1371
# Get the destination location
1158
1372
if location is None:
1159
1373
stored_loc = br_from.get_push_location()
1160
1374
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1375
parent_loc = br_from.get_parent()
1377
raise errors.BzrCommandError(gettext(
1378
"No push location known or specified. To push to the "
1379
"parent branch (at %s), use 'brz push :parent'." %
1380
urlutils.unescape_for_display(parent_loc,
1381
self.outf.encoding)))
1383
raise errors.BzrCommandError(gettext(
1384
"No push location known or specified."))
1164
1386
display_url = urlutils.unescape_for_display(stored_loc,
1165
1387
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1388
note(gettext("Using saved push location: %s") % display_url)
1167
1389
location = stored_loc
1169
1391
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1392
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1393
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1394
use_existing_dir=use_existing_dir, no_tree=no_tree,
1175
1398
class cmd_branch(Command):
1210
1435
help="Bind new branch to from location."),
1212
aliases = ['get', 'clone']
1214
1438
def run(self, from_location, to_location=None, revision=None,
1215
1439
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(
1440
use_existing_dir=False, switch=False, bind=False,
1442
from breezy import switch as _mod_switch
1443
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1445
if not (hardlink or files_from):
1446
# accelerator_tree is usually slower because you have to read N
1447
# files (no readahead, lots of seeks, etc), but allow the user to
1448
# explicitly request it
1449
accelerator_tree = None
1450
if files_from is not None and files_from != from_location:
1451
accelerator_tree = WorkingTree.open(files_from)
1221
1452
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1453
self.add_cleanup(br_from.lock_read().unlock)
1224
1454
if revision is not None:
1225
1455
revision_id = revision.as_revision_id(br_from)
1230
1460
revision_id = br_from.last_revision()
1231
1461
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1462
to_location = getattr(br_from, "name", None)
1464
to_location = urlutils.derive_to_location(from_location)
1233
1465
to_transport = transport.get_transport(to_location)
1235
1467
to_transport.mkdir('.')
1236
1468
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1470
to_dir = controldir.ControlDir.open_from_transport(
1472
except errors.NotBranchError:
1473
if not use_existing_dir:
1474
raise errors.BzrCommandError(gettext('Target directory "%s" '
1475
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1480
to_dir.open_branch()
1243
1481
except errors.NotBranchError:
1246
1484
raise errors.AlreadyBranchError(to_location)
1247
1485
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1486
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)
1492
# preserve whatever source format we have.
1493
to_dir = br_from.controldir.sprout(
1494
to_transport.base, revision_id,
1495
possible_transports=[to_transport],
1496
accelerator_tree=accelerator_tree, hardlink=hardlink,
1497
stacked=stacked, force_new_repo=standalone,
1498
create_tree_if_local=not no_tree, source_branch=br_from)
1499
branch = to_dir.open_branch(
1500
possible_transports=[
1501
br_from.controldir.root_transport, to_transport])
1502
except errors.NoSuchRevision:
1503
to_transport.delete_tree('.')
1504
msg = gettext("The branch {0} has no revision {1}.").format(
1505
from_location, revision)
1506
raise errors.BzrCommandError(msg)
1509
to_repo = to_dir.open_repository()
1510
except errors.NoRepositoryPresent:
1511
to_repo = to_dir.create_repository()
1512
to_repo.fetch(br_from.repository, revision_id=revision_id)
1513
branch = br_from.sprout(to_dir, revision_id=revision_id)
1514
br_from.tags.merge_to(branch.tags)
1266
1516
# If the source branch is stacked, the new branch may
1267
1517
# be stacked whether we asked for that explicitly or not.
1268
1518
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1520
note(gettext('Created new stacked branch referring to %s.') %
1271
1521
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1522
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1523
errors.UnstackableRepositoryFormat) as e:
1524
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1526
# Bind to the parent
1277
1527
parent_branch = Branch.open(from_location)
1278
1528
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1529
note(gettext('New branch bound to %s') % from_location)
1281
1531
# Switch to the new branch
1282
1532
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1533
_mod_switch.switch(wt.controldir, branch)
1534
note(gettext('Switched to branch: %s'),
1285
1535
urlutils.unescape_for_display(branch.base, 'utf-8'))
1538
class cmd_branches(Command):
1539
__doc__ = """List the branches available at the current location.
1541
This command will print the names of all the branches at the current
1545
takes_args = ['location?']
1547
Option('recursive', short_name='R',
1548
help='Recursively scan for branches rather than '
1549
'just looking in the specified location.')]
1551
def run(self, location=".", recursive=False):
1553
t = transport.get_transport(location)
1554
if not t.listable():
1555
raise errors.BzrCommandError(
1556
"Can't scan this type of location.")
1557
for b in controldir.ControlDir.find_branches(t):
1558
self.outf.write("%s\n" % urlutils.unescape_for_display(
1559
urlutils.relative_url(t.base, b.base),
1560
self.outf.encoding).rstrip("/"))
1562
dir = controldir.ControlDir.open_containing(location)[0]
1564
active_branch = dir.open_branch(name="")
1565
except errors.NotBranchError:
1566
active_branch = None
1568
for name, branch in iter_sibling_branches(dir):
1571
active = (active_branch is not None and
1572
active_branch.user_url == branch.user_url)
1573
names[name] = active
1574
# Only mention the current branch explicitly if it's not
1575
# one of the colocated branches
1576
if not any(viewvalues(names)) and active_branch is not None:
1577
self.outf.write("* %s\n" % gettext("(default)"))
1578
for name in sorted(names):
1579
active = names[name]
1584
self.outf.write("%s %s\n" % (
1585
prefix, (name if PY3 else name.encode(self.outf.encoding))))
1288
1588
class cmd_checkout(Command):
1289
1589
__doc__ = """Create a new checkout of an existing branch.
1389
1690
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
1691
__doc__ = """Update a working tree to a new revision.
1693
This will perform a merge of the destination revision (the tip of the
1694
branch, or the specified revision) into the working tree, and then make
1695
that revision the basis revision for the working tree.
1697
You can use this to visit an older revision, or to update a working tree
1698
that is out of date from its branch.
1700
If there are any uncommitted changes in the tree, they will be carried
1701
across and remain as uncommitted changes after the update. To discard
1702
these changes, use 'brz revert'. The uncommitted changes may conflict
1703
with the changes brought in by the change in basis revision.
1705
If the tree's branch is bound to a master branch, brz will also update
1400
1706
the branch from the master.
1708
You cannot update just a single file or directory, because each Bazaar
1709
working tree has just a single basis revision. If you want to restore a
1710
file that has been removed locally, use 'brz revert' instead of 'brz
1711
update'. If you want to restore a file to its state in a previous
1712
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1713
out the old content of that file to a new location.
1715
The 'dir' argument, if given, must be the location of the root of a
1716
working tree to update. By default, the working tree that contains the
1717
current working directory is used.
1403
1720
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1721
takes_args = ['dir?']
1405
takes_options = ['revision']
1722
takes_options = ['revision',
1724
help="Show base revision text in conflicts."),
1406
1726
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1728
def run(self, dir=None, revision=None, show_base=None):
1409
1729
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]
1730
raise errors.BzrCommandError(gettext(
1731
"brz update --revision takes exactly one revision"))
1733
tree = WorkingTree.open_containing('.')[0]
1735
tree, relpath = WorkingTree.open_containing(dir)
1738
raise errors.BzrCommandError(gettext(
1739
"brz update can only update a whole tree, "
1740
"not a file or subdirectory"))
1413
1741
branch = tree.branch
1414
1742
possible_transports = []
1415
1743
master = branch.get_master_branch(
1416
1744
possible_transports=possible_transports)
1417
1745
if master is not None:
1419
1746
branch_location = master.base
1749
branch_location = tree.branch.base
1421
1750
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1751
self.add_cleanup(tree.unlock)
1424
1752
# get rid of the final '/' and be ready for display
1425
1753
branch_location = urlutils.unescape_for_display(
1451
1779
change_reporter,
1452
1780
possible_transports=possible_transports,
1453
1781
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1783
show_base=show_base)
1784
except errors.NoSuchRevision as e:
1785
raise errors.BzrCommandError(gettext(
1457
1786
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1787
"brz update --revision only works"
1788
" for a revision in the branch history")
1460
1789
% (e.revision))
1461
1790
revno = tree.branch.revision_id_to_dotted_revno(
1462
1791
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1792
note(gettext('Updated to revision {0} of branch {1}').format(
1793
'.'.join(map(str, revno)), branch_location))
1465
1794
parent_ids = tree.get_parent_ids()
1466
1795
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'.")
1796
note(gettext('Your local commits will now show as pending merges with '
1797
"'brz status', and can be committed with 'brz commit'."))
1469
1798
if conflicts != 0:
1530
1860
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1861
'The file deletion mode to be used.',
1532
1862
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.')]
1863
safe='Backup changed files (default).',
1864
keep='Delete from brz but leave the working copy.',
1865
no_backup='Don\'t backup changed files.'),
1538
1867
aliases = ['rm', 'del']
1539
1868
encoding_type = 'replace'
1541
1870
def run(self, file_list, verbose=False, new=False,
1542
1871
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1873
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1875
if file_list is not None:
1546
1876
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1878
self.add_cleanup(tree.lock_write().unlock)
1550
1879
# Heuristics should probably all move into tree.remove_smart or
1742
2087
to_transport.ensure_base()
1743
2088
except errors.NoSuchFile:
1744
2089
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2090
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2091
" does not exist."
1747
2092
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2093
" leading parent directories.")
1750
2095
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2098
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1754
2099
except errors.NotBranchError:
1755
2100
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2101
create_branch = controldir.ControlDir.create_branch_convenience
2103
force_new_tree = False
2105
force_new_tree = None
1757
2106
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2107
possible_transports=[to_transport],
2108
force_new_tree=force_new_tree)
2109
a_controldir = branch.controldir
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2111
from .transport.local import LocalTransport
2112
if a_controldir.has_branch():
1763
2113
if (isinstance(to_transport, LocalTransport)
1764
and not a_bzrdir.has_workingtree()):
2114
and not a_controldir.has_workingtree()):
1765
2115
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2116
raise errors.AlreadyBranchError(location)
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2117
branch = a_controldir.create_branch()
2118
if not no_tree and not a_controldir.has_workingtree():
2119
a_controldir.create_workingtree()
1769
2120
if append_revisions_only:
1771
2122
branch.set_append_revisions_only(True)
1772
2123
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2124
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2125
' to append-revisions-only. Try --default.'))
1775
2126
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2127
from .info import describe_layout, describe_format
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2129
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1779
2130
except (errors.NoWorkingTree, errors.NotLocalUrl):
1781
2132
repository = branch.repository
1782
2133
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))
2134
format = describe_format(a_controldir, repository, branch, tree)
2135
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
2137
if repository.is_shared():
1786
2138
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
2139
url = repository.controldir.root_transport.external_url()
1789
2141
url = urlutils.local_path_from_url(url)
1790
except errors.InvalidURL:
2142
except urlutils.InvalidURL:
1792
self.outf.write("Using shared repository: %s\n" % url)
2144
self.outf.write(gettext("Using shared repository: %s\n") % url)
1795
2147
class cmd_init_repository(Command):
1837
2189
def run(self, location, format=None, no_trees=False):
1838
2190
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2191
format = controldir.format_registry.make_controldir('default')
1841
2193
if location is None:
1844
2196
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)
2198
if format.fixed_components:
2199
repo_format_name = None
2201
repo_format_name = format.repository_format.get_format_string()
2203
(repo, newdir, require_stacking, repository_policy) = (
2204
format.initialize_on_transport_ex(to_transport,
2205
create_prefix=True, make_working_trees=not no_trees,
2206
shared_repo=True, force_new_repo=True,
2207
use_existing_dir=True,
2208
repo_format_name=repo_format_name))
1850
2209
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2210
from .info import show_bzrdir_info
2211
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2214
class cmd_diff(Command):
1875
2241
Shows the difference in the working tree versus the last commit::
1879
2245
Difference between the working tree and revision 1::
1883
2249
Difference between revision 3 and revision 1::
1887
2253
Difference between revision 3 and revision 1 for branch xxx::
1891
To see the changes introduced in revision X::
2257
The changes introduced by revision 2 (equivalent to -r1..2)::
2261
To see the changes introduced by revision X::
1895
2265
Note that in the case of a merge, the -c option shows the changes
1896
2266
compared to the left hand parent. To see the changes against
1897
2267
another parent, use::
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2269
brz diff -r<chosen_parent>..X
2271
The changes between the current revision and the previous revision
2272
(equivalent to -c-1 and -r-2..-1)
1905
2276
Show just the differences for file NEWS::
1909
2280
Show the differences in working tree xxx for file NEWS::
1913
2284
Show the differences from branch xxx to this working tree:
1917
2288
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/
2290
brz diff --old xxx --new yyy NEWS
2292
Same as 'brz diff' but prefix paths with old/ and new/::
2294
brz diff --prefix old/:new/
2296
Show the differences using a custom diff program with options::
2298
brz diff --using /usr/bin/diff --diff-options -wu
1925
2300
_see_also = ['status']
1926
2301
takes_args = ['file*']
1927
2302
takes_options = [
1928
Option('diff-options', type=str,
2303
Option('diff-options', type=text_type,
1929
2304
help='Pass these options to the external diff program.'),
1930
Option('prefix', type=str,
2305
Option('prefix', type=text_type,
1931
2306
short_name='p',
1932
2307
help='Set prefixes added to old and new filenames, as '
1933
2308
'two values separated by a colon. (eg "old/:new/").'),
1935
2310
help='Branch/tree to compare from.',
1939
2314
help='Branch/tree to compare to.',
1944
2319
Option('using',
1945
2320
help='Use this command to compare files.',
1948
2323
RegistryOption('format',
1949
2325
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2326
lazy_registry=('breezy.diff', 'format_registry'),
2327
title='Diff format'),
2329
help='How many lines of context to show.',
1953
2333
aliases = ['di', 'dif']
1954
2334
encoding_type = 'exact'
1956
2336
@display_command
1957
2337
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,
2338
prefix=None, old=None, new=None, using=None, format=None,
2340
from .diff import (get_trees_and_branches_to_diff_locked,
1960
2341
show_diff_trees)
1962
if (prefix is None) or (prefix == '0'):
1963
2344
# diff -p0 format
2347
elif prefix == u'1' or prefix is None:
1967
2348
old_label = 'old/'
1968
2349
new_label = 'new/'
1970
old_label, new_label = prefix.split(":")
2350
elif u':' in prefix:
2351
old_label, new_label = prefix.split(u":")
1972
raise errors.BzrCommandError(
2353
raise errors.BzrCommandError(gettext(
1973
2354
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2355
' (eg "old/:new/")'))
1976
2357
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2358
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2359
' one or two revision specifiers'))
1980
2361
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2362
raise errors.BzrCommandError(gettext(
2363
'{0} and {1} are mutually exclusive').format(
2364
'--using', '--format'))
1984
2366
(old_tree, new_tree,
1985
2367
old_branch, new_branch,
1986
2368
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2369
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2370
# GNU diff on Windows uses ANSI encoding for filenames
2371
path_encoding = osutils.get_diff_header_encoding()
2372
return show_diff_trees(old_tree, new_tree, self.outf,
1989
2373
specific_files=specific_files,
1990
2374
external_diff_options=diff_options,
1991
2375
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2376
extra_trees=extra_trees,
2377
path_encoding=path_encoding,
2378
using=using, context=context,
1993
2379
format_cls=format)
2053
2435
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2436
takes_options = ['directory', 'null']
2060
2438
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2439
def run(self, null=False, directory=u'.'):
2440
wt = WorkingTree.open_containing(directory)[0]
2441
self.add_cleanup(wt.lock_read().unlock)
2065
2442
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):
2443
self.add_cleanup(basis.lock_read().unlock)
2444
root_id = wt.get_root_id()
2445
for path in wt.all_versioned_paths():
2446
if basis.has_filename(path):
2450
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2453
self.outf.write(path + '\0')
2224
2598
:Other filtering:
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2600
The --match option can be used for finding revisions that match a
2601
regular expression in a commit message, committer, author or bug.
2602
Specifying the option several times will match any of the supplied
2603
expressions. --match-author, --match-bugs, --match-committer and
2604
--match-message can be used to only match a specific field.
2229
2606
:Tips & tricks:
2231
2608
GUI tools and IDEs are often better at exploring history than command
2232
2609
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
2610
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2611
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
2612
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2614
You may find it useful to add the aliases below to ``breezy.conf``::
2241
2618
top = log -l10 --line
2242
2619
show = log -v -p
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2621
``brz tip`` will then show the latest revision while ``brz top``
2245
2622
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2623
particular revision X, ``brz show -rX``.
2248
2625
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2626
use ``brz log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2628
``brz log -v`` on a branch with lots of history is currently
2252
2629
very slow. A fix for this issue is currently under development.
2253
2630
With or without that fix, it is recommended that a revision range
2254
2631
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2633
brz has a generic full-text matching plugin, brz-search, that can be
2257
2634
used to find revisions matching user names, commit messages, etc.
2258
2635
Among other features, this plugin can find all revisions containing
2259
2636
a list of words but not others.
2297
2679
Option('show-diff',
2298
2680
short_name='p',
2299
2681
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2682
Option('include-merged',
2301
2683
help='Show merged revisions like --levels 0 does.'),
2684
Option('include-merges', hidden=True,
2685
help='Historical alias for --include-merged.'),
2686
Option('omit-merges',
2687
help='Do not report commits with more than one parent.'),
2302
2688
Option('exclude-common-ancestry',
2303
2689
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2690
' of both ancestries (require -rX..Y).'
2692
Option('signatures',
2693
help='Show digital signature validity.'),
2696
help='Show revisions whose properties match this '
2699
ListOption('match-message',
2700
help='Show revisions whose message matches this '
2703
ListOption('match-committer',
2704
help='Show revisions whose committer matches this '
2707
ListOption('match-author',
2708
help='Show revisions whose authors match this '
2711
ListOption('match-bugs',
2712
help='Show revisions whose bugs match this '
2307
2716
encoding_type = 'replace'
2528
2966
help='Recurse into subdirectories.'),
2529
2967
Option('from-root',
2530
2968
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2969
Option('unknown', short_name='u',
2970
help='Print unknown files.'),
2532
2971
Option('versioned', help='Print versioned files.',
2533
2972
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.'),
2973
Option('ignored', short_name='i',
2974
help='Print ignored files.'),
2975
Option('kind', short_name='k',
2539
2976
help='List entries of a particular kind: file, directory, symlink.',
2543
2982
@display_command
2544
2983
def run(self, revision=None, verbose=False,
2545
2984
recursive=False, from_root=False,
2546
2985
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2986
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')
2988
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
2989
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2991
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2992
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2993
all = not (unknown or versioned or ignored)
2556
2995
selection = {'I':ignored, '?':unknown, 'V':versioned}
2674
3113
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3114
precedence over the '!' exception patterns.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3118
* Ignore patterns containing shell wildcards must be quoted from
3121
* Ignore patterns starting with "#" act as comments in the ignore file.
3122
To ignore patterns that begin with that character, use the "RE:" prefix.
2681
3125
Ignore the top level Makefile::
2683
bzr ignore ./Makefile
3127
brz ignore ./Makefile
2685
3129
Ignore .class files in all directories...::
2687
bzr ignore "*.class"
3131
brz ignore "*.class"
2689
3133
...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"
3135
brz ignore "!special.class"
3137
Ignore files whose name begins with the "#" character::
3141
Ignore .o files under the lib directory::
3143
brz ignore "lib/**/*.o"
3145
Ignore .o files under the lib directory::
3147
brz ignore "RE:lib/.*\\.o"
2701
3149
Ignore everything but the "debian" toplevel directory::
2703
bzr ignore "RE:(?!debian/).*"
3151
brz ignore "RE:(?!debian/).*"
2705
3153
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
3154
but always ignore autosave files ending in ~, even under local/::
2709
bzr ignore "!./local"
3157
brz ignore "!./local"
2713
3161
_see_also = ['status', 'ignored', 'patterns']
2714
3162
takes_args = ['name_pattern*']
3163
takes_options = ['directory',
2716
3164
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3165
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
3168
def run(self, name_pattern_list=None, default_rules=None,
3170
from breezy import ignores
2722
3171
if default_rules is not None:
2723
3172
# dump the default rules and exit
2724
3173
for pattern in ignores.USER_DEFAULTS:
2725
3174
self.outf.write("%s\n" % pattern)
2727
3176
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3177
raise errors.BzrCommandError(gettext("ignore requires at least one "
3178
"NAME_PATTERN or --default-rules."))
2730
3179
name_pattern_list = [globbing.normalize_pattern(p)
2731
3180
for p in name_pattern_list]
3182
bad_patterns_count = 0
3183
for p in name_pattern_list:
3184
if not globbing.Globster.is_pattern_valid(p):
3185
bad_patterns_count += 1
3186
bad_patterns += ('\n %s' % p)
3188
msg = (ngettext('Invalid ignore pattern found. %s',
3189
'Invalid ignore patterns found. %s',
3190
bad_patterns_count) % bad_patterns)
3191
ui.ui_factory.show_error(msg)
3192
raise lazy_regex.InvalidPattern('')
2732
3193
for name_pattern in name_pattern_list:
2733
3194
if (name_pattern[0] == '/' or
2734
3195
(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'.')
3196
raise errors.BzrCommandError(gettext(
3197
"NAME_PATTERN should not be an absolute path"))
3198
tree, relpath = WorkingTree.open_containing(directory)
2738
3199
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3200
ignored = globbing.Globster(name_pattern_list)
3202
self.add_cleanup(tree.lock_read().unlock)
2742
3203
for entry in tree.list_files():
2744
3205
if id is not None:
2745
3206
filename = entry[0]
2746
3207
if ignored.match(filename):
2747
3208
matches.append(filename)
2749
3209
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3210
self.outf.write(gettext("Warning: the following files are version "
3211
"controlled and match your ignore pattern:\n%s"
2752
3212
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3213
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2756
3216
class cmd_ignored(Command):
2829
3290
================= =========================
3293
encoding_type = 'exact'
2831
3294
takes_args = ['dest', 'branch_or_subdir?']
3295
takes_options = ['directory',
2833
3296
Option('format',
2834
3297
help="Type of file to export to.",
2837
3300
Option('filters', help='Apply content filters to export the '
2838
3301
'convenient form.'),
2841
3304
help="Name of the root directory inside the exported file."),
2842
3305
Option('per-file-timestamps',
2843
3306
help='Set modification time of files to that of the last '
2844
3307
'revision in which it was changed.'),
3308
Option('uncommitted',
3309
help='Export the working tree contents rather than that of the '
2846
3312
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
3313
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3315
from .export import export, guess_format, get_root_name
2850
3317
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)
3318
branch_or_subdir = directory
3320
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3322
if tree is not None:
3323
self.add_cleanup(tree.lock_read().unlock)
3327
raise errors.BzrCommandError(
3328
gettext("--uncommitted requires a working tree"))
3331
export_tree = _get_one_revision_tree(
3332
'export', revision, branch=b,
3336
format = guess_format(dest)
3339
root = get_root_name(dest)
3341
if not per_file_timestamps:
3342
force_mtime = time.time()
3347
from breezy.filter_tree import ContentFilterTree
3348
export_tree = ContentFilterTree(
3349
export_tree, export_tree._content_filter_stack)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3352
export(export_tree, dest, format, root, subdir,
2861
3353
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
except errors.NoSuchExportFormat as e:
3355
raise errors.BzrCommandError(
3356
gettext('Unsupported export format: %s') % e.format)
2866
3359
class cmd_cat(Command):
2885
3378
@display_command
2886
3379
def run(self, filename, revision=None, name_from_revision=False,
3380
filters=False, directory=None):
2888
3381
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3382
raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"
3383
" one revision specifier"))
2891
3384
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3385
_open_directory_or_containing_tree_or_branch(filename, directory)
3386
self.add_cleanup(branch.lock_read().unlock)
2895
3387
return self._run(tree, branch, relpath, filename, revision,
2896
3388
name_from_revision, filters)
2898
3390
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2900
3393
if tree is None:
2901
3394
tree = b.basis_tree()
2902
3395
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3396
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3398
old_file_id = rev_tree.path2id(relpath)
3400
# TODO: Split out this code to something that generically finds the
3401
# best id for a path across one or more trees; it's like
3402
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3404
if name_from_revision:
2909
3405
# Try in revision if requested
2910
3406
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3407
raise errors.BzrCommandError(gettext(
3408
"{0!r} is not present in revision {1}").format(
2913
3409
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3411
actual_file_id = old_file_id
2917
3413
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" % (
3414
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3415
actual_file_id = cur_file_id
3416
elif old_file_id is not None:
3417
actual_file_id = old_file_id
3419
raise errors.BzrCommandError(gettext(
3420
"{0!r} is not present in revision {1}").format(
2935
3421
filename, rev_tree.get_revision_id()))
3422
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)
3424
from .filter_tree import ContentFilterTree
3425
filter_tree = ContentFilterTree(rev_tree,
3426
rev_tree._content_filter_stack)
3427
fileobj = filter_tree.get_file(relpath, actual_file_id)
2949
self.outf.write(content)
3429
fileobj = rev_tree.get_file(relpath, actual_file_id)
3430
shutil.copyfileobj(fileobj, self.outf)
2952
3434
class cmd_local_time_offset(Command):
3000
3482
A common mistake is to forget to add a new file or directory before
3001
3483
running the commit command. The --strict option checks for unknown
3002
3484
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``
3485
checks can be implemented by defining hooks. See ``brz help hooks``
3006
3488
:Things to note:
3008
3490
If you accidentially commit the wrong changes or make a spelling
3009
3491
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3492
to undo it. See ``brz help uncommit`` for details.
3012
3494
Hooks can also be configured to run after a commit. This allows you
3013
3495
to trigger updates to external systems like bug trackers. The --fixes
3014
3496
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.)
3497
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
3500
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3501
takes_args = ['selected*']
3045
3502
takes_options = [
3046
ListOption('exclude', type=str, short_name='x',
3503
ListOption('exclude', type=text_type, short_name='x',
3047
3504
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3505
Option('message', type=text_type,
3049
3506
short_name='m',
3050
3507
help="Description of the new revision."),
3052
3509
Option('unchanged',
3053
3510
help='Commit even if nothing has changed.'),
3054
Option('file', type=str,
3511
Option('file', type=text_type,
3055
3512
short_name='F',
3056
3513
argname='msgfile',
3057
3514
help='Take commit message from this file.'),
3058
3515
Option('strict',
3059
3516
help="Refuse to commit if there are unknown "
3060
3517
"files in the working tree."),
3061
Option('commit-time', type=str,
3518
Option('commit-time', type=text_type,
3062
3519
help="Manually set a commit time using commit date "
3063
3520
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
ListOption('fixes', type=str,
3521
ListOption('fixes', type=text_type,
3065
3522
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3523
"(see \"brz help bugs\")."),
3524
ListOption('author', type=text_type,
3068
3525
help="Set the author's name, if it's different "
3069
3526
"from the committer."),
3070
3527
Option('local',
3076
3533
Option('show-diff', short_name='p',
3077
3534
help='When no message is supplied, show the diff along'
3078
3535
' with the status summary in the message editor.'),
3537
help='When committing to a foreign version control '
3538
'system do not push data that can not be natively '
3080
3541
aliases = ['ci', 'checkin']
3082
3543
def _iter_bug_fix_urls(self, fixes, branch):
3544
default_bugtracker = None
3083
3545
# Configure the properties for bug fixing attributes.
3084
3546
for fixed_bug in fixes:
3085
3547
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3548
if len(tokens) == 1:
3549
if default_bugtracker is None:
3550
branch_config = branch.get_config_stack()
3551
default_bugtracker = branch_config.get(
3553
if default_bugtracker is None:
3554
raise errors.BzrCommandError(gettext(
3555
"No tracker specified for bug %s. Use the form "
3556
"'tracker:id' or specify a default bug tracker "
3557
"using the `bugtracker` option.\nSee "
3558
"\"brz help bugs\" for more information on this "
3559
"feature. Commit refused.") % fixed_bug)
3560
tag = default_bugtracker
3562
elif len(tokens) != 2:
3563
raise errors.BzrCommandError(gettext(
3088
3564
"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
3565
"See \"brz help bugs\" for more information on this "
3566
"feature.\nCommit refused.") % fixed_bug)
3568
tag, bug_id = tokens
3093
3570
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),))
3571
except bugtracker.UnknownBugTrackerAbbreviation:
3572
raise errors.BzrCommandError(gettext(
3573
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3574
except bugtracker.MalformedBugIdentifier as e:
3575
raise errors.BzrCommandError(gettext(
3576
u"%s\nCommit refused.") % (e,))
3101
3578
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3579
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3580
author=None, show_diff=False, exclude=None, commit_time=None,
3582
from .commit import (
3105
3583
PointlessCommit,
3585
from .errors import (
3106
3586
ConflictsInTree,
3107
3587
StrictCommitFailed
3109
from bzrlib.msgeditor import (
3589
from .msgeditor import (
3110
3590
edit_commit_message_encoded,
3111
3591
generate_commit_message_template,
3112
make_commit_message_template_encoded
3592
make_commit_message_template_encoded,
3115
3596
commit_stamp = offset = None
3116
3597
if commit_time is not None:
3118
3599
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.
3600
except ValueError as e:
3601
raise errors.BzrCommandError(gettext(
3602
"Could not parse --commit-time: " + str(e)))
3129
3604
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3606
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3607
if selected_list == ['']:
3133
3608
# workaround - commit of root of tree should be exactly the same
3134
3609
# as just default commit in that tree, and succeed even though
3205
3685
reporter=None, verbose=verbose, revprops=properties,
3206
3686
authors=author, timestamp=commit_stamp,
3207
3687
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3688
exclude=tree.safe_relpath_files(exclude),
3209
3690
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3691
raise errors.BzrCommandError(gettext("No changes to commit."
3692
" Please 'brz add' the files you want to commit, or use"
3693
" --unchanged to force an empty commit."))
3212
3694
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3695
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3696
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3216
3698
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"
3699
raise errors.BzrCommandError(gettext("Commit refused because there are"
3700
" unknown files in the working tree."))
3701
except errors.BoundBranchOutOfDate as e:
3702
e.extra_help = (gettext("\n"
3221
3703
'To commit to master branch, run update and then commit.\n'
3222
3704
'You can also pass --local to commit to continue working '
3297
3779
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.
3780
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3782
When the default format has changed after a major new release of
3783
Bazaar, you may be informed during certain operations that you
3784
should upgrade. Upgrading to a newer format may improve performance
3785
or make new features available. It may however limit interoperability
3786
with older repositories or with older versions of Bazaar.
3788
If you wish to upgrade to a particular format rather than the
3789
current default, that can be specified using the --format option.
3790
As a consequence, you can use the upgrade command this way to
3791
"downgrade" to an earlier format, though some conversions are
3792
a one way process (e.g. changing from the 1.x default to the
3793
2.x default) so downgrading is not always possible.
3795
A backup.bzr.~#~ directory is created at the start of the conversion
3796
process (where # is a number). By default, this is left there on
3797
completion. If the conversion fails, delete the new .bzr directory
3798
and rename this one back in its place. Use the --clean option to ask
3799
for the backup.bzr directory to be removed on successful conversion.
3800
Alternatively, you can delete it by hand if everything looks good
3803
If the location given is a shared repository, dependent branches
3804
are also converted provided the repository converts successfully.
3805
If the conversion of a branch fails, remaining branches are still
3808
For more information on upgrades, see the Bazaar Upgrade Guide,
3809
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3812
_see_also = ['check', 'reconcile', 'formats']
3306
3813
takes_args = ['url?']
3307
3814
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'),
3815
RegistryOption('format',
3816
help='Upgrade to a specific format. See "brz help'
3817
' formats" for details.',
3818
lazy_registry=('breezy.controldir', 'format_registry'),
3819
converter=lambda name: controldir.format_registry.make_controldir(name),
3820
value_switches=True, title='Branch format'),
3822
help='Remove the backup.bzr directory if successful.'),
3824
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)
3827
def run(self, url='.', format=None, clean=False, dry_run=False):
3828
from .upgrade import upgrade
3829
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3831
if len(exceptions) == 1:
3832
# Compatibility with historical behavior
3321
3838
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3839
__doc__ = """Show or set brz user id.
3325
3842
Show the email of the current user::
3329
3846
Set the current user::
3331
bzr whoami "Frank Chu <fchu@example.com>"
3848
brz whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3850
takes_options = [ 'directory',
3334
3852
help='Display email address only.'),
3335
3853
Option('branch',
3336
3854
help='Set identity for the current branch instead of '
3340
3858
encoding_type = 'replace'
3342
3860
@display_command
3343
def run(self, email=False, branch=False, name=None):
3861
def run(self, email=False, branch=False, name=None, directory=None):
3344
3862
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()
3863
if directory is None:
3864
# use branch if we're inside one; otherwise global config
3866
c = Branch.open_containing(u'.')[0].get_config_stack()
3867
except errors.NotBranchError:
3868
c = _mod_config.GlobalStack()
3870
c = Branch.open(directory).get_config_stack()
3871
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3873
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3876
self.outf.write(identity + '\n')
3880
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3883
# 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:
3885
_mod_config.extract_email_address(name)
3886
except _mod_config.NoEmailInUsername as e:
3360
3887
warning('"%s" does not seem to contain an email address. '
3361
3888
'This is allowed, but not recommended.', name)
3363
3890
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3892
if directory is None:
3893
c = Branch.open_containing(u'.')[0].get_config_stack()
3895
b = Branch.open(directory)
3896
self.add_cleanup(b.lock_write().unlock)
3897
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3899
c = _mod_config.GlobalStack()
3900
c.set('email', name)
3371
3903
class cmd_nick(Command):
3372
3904
__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.
3906
If unset, the colocated branch name is used for colocated branches, and
3907
the branch directory name is used for other branches. To print the
3908
current nickname, execute with no argument.
3377
3910
Bound branches use the nickname of its master branch unless it is set
3433
3967
def remove_alias(self, alias_name):
3434
3968
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3969
raise errors.BzrCommandError(gettext(
3970
'brz alias --remove expects an alias to remove.'))
3437
3971
# If alias is not found, print something like:
3438
3972
# unalias: foo: not found
3439
c = config.GlobalConfig()
3973
c = _mod_config.GlobalConfig()
3440
3974
c.unset_alias(alias_name)
3442
3976
@display_command
3443
3977
def print_aliases(self):
3444
3978
"""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))
3979
aliases = _mod_config.GlobalConfig().get_aliases()
3980
for key, value in sorted(viewitems(aliases)):
3981
self.outf.write('brz alias %s="%s"\n' % (key, value))
3449
3983
@display_command
3450
3984
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
3985
from .commands import get_alias
3452
3986
alias = get_alias(alias_name)
3453
3987
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3988
self.outf.write("brz alias: %s: not found\n" % alias_name)
3456
3990
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3991
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3459
3993
def set_alias(self, alias_name, alias_command):
3460
3994
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3995
c = _mod_config.GlobalConfig()
3462
3996
c.set_alias(alias_name, alias_command)
3496
4030
Tests that need working space on disk use a common temporary directory,
3497
4031
typically inside $TMPDIR or /tmp.
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4033
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4034
into a pdb postmortem session.
4036
The --coverage=DIRNAME global option produces a report with covered code
3503
4040
Run only tests relating to 'ignore'::
3507
4044
Disable plugins and list tests as they're run::
3509
bzr --no-plugins selftest -v
4046
brz --no-plugins selftest -v
3511
4048
# NB: this is used from the class without creating an instance, which is
3512
4049
# why it does not have a self parameter.
3513
4050
def get_transport_type(typestring):
3514
4051
"""Parse and return a transport specifier."""
3515
4052
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4053
from .tests import stub_sftp
3517
4054
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4055
elif typestring == "memory":
4056
from .tests import test_server
3520
4057
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4058
elif typestring == "fakenfs":
4059
from .tests import test_server
3523
4060
return test_server.FakeNFSServer
3524
4061
msg = "No known transport type %s. Supported types are: sftp\n" %\
3554
4089
help='List the tests instead of running them.'),
3555
4090
RegistryOption('parallel',
3556
4091
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4092
lazy_registry=('breezy.tests', 'parallel_registry'),
3558
4093
value_switches=False,
3560
Option('randomize', type=str, argname="SEED",
4095
Option('randomize', type=text_type, argname="SEED",
3561
4096
help='Randomize the order of tests using the given'
3562
4097
' 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.'),
4098
ListOption('exclude', type=text_type, argname="PATTERN",
4100
help='Exclude tests that match this regular'
4103
help='Output test progress via subunit v1.'),
4105
help='Output test progress via subunit v2.'),
3569
4106
Option('strict', help='Fail on missing dependencies or '
3570
4107
'known failures.'),
3571
Option('load-list', type=str, argname='TESTLISTFILE',
4108
Option('load-list', type=text_type, argname='TESTLISTFILE',
3572
4109
help='Load a test id list from a text file.'),
3573
ListOption('debugflag', type=str, short_name='E',
4110
ListOption('debugflag', type=text_type, short_name='E',
3574
4111
help='Turn on a selftest debug flag.'),
3575
ListOption('starting-with', type=str, argname='TESTID',
4112
ListOption('starting-with', type=text_type, argname='TESTID',
3576
4113
param_name='starting_with', short_name='s',
3578
4115
'Load only the tests starting with TESTID.'),
4117
help="By default we disable fsync and fdatasync"
4118
" while running the test suite.")
3580
4120
encoding_type = 'replace'
3586
4126
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4127
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4129
first=False, list_only=False,
3590
4130
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)
4131
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4132
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4134
# During selftest, disallow proxying, as it can cause severe
4135
# performance penalties and is only needed for thread
4136
# safety. The selftest command is assumed to not use threads
4137
# too heavily. The call should be as early as possible, as
4138
# error reporting for past duplicate imports won't have useful
4140
if sys.version_info[0] < 3:
4141
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4142
# disallowing it currently leads to failures in many places.
4143
lazy_import.disallow_proxying()
4148
raise errors.BzrCommandError("tests not available. Install the "
4149
"breezy tests to run the breezy testsuite.")
3602
4151
if testspecs_list is not None:
3603
4152
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
4157
from .tests import SubUnitBzrRunnerv1
3609
4158
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
4159
raise errors.BzrCommandError(gettext(
4160
"subunit not available. subunit needs to be installed "
4161
"to use --subunit."))
4162
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3613
4163
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4164
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4165
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4166
# following code can be deleted when it's sufficiently deployed
4167
# -- vila/mgz 20100514
4168
if (sys.platform == "win32"
4169
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4171
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4174
from .tests import SubUnitBzrRunnerv2
4176
raise errors.BzrCommandError(gettext(
4177
"subunit not available. subunit "
4178
"needs to be installed to use --subunit2."))
4179
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3619
4182
self.additional_selftest_args.setdefault(
3620
4183
'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)
4185
raise errors.BzrCommandError(gettext(
4186
"--benchmark is no longer supported from brz 2.2; "
4187
"use bzr-usertest instead"))
4188
test_suite_factory = None
4190
exclude_pattern = None
3629
test_suite_factory = None
4192
exclude_pattern = '(' + '|'.join(exclude) + ')'
4194
self._disable_fsync()
3631
4195
selftest_kwargs = {"verbose": verbose,
3632
4196
"pattern": pattern,
3633
4197
"stop_on_failure": one,
3635
4199
"test_suite_factory": test_suite_factory,
3636
4200
"lsprof_timed": lsprof_timed,
3637
4201
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4202
"matching_tests_first": first,
3640
4203
"list_only": list_only,
3641
4204
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4205
"exclude_pattern": exclude_pattern,
3643
4206
"strict": strict,
3644
4207
"load_list": load_list,
3645
4208
"debug_flags": debugflag,
3646
4209
"starting_with": starting_with
3648
4211
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4213
# Make deprecation warnings visible, unless -Werror is set
4214
cleanup = symbol_versioning.activate_deprecation_warnings(
4217
result = tests.selftest(**selftest_kwargs)
3650
4220
return int(not result)
4222
def _disable_fsync(self):
4223
"""Change the 'os' functionality to not synchronize."""
4224
self._orig_fsync = getattr(os, 'fsync', None)
4225
if self._orig_fsync is not None:
4226
os.fsync = lambda filedes: None
4227
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4228
if self._orig_fdatasync is not None:
4229
os.fdatasync = lambda filedes: None
3653
4232
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4233
__doc__ = """Show version of brz."""
3656
4235
encoding_type = 'replace'
3657
4236
takes_options = [
3709
4286
The source of the merge can be specified either in the form of a branch,
3710
4287
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.
4288
with brz send. If neither is specified, the default is the upstream branch
4289
or the branch most recently merged using --remember. The source of the
4290
merge may also be specified in the form of a path to a file in another
4291
branch: in this case, only the modifications to that file are merged into
4292
the current working tree.
4294
When merging from a branch, by default brz will try to merge in all new
4295
work from the other branch, automatically determining an appropriate base
4296
revision. If this fails, you may need to give an explicit base.
4298
To pick a different ending revision, pass "--revision OTHER". brz will
4299
try to merge in all new work up to and including revision OTHER.
4301
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4302
through OTHER, excluding BASE but including OTHER, will be merged. If this
4303
causes some revisions to be skipped, i.e. if the destination branch does
4304
not already contain revision BASE, such a merge is commonly referred to as
4305
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4306
cherrypicks. The changes look like a normal commit, and the history of the
4307
changes from the other branch is not stored in the commit.
4309
Revision numbers are always relative to the source branch.
3725
4311
Merge will do its best to combine the changes in two branches, but there
3726
4312
are some kinds of problems only a human can fix. When it encounters those,
3727
4313
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.
4314
before you can commit.
4316
Use brz resolve when you have fixed a problem. See also brz conflicts.
4318
If there is no default branch set, the first merge will set it (use
4319
--no-remember to avoid setting it). After that, you can omit the branch
4320
to use the default. To change the default, use --remember. The value will
4321
only be saved if the remote location can be accessed.
3737
4323
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4324
directory, where they can be reviewed (with brz diff), tested, and then
3739
4325
committed to record the result of the merge.
3741
4327
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
4328
--force is given. If --force is given, then the changes from the source
4329
will be merged with the current working tree, including any uncommitted
4330
changes in the tree. The --force option can also be used to create a
3743
4331
merge revision which has more than two parents.
3745
4333
If one would like to merge changes from the working tree of the other
3873
4461
self.sanity_check_merger(merger)
3874
4462
if (merger.base_rev_id == merger.other_rev_id and
3875
4463
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4464
# check if location is a nonexistent file (and not a branch) to
4465
# disambiguate the 'Nothing to do'
4466
if merger.interesting_files:
4467
if not merger.other_tree.has_filename(
4468
merger.interesting_files[0]):
4469
note(gettext("merger: ") + str(merger))
4470
raise errors.PathsDoNotExist([location])
4471
note(gettext('Nothing to do.'))
4473
if pull and not preview:
3879
4474
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4475
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4476
if (merger.base_rev_id == tree.last_revision()):
3882
4477
result = tree.pull(merger.other_branch, False,
3883
4478
merger.other_rev_id)
3884
4479
result.report(self.outf)
3886
4481
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4482
raise errors.BzrCommandError(gettext(
3888
4483
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4484
" (perhaps you would prefer 'brz pull')"))
3891
4486
return self._do_preview(merger)
3892
4487
elif interactive:
3950
4547
# Use reprocess if the merger supports it
3951
4548
merger.reprocess = merger.merge_type.supports_reprocess
3952
4549
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4550
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4551
" for merge type %s.") %
3955
4552
merger.merge_type)
3956
4553
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4554
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4557
if (merger.merge_type.requires_file_merge_plan and
4558
(not getattr(merger.this_tree, 'plan_file_merge', None) or
4559
not getattr(merger.other_tree, 'plan_file_merge', None) or
4560
(merger.base_tree is not None and
4561
not getattr(merger.base_tree, 'plan_file_merge', None)))):
4562
raise errors.BzrCommandError(
4563
gettext('Plan file merge unsupported: '
4564
'Merge type incompatible with tree formats.'))
3960
4566
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4567
possible_transports, pb):
3962
4568
"""Produce a merger from a location, assuming it refers to a branch."""
3963
from bzrlib.tag import _merge_tags_if_possible
3964
4569
# find the branch locations
3965
4570
other_loc, user_location = self._select_branch_location(tree, location,
3988
4593
if other_revision_id is None:
3989
4594
other_revision_id = _mod_revision.ensure_null(
3990
4595
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):
4596
# Remember where we merge from. We need to remember if:
4597
# - user specify a location (and we don't merge from the parent
4599
# - user ask to remember or there is no previous location set to merge
4600
# from and user didn't ask to *not* remember
4601
if (user_location is not None
4603
or (remember is None
4604
and tree.branch.get_submit_branch() is None)))):
3994
4605
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,
4606
# Merge tags (but don't set them in the master branch yet, the user
4607
# might revert this merge). Commit will propagate them.
4608
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4609
merger = _mod_merge.Merger.from_revision_ids(tree,
3997
4610
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4611
if other_path != '':
3999
4612
allow_pending = False
4097
4710
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4711
reprocess=False):
4099
from bzrlib.conflicts import restore
4712
from .conflicts import restore
4100
4713
if merge_type is None:
4101
4714
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4715
tree, file_list = WorkingTree.open_containing_paths(file_list)
4716
self.add_cleanup(tree.lock_write().unlock)
4105
4717
parents = tree.get_parent_ids()
4106
4718
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4719
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4108
4720
" merges. Not cherrypicking or"
4110
4722
repository = tree.branch.repository
4111
interesting_ids = None
4723
interesting_files = None
4112
4724
new_conflicts = []
4113
4725
conflicts = tree.conflicts()
4114
4726
if file_list is not None:
4115
interesting_ids = set()
4727
interesting_files = set()
4116
4728
for filename in file_list:
4117
file_id = tree.path2id(filename)
4729
if not tree.is_versioned(filename):
4119
4730
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4731
interesting_files.add(filename)
4732
if tree.kind(filename) != "directory":
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4735
for path, ie in tree.iter_entries_by_dir(specific_files=[filename]):
4736
interesting_files.add(path)
4126
4737
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
4739
# Remerge only supports resolving contents conflicts
4129
4740
allowed_conflicts = ('text conflict', 'contents conflict')
4130
4741
restore_files = [c.path for c in conflicts
4131
4742
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4743
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4133
4744
tree.set_conflicts(ConflictList(new_conflicts))
4134
4745
if file_list is not None:
4135
4746
restore_files = file_list
4162
4773
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4775
Set files in the working tree back to the contents of a previous revision.
4165
4777
Giving a list of files will revert only those files. Otherwise, all files
4166
4778
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4779
working tree basis revision is used. A revert operation affects only the
4780
working tree, not any revision history like the branch and repository or
4781
the working tree basis revision.
4169
4783
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.
4784
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4785
will remove the changes introduced by the second last commit (-2), without
4786
affecting the changes introduced by the last commit (-1). To remove
4787
certain changes on a hunk-by-hunk basis, see the shelve command.
4788
To update the branch to a specific revision or the latest revision and
4789
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.
4792
Uncommitted changes to files that are reverted will be discarded.
4793
Howver, by default, any files that have been manually changed will be
4794
backed up first. (Files changed only by merge are not backed up.) Backup
4795
files have '.~#~' appended to their name, where # is a number.
4178
4797
When you provide files, you can use their current pathname or the pathname
4179
4798
from the target revision. So you can use revert to "undelete" a file by
4419
5047
if remote_extra and not mine_only:
4420
5048
if printed_local is True:
4421
5049
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5050
message(ngettext("You are missing %d revision:\n",
5051
"You are missing %d revisions:\n",
5052
len(remote_extra)) %
4423
5053
len(remote_extra))
5054
if remote_branch.supports_tags():
5055
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5056
for revision in iter_log_revisions(remote_extra,
4425
5057
remote_branch.repository,
4427
5060
lf.log_revision(revision)
4428
5061
status_code = 1
4430
5063
if mine_only and not local_extra:
4431
5064
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5065
message(gettext('This branch has no new revisions.\n'))
4433
5066
elif theirs_only and not remote_extra:
4434
5067
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5068
message(gettext('Other branch has no new revisions.\n'))
4436
5069
elif not (mine_only or theirs_only or local_extra or
4438
5071
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5073
message(gettext("Branches are up to date.\n"))
4441
5074
self.cleanup_now()
4442
5075
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)
5076
self.add_cleanup(local_branch.lock_write().unlock)
4445
5077
# handle race conditions - a parent might be set while we run.
4446
5078
if local_branch.get_parent() is None:
4447
5079
local_branch.set_parent(remote_branch.base)
4578
5194
Option('long', help='Show commit date in annotations.'),
4582
5199
encoding_type = 'exact'
4584
5201
@display_command
4585
5202
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5203
show_ids=False, directory=None):
5204
from .annotate import (
4588
5207
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5208
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5209
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5210
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5212
self.add_cleanup(branch.lock_read().unlock)
4596
5213
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5214
self.add_cleanup(tree.lock_read().unlock)
5215
if wt is not None and revision is None:
4600
5216
file_id = wt.path2id(relpath)
4602
5218
file_id = tree.path2id(relpath)
4603
5219
if file_id is None:
4604
5220
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5221
if wt is not None and revision is None:
4607
5222
# If there is a tree and we're not annotating historical
4608
5223
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5224
annotate_file_tree(wt, relpath, self.outf, long, all,
5225
show_ids=show_ids, file_id=file_id)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5227
annotate_file_tree(tree, relpath, self.outf, long, all,
5228
show_ids=show_ids, branch=branch, file_id=file_id)
4616
5231
class cmd_re_sign(Command):
4620
5235
hidden = True # is this right ?
4621
5236
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5237
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5239
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5240
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')
5241
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5242
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)
5243
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5244
b = WorkingTree.open_containing(directory)[0].branch
5245
self.add_cleanup(b.lock_write().unlock)
4632
5246
return self._run(b, revision_id_list, revision)
4634
5248
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5249
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5250
if revision_id_list is not None:
4638
5251
b.repository.start_write_group()
4640
5253
for revision_id in revision_id_list:
5254
revision_id = cache_utf8.encode(revision_id)
4641
5255
b.repository.sign_revision(revision_id, gpg_strategy)
4643
5257
b.repository.abort_write_group()
4694
5308
_see_also = ['checkouts', 'unbind']
4695
5309
takes_args = ['location?']
5310
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5312
def run(self, location=None, directory=u'.'):
5313
b, relpath = Branch.open_containing(directory)
4700
5314
if location is None:
4702
5316
location = b.get_old_bound_location()
4703
5317
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5318
raise errors.BzrCommandError(gettext('No location supplied. '
5319
'This format does not remember old locations.'))
4707
5321
if location is None:
4708
5322
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5323
raise errors.BzrCommandError(
5324
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5326
raise errors.BzrCommandError(
5327
gettext('No location supplied'
5328
' and no previous location known'))
4713
5329
b_other = Branch.open(location)
4715
5331
b.bind(b_other)
4716
5332
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5333
raise errors.BzrCommandError(gettext('These branches have diverged.'
5334
' Try merging, and then bind again.'))
4719
5335
if b.get_config().has_explicit_nickname():
4720
5336
b.nick = b_other.nick
4784
5401
b = control.open_branch()
4786
5403
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5404
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)
5406
self.add_cleanup(b.lock_write().unlock)
5407
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
5410
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5412
from .log import log_formatter, show_log
5413
from .uncommit import uncommit
4798
5415
last_revno, last_rev_id = b.last_revision_info()
4827
5444
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5447
self.outf.write(gettext('Dry-run, pretending to remove'
5448
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5450
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')
5453
if not ui.ui_factory.confirm_action(
5454
gettext(u'Uncommit these revisions'),
5455
'breezy.builtins.uncommit',
5457
self.outf.write(gettext('Canceled\n'))
4840
5460
mutter('Uncommitting from {%s} to {%s}',
4841
5461
last_rev_id, rev_id)
4842
5462
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)
5463
revno=revno, local=local, keep_tags=keep_tags)
5464
self.outf.write(gettext('You can restore the old tip by running:\n'
5465
' brz pull . -r revid:%s\n') % last_rev_id.decode('utf-8'))
4848
5468
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5469
__doc__ = """Break a dead lock.
5471
This command breaks a lock on a repository, branch, working directory or
4851
5474
CAUTION: Locks should only be broken when you are sure that the process
4852
5475
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
5477
You can get information on what locks are open via the 'brz info
4855
5478
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5482
brz break-lock brz+ssh://example.com/brz/foo
5483
brz break-lock --conf ~/.bazaar
4861
5486
takes_args = ['location?']
5489
help='LOCATION is the directory where the config lock is.'),
5491
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5494
def run(self, location=None, config=False, force=False):
4864
5495
if location is None:
4865
5496
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5498
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5500
{'breezy.lockdir.break': True})
5502
conf = _mod_config.LockableConfig(file_name=location)
5505
control, relpath = controldir.ControlDir.open_containing(location)
5507
control.break_lock()
5508
except NotImplementedError:
4873
5512
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5513
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4876
5515
This just prints a line to signal when it is ready, then blocks on stdin.
4894
5533
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5534
RegistryOption('protocol',
4896
5535
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5536
lazy_registry=('breezy.transport', 'transport_server_registry'),
4898
5537
value_switches=True),
5539
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.',
5541
help='Listen for connections on nominated port. Passing 0 as '
5542
'the port number will result in a dynamically allocated '
5543
'port. The default port depends on the protocol.',
5545
custom_help('directory',
5546
help='Serve contents of this directory.'),
4908
5547
Option('allow-writes',
4909
5548
help='By default the server is a readonly server. Supplying '
4910
5549
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5550
'the served directory and below. Note that ``brz serve`` '
4912
5551
'does not perform authentication, so unless some form of '
4913
5552
'external authentication is arranged supplying this '
4914
5553
'option leads to global uncontrolled write access to your '
5556
Option('client-timeout', type=float,
5557
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
5560
def run(self, listen=None, port=None, inet=False, directory=None,
5561
allow_writes=False, protocol=None, client_timeout=None):
5562
from . import transport
4941
5563
if directory is None:
4942
directory = os.getcwd()
5564
directory = osutils.getcwd()
4943
5565
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)
5566
protocol = transport.transport_server_registry.get()
5567
url = transport.location_to_url(directory)
4947
5568
if not allow_writes:
4948
5569
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5570
t = transport.get_transport_from_url(url)
5571
protocol(t, listen, port, inet, client_timeout)
4953
5574
class cmd_join(Command):
4973
5594
def run(self, tree, reference=False):
5595
from breezy.mutabletree import BadReferenceTarget
4974
5596
sub_tree = WorkingTree.open(tree)
4975
5597
parent_dir = osutils.dirname(sub_tree.basedir)
4976
5598
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5599
repo = containing_tree.branch.repository
4978
5600
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5601
raise errors.BzrCommandError(gettext(
4980
5602
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5603
"You can use brz upgrade on the repository.")
4985
5607
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5608
except BadReferenceTarget as e:
4987
5609
# XXX: Would be better to just raise a nicely printable
4988
5610
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5611
raise errors.BzrCommandError(
5612
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5615
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5616
except errors.BadSubsumeSource as e:
5617
raise errors.BzrCommandError(
5618
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5621
class cmd_split(Command):
5055
5678
diff='Normal unified diff.',
5056
5679
plain='No patch, just directive.'),
5057
5680
Option('sign', help='GPG-sign the directive.'), 'revision',
5058
Option('mail-to', type=str,
5681
Option('mail-to', type=text_type,
5059
5682
help='Instead of printing the directive, email to this address.'),
5060
Option('message', type=str, short_name='m',
5683
Option('message', type=text_type, short_name='m',
5061
5684
help='Message to use when committing this merge.')
5064
5687
encoding_type = 'exact'
5066
5689
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
5690
sign=False, revision=None, mail_to=None, message=None,
5692
from .revision import ensure_null, NULL_REVISION
5069
5693
include_patch, include_bundle = {
5070
5694
'plain': (False, False),
5071
5695
'diff': (True, False),
5072
5696
'bundle': (True, True),
5074
branch = Branch.open('.')
5698
branch = Branch.open(directory)
5075
5699
stored_submit_branch = branch.get_submit_branch()
5076
5700
if submit_branch is None:
5077
5701
submit_branch = stored_submit_branch
5208
5839
help='Branch to generate the submission from, '
5209
5840
'rather than the one containing the working directory.',
5210
5841
short_name='f',
5212
5843
Option('output', short_name='o',
5213
5844
help='Write merge directive to this file or directory; '
5214
5845
'use - for stdout.',
5216
5847
Option('strict',
5217
5848
help='Refuse to send if there are uncommitted changes in'
5218
5849
' the working tree, --no-strict disables the check.'),
5219
5850
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5854
Option('body', help='Body for the email.', type=text_type),
5224
5855
RegistryOption('format',
5225
5856
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5857
lazy_registry=('breezy.send', 'format_registry')),
5229
5860
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5861
no_patch=False, revision=None, remember=None, output=None,
5231
5862
format=None, mail_to=None, message=None, body=None,
5232
5863
strict=None, **kwargs):
5233
from bzrlib.send import send
5864
from .send import send
5234
5865
return send(submit_branch, revision, public_branch, remember,
5235
5866
format, no_bundle, no_patch, output,
5236
5867
kwargs.get('from', '.'), mail_to, message, body,
5359
5987
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5988
self.add_cleanup(branch.lock_write().unlock)
5363
5990
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5991
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5992
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5993
note(gettext('Deleted tag %s.') % tag_name)
5369
5996
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5997
raise errors.BzrCommandError(gettext(
5371
5998
"Tags can only be placed on a single revision, "
5373
6000
revision_id = revision[0].as_revision_id(branch)
5375
6002
revision_id = branch.last_revision()
5376
6003
if tag_name is None:
5377
6004
tag_name = branch.automatic_tag_name(revision_id)
5378
6005
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):
6006
raise errors.BzrCommandError(gettext(
6007
"Please specify a tag name."))
6009
existing_target = branch.tags.lookup_tag(tag_name)
6010
except errors.NoSuchTag:
6011
existing_target = None
6012
if not force and existing_target not in (None, revision_id):
5382
6013
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6014
if existing_target == revision_id:
6015
note(gettext('Tag %s already exists for that revision.') % tag_name)
6017
branch.tags.set_tag(tag_name, revision_id)
6018
if existing_target is None:
6019
note(gettext('Created tag %s.') % tag_name)
6021
note(gettext('Updated tag %s.') % tag_name)
5387
6024
class cmd_tags(Command):
5393
6030
_see_also = ['tag']
5394
6031
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6032
custom_help('directory',
6033
help='Branch whose tags should be displayed.'),
6034
RegistryOption('sort',
5401
6035
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6036
lazy_registry=('breezy.tag', 'tag_sort_methods')
5409
6042
@display_command
6043
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6044
from .tag import tag_sort_methods
5416
6045
branch, relpath = Branch.open_containing(directory)
5418
tags = branch.tags.get_tag_dict().items()
6047
tags = list(viewitems(branch.tags.get_tag_dict()))
5423
self.add_cleanup(branch.unlock)
6051
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]])
6053
# Restrict to the specified range
6054
tags = self._tags_for_range(branch, revision)
6056
sort = tag_sort_methods.get()
5444
6058
if not show_ids:
5445
6059
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6060
for index, (tag, revid) in enumerate(tags):
5457
6073
for tag, revspec in tags:
5458
6074
self.outf.write('%-20s %s\n' % (tag, revspec))
6076
def _tags_for_range(self, branch, revision):
6078
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6079
revid1, revid2 = rev1.rev_id, rev2.rev_id
6080
# _get_revision_range will always set revid2 if it's not specified.
6081
# If revid1 is None, it means we want to start from the branch
6082
# origin which is always a valid ancestor. If revid1 == revid2, the
6083
# ancestry check is useless.
6084
if revid1 and revid1 != revid2:
6085
# FIXME: We really want to use the same graph than
6086
# branch.iter_merge_sorted_revisions below, but this is not
6087
# easily available -- vila 2011-09-23
6088
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6089
# We don't want to output anything in this case...
6091
# only show revisions between revid1 and revid2 (inclusive)
6092
tagged_revids = branch.tags.get_reverse_tag_dict()
6094
for r in branch.iter_merge_sorted_revisions(
6095
start_revision_id=revid2, stop_revision_id=revid1,
6096
stop_rule='include'):
6097
revid_tags = tagged_revids.get(r[0], None)
6099
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6103
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6104
__doc__ = """Reconfigure the type of a brz directory.
5464
6106
A target configuration must be specified.
5476
6118
takes_args = ['location?']
5477
6119
takes_options = [
5478
6120
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6123
help='The relation between branch and tree.',
5482
6124
value_switches=True, enum_switch=False,
5483
6125
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6126
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6127
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6128
lightweight_checkout='Reconfigure to be a lightweight'
5487
6129
' checkout (with no local history).',
6131
RegistryOption.from_kwargs(
6133
title='Repository type',
6134
help='Location fo the repository.',
6135
value_switches=True, enum_switch=False,
5488
6136
standalone='Reconfigure to be a standalone branch '
5489
6137
'(i.e. stop using shared repository).',
5490
6138
use_shared='Reconfigure to use a shared repository.',
6140
RegistryOption.from_kwargs(
6142
title='Trees in Repository',
6143
help='Whether new branches in the repository have trees.',
6144
value_switches=True, enum_switch=False,
5491
6145
with_trees='Reconfigure repository to create '
5492
6146
'working trees on branches by default.',
5493
6147
with_no_trees='Reconfigure repository to not create '
5494
6148
'working trees on branches by default.'
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
6150
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5497
6151
Option('force',
5498
6152
help='Perform reconfiguration even if local changes'
5499
6153
' will be lost.'),
5500
6154
Option('stacked-on',
5501
6155
help='Reconfigure a branch to be stacked on another branch.',
5504
6158
Option('unstacked',
5505
6159
help='Reconfigure a branch to be unstacked. This '
5520
6174
# At the moment you can use --stacked-on and a different
5521
6175
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6177
if (tree_type is None and
6178
repository_type is None and
6179
repository_trees is None):
5524
6180
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6183
raise errors.BzrCommandError(gettext('No target configuration '
6185
reconfiguration = None
6186
if tree_type == 'branch':
5530
6187
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6188
elif tree_type == 'tree':
5532
6189
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6190
elif tree_type == 'checkout':
5534
6191
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6192
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6193
elif tree_type == 'lightweight-checkout':
5537
6194
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6195
directory, bind_to)
5539
elif target_type == 'use-shared':
6197
reconfiguration.apply(force)
6198
reconfiguration = None
6199
if repository_type == 'use-shared':
5540
6200
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6201
elif repository_type == 'standalone':
5542
6202
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6204
reconfiguration.apply(force)
6205
reconfiguration = None
6206
if repository_trees == 'with-trees':
5544
6207
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6208
directory, True)
5546
elif target_type == 'with-no-trees':
6209
elif repository_trees == 'with-no-trees':
5547
6210
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6211
directory, False)
5549
reconfiguration.apply(force)
6213
reconfiguration.apply(force)
6214
reconfiguration = None
5552
6217
class cmd_switch(Command):
5575
6240
takes_args = ['to_location?']
5576
takes_options = [Option('force',
6241
takes_options = ['directory',
5577
6243
help='Switch even if local commits will be lost.'),
5579
6245
Option('create-branch', short_name='b',
5580
6246
help='Create the target branch from this one before'
5581
6247
' switching to it.'),
6249
help='Store and restore uncommitted changes in the'
5584
6253
def run(self, to_location=None, force=False, create_branch=False,
5586
from bzrlib import switch
6254
revision=None, directory=u'.', store=False):
6255
from . import switch
6256
tree_location = directory
5588
6257
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6258
possible_transports = []
6259
control_dir = controldir.ControlDir.open_containing(tree_location,
6260
possible_transports=possible_transports)[0]
5590
6261
if to_location is None:
5591
6262
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6263
raise errors.BzrCommandError(gettext('You must supply either a'
6264
' revision or a location'))
6265
to_location = tree_location
5596
branch = control_dir.open_branch()
6267
branch = control_dir.open_branch(
6268
possible_transports=possible_transports)
5597
6269
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6270
except errors.NotBranchError:
5600
6272
had_explicit_nick = False
5601
6273
if create_branch:
5602
6274
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()
6275
raise errors.BzrCommandError(
6276
gettext('cannot create branch without source branch'))
6277
to_location = lookup_new_sibling_branch(control_dir, to_location,
6278
possible_transports=possible_transports)
6279
to_branch = branch.controldir.sprout(to_location,
6280
possible_transports=possible_transports,
6281
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6284
to_branch = Branch.open(to_location,
6285
possible_transports=possible_transports)
5617
6286
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6287
to_branch = open_sibling_branch(control_dir, to_location,
6288
possible_transports=possible_transports)
5621
6289
if revision is not None:
5622
6290
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6292
switch.switch(control_dir, to_branch, force, revision_id=revision,
6293
store_uncommitted=store)
6294
except controldir.BranchReferenceLoop:
6295
raise errors.BzrCommandError(
6296
gettext('switching would create a branch reference loop. '
6297
'Use the "bzr up" command to switch to a '
6298
'different revision.'))
5624
6299
if had_explicit_nick:
5625
6300
branch = control_dir.open_branch() #get the new branch!
5626
6301
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6302
note(gettext('Switched to branch: %s'),
5628
6303
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
6307
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6394
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6396
current_view, view_dict = tree.views.get_view_info()
5737
6397
if name is None:
5738
6398
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6401
raise errors.BzrCommandError(gettext(
6402
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6404
raise errors.BzrCommandError(gettext(
6405
"Both --delete and --switch specified"))
5747
6407
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6408
self.outf.write(gettext("Deleted all views.\n"))
5749
6409
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6410
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6412
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6413
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6416
raise errors.BzrCommandError(gettext(
6417
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6419
raise errors.BzrCommandError(gettext(
6420
"Both --switch and --all specified"))
5761
6421
elif switch == 'off':
5762
6422
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6423
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6424
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6425
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6427
tree.views.set_view_info(switch, view_dict)
5768
6428
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6429
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6432
self.outf.write(gettext('Views defined:\n'))
5773
6433
for view in sorted(view_dict):
5774
6434
if view == current_view:
5778
6438
view_str = views.view_display_str(view_dict[view])
5779
6439
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6441
self.outf.write(gettext('No views defined.\n'))
5782
6442
elif file_list:
5783
6443
if name is None:
5784
6444
# No name given and no current view set
5786
6446
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6447
raise errors.BzrCommandError(gettext(
6448
"Cannot change the 'off' pseudo view"))
5789
6449
tree.views.set_view(name, sorted(file_list))
5790
6450
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6451
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6453
# list the files
5794
6454
if name is None:
5795
6455
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6456
self.outf.write(gettext('No current view.\n'))
5798
6458
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6459
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6462
class cmd_hooks(Command):
5830
6490
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
6492
brz remove-branch repo/trunk
5836
6496
takes_args = ["location?"]
6498
takes_options = ['directory',
6499
Option('force', help='Remove branch even if it is the active branch.')]
5838
6501
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()
6503
def run(self, directory=None, location=None, force=False):
6504
br = open_nearby_branch(near=directory, location=location)
6505
if not force and br.controldir.has_workingtree():
6507
active_branch = br.controldir.open_branch(name="")
6508
except errors.NotBranchError:
6509
active_branch = None
6510
if (active_branch is not None and
6511
br.control_url == active_branch.control_url):
6512
raise errors.BzrCommandError(
6513
gettext("Branch is active. Use --force to remove it."))
6514
br.controldir.destroy_branch(br.name)
5847
6517
class cmd_shelve(Command):
5848
6518
__doc__ = """Temporarily set aside some changes from the current tree.
5868
6538
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6539
restore the most recently shelved changes.
6541
For complicated changes, it is possible to edit the changes in a separate
6542
editor program to decide what the file remaining in the working copy
6543
should look like. To do this, add the configuration option
6545
change_editor = PROGRAM @new_path @old_path
6547
where @new_path is replaced with the path of the new version of the
6548
file and @old_path is replaced with the path of the old version of
6549
the file. The PROGRAM should save the new file with the desired
6550
contents of the file in the working tree.
5872
6554
takes_args = ['file*']
5874
6556
takes_options = [
5876
6559
Option('all', help='Shelve all changes.'),
5878
6561
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6562
breezy.option.diff_writer_registry,
5880
6563
value_switches=True, enum_switch=False),
5882
6565
Option('list', help='List shelved changes.'),
5883
6566
Option('destroy',
5884
6567
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6569
_see_also = ['unshelve', 'configuration']
5888
6571
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6572
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6574
return self.run_for_list(directory=directory)
6575
from .shelf_ui import Shelver
5893
6576
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6577
writer = breezy.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6579
shelver = Shelver.from_args(writer(self.outf), revision, all,
6580
file_list, message, destroy=destroy, directory=directory)
5967
6652
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'
6654
takes_options = ['directory',
6655
Option('ignored', help='Delete all ignored files.'),
6656
Option('detritus', help='Delete conflict files, merge and revert'
5971
6657
' backups, and failed selftest dirs.'),
5972
6658
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6659
help='Delete files unknown to brz (default).'),
5974
6660
Option('dry-run', help='Show files to delete instead of'
5975
6661
' deleting them.'),
5976
6662
Option('force', help='Do not prompt before deleting.')]
5977
6663
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
6664
force=False, directory=u'.'):
6665
from .clean_tree import clean_tree
5980
6666
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6670
clean_tree(directory, unknown=unknown, ignored=ignored,
6671
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6674
class cmd_reference(Command):
6002
6688
if path is not None:
6003
6689
branchdir = path
6004
6690
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6691
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6006
6692
if path is not None:
6008
6694
if tree is None:
6009
6695
tree = branch.basis_tree()
6010
6696
if path is None:
6011
info = branch._get_all_reference_info().iteritems()
6697
info = viewitems(branch._get_all_reference_info())
6012
6698
self._display_reference_info(tree, branch, info)
6014
file_id = tree.path2id(path)
6700
if not tree.is_versioned(path):
6016
6701
raise errors.NotVersionedError(path)
6017
6702
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6703
info = [(path, branch.get_reference_info(path))]
6019
6704
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6706
branch.set_reference_info(
6707
path, location, file_id=tree.path2id(path))
6023
6709
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:
6711
for path, (location, file_id) in info:
6030
6712
ref_list.append((path, location))
6031
6713
for path, location in sorted(ref_list):
6032
6714
self.outf.write('%s %s\n' % (path, location))
6717
class cmd_export_pot(Command):
6718
__doc__ = """Export command helps and error messages in po format."""
6721
takes_options = [Option('plugin',
6722
help='Export help text from named command '\
6723
'(defaults to all built in commands).',
6725
Option('include-duplicates',
6726
help='Output multiple copies of the same msgid '
6727
'string if it appears more than once.'),
6730
def run(self, plugin=None, include_duplicates=False):
6731
from .export_pot import export_pot
6732
export_pot(self.outf, plugin, include_duplicates)
6735
class cmd_import(Command):
6736
__doc__ = """Import sources from a directory, tarball or zip file
6738
This command will import a directory, tarball or zip file into a bzr
6739
tree, replacing any versioned files already present. If a directory is
6740
specified, it is used as the target. If the directory does not exist, or
6741
is not versioned, it is created.
6743
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6745
If the tarball or zip has a single root directory, that directory is
6746
stripped when extracting the tarball. This is not done for directories.
6749
takes_args = ['source', 'tree?']
6751
def run(self, source, tree=None):
6752
from .upstream_import import do_import
6753
do_import(source, tree)
6756
class cmd_link_tree(Command):
6757
__doc__ = """Hardlink matching files to another tree.
6759
Only files with identical content and execute bit will be linked.
6762
takes_args = ['location']
6764
def run(self, location):
6765
from .transform import link_tree
6766
target_tree = WorkingTree.open_containing(".")[0]
6767
source_tree = WorkingTree.open(location)
6768
with target_tree.lock_write(), source_tree.lock_read():
6769
link_tree(target_tree, source_tree)
6772
class cmd_fetch_ghosts(Command):
6773
__doc__ = """Attempt to retrieve ghosts from another branch.
6775
If the other branch is not supplied, the last-pulled branch is used.
6779
aliases = ['fetch-missing']
6780
takes_args = ['branch?']
6781
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6783
def run(self, branch=None, no_fix=False):
6784
from .fetch_ghosts import GhostFetcher
6785
installed, failed = GhostFetcher.from_cmdline(branch).run()
6786
if len(installed) > 0:
6787
self.outf.write("Installed:\n")
6788
for rev in installed:
6789
self.outf.write(rev.decode('utf-8') + "\n")
6791
self.outf.write("Still missing:\n")
6793
self.outf.write(rev.decode('utf-8') + "\n")
6794
if not no_fix and len(installed) > 0:
6795
cmd_reconcile().run(".")
6035
6798
def _register_lazy_builtins():
6036
6799
# register lazy builtins from other modules; called at startup and should
6037
6800
# be only called once.
6038
6801
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'),
6802
('cmd_bisect', [], 'breezy.bisect'),
6803
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6804
('cmd_config', [], 'breezy.config'),
6805
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
6806
('cmd_version_info', [], 'breezy.cmd_version_info'),
6807
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6808
('cmd_conflicts', [], 'breezy.conflicts'),
6809
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6810
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6811
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6812
('cmd_test_script', [], 'breezy.cmd_test_script'),
6046
6814
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
