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.bzr import (
64
from breezy.branch import Branch
65
from breezy.conflicts import ConflictList
66
from breezy.transport import memory
67
from breezy.smtp_connection import SMTPConnection
68
from breezy.workingtree import WorkingTree
69
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
72
from .commands import (
65
74
builtin_command_registry,
68
from bzrlib.option import (
73
82
_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]))
84
from .revisionspec import (
94
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
97
def _get_branch_location(control_dir, possible_transports=None):
98
"""Return location of branch for this control dir."""
100
target = control_dir.get_branch_reference()
101
except errors.NotBranchError:
102
return control_dir.root_transport.base
103
if target is not None:
105
this_branch = control_dir.open_branch(
106
possible_transports=possible_transports)
107
# This may be a heavy checkout, where we want the master branch
108
master_location = this_branch.get_bound_location()
109
if master_location is not None:
110
return master_location
111
# If not, use a local sibling
112
return this_branch.base
115
def _is_colocated(control_dir, possible_transports=None):
116
"""Check if the branch in control_dir is colocated.
118
:param control_dir: Control directory
119
:return: Tuple with boolean indicating whether the branch is colocated
120
and the full URL to the actual branch
122
# This path is meant to be relative to the existing branch
123
this_url = _get_branch_location(control_dir,
124
possible_transports=possible_transports)
125
# Perhaps the target control dir supports colocated branches?
127
root = controldir.ControlDir.open(this_url,
128
possible_transports=possible_transports)
129
except errors.NotBranchError:
130
return (False, this_url)
133
wt = control_dir.open_workingtree()
134
except (errors.NoWorkingTree, errors.NotLocalUrl):
135
return (False, this_url)
138
root._format.colocated_branches and
139
control_dir.control_url == root.control_url,
143
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
144
"""Lookup the location for a new sibling branch.
146
:param control_dir: Control directory to find sibling branches from
147
:param location: Name of the new branch
148
:return: Full location to the new branch
150
location = directory_service.directories.dereference(location)
151
if '/' not in location and '\\' not in location:
152
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
155
return urlutils.join_segment_parameters(this_url,
156
{"branch": urlutils.escape(location)})
158
return urlutils.join(this_url, '..', urlutils.escape(location))
162
def open_sibling_branch(control_dir, location, possible_transports=None):
163
"""Open a branch, possibly a sibling of another.
165
:param control_dir: Control directory relative to which to lookup the
167
:param location: Location to look up
168
:return: branch to open
171
# Perhaps it's a colocated branch?
172
return control_dir.open_branch(location,
173
possible_transports=possible_transports)
174
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
175
this_url = _get_branch_location(control_dir)
178
this_url, '..', urlutils.escape(location)))
181
def open_nearby_branch(near=None, location=None, possible_transports=None):
182
"""Open a nearby branch.
184
:param near: Optional location of container from which to open branch
185
:param location: Location of the branch
186
:return: Branch instance
192
return Branch.open(location,
193
possible_transports=possible_transports)
194
except errors.NotBranchError:
196
cdir = controldir.ControlDir.open(near,
197
possible_transports=possible_transports)
198
return open_sibling_branch(cdir, location,
199
possible_transports=possible_transports)
202
def iter_sibling_branches(control_dir, possible_transports=None):
203
"""Iterate over the siblings of a branch.
205
:param control_dir: Control directory for which to look up the siblings
206
:return: Iterator over tuples with branch name and branch object
210
reference = control_dir.get_branch_reference()
211
except errors.NotBranchError:
212
# There is no active branch, just return the colocated branches.
213
for name, branch in viewitems(control_dir.get_branches()):
216
if reference is not None:
217
ref_branch = Branch.open(reference,
218
possible_transports=possible_transports)
221
if ref_branch is None or ref_branch.name:
222
if ref_branch is not None:
223
control_dir = ref_branch.controldir
224
for name, branch in viewitems(control_dir.get_branches()):
227
repo = ref_branch.controldir.find_repository()
228
for branch in repo.find_branches(using=True):
229
name = urlutils.relative_url(repo.user_url,
230
branch.user_url).rstrip("/")
88
234
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
299
def _get_view_info_for_change_reporter(tree):
224
300
"""Get the view information from a tree for change reporting."""
342
436
takes_args = ['revision_id?']
343
takes_options = ['revision']
437
takes_options = ['directory', 'revision']
344
438
# cat-revision is more for frontends so should be exact
345
439
encoding = 'strict'
347
441
def print_revision(self, revisions, revid):
348
442
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
443
record = next(stream)
350
444
if record.storage_kind == 'absent':
351
445
raise errors.NoSuchRevision(revisions, revid)
352
446
revtext = record.get_bytes_as('fulltext')
353
447
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
450
def run(self, revision_id=None, revision=None, directory=u'.'):
357
451
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')
452
raise errors.BzrCommandError(gettext('You can only supply one of'
453
' revision_id or --revision'))
360
454
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
455
raise errors.BzrCommandError(gettext('You must supply either'
456
' --revision or a revision_id'))
458
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
460
revisions = b.repository.revisions
366
461
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
462
raise errors.BzrCommandError(gettext('Repository %r does not support '
463
'access to raw revision texts'))
370
b.repository.lock_read()
465
with b.repository.lock_read():
372
466
# TODO: jam 20060112 should cat-revision always output utf-8?
373
467
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
468
revision_id = cache_utf8.encode(revision_id)
376
470
self.print_revision(revisions, revision_id)
377
471
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
472
msg = gettext("The repository {0} contains no revision {1}.").format(
379
473
b.repository.base, revision_id)
380
474
raise errors.BzrCommandError(msg)
381
475
elif revision is not None:
382
476
for rev in revision:
384
478
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
479
gettext('You cannot specify a NULL revision.'))
386
480
rev_id = rev.as_revision_id(b)
387
481
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
484
class cmd_dump_btree(Command):
393
485
__doc__ = """Dump the contents of a btree index file to stdout.
491
586
location_list=['.']
493
588
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
589
d = controldir.ControlDir.open(location)
497
592
working = d.open_workingtree()
498
593
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
594
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
595
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
596
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
597
" of a remote path"))
504
599
if (working.has_changes()):
505
600
raise errors.UncommittedChanges(working)
601
if working.get_shelf_manager().last_shelf() is not None:
602
raise errors.ShelvedChanges(working)
507
604
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
605
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
606
" from a lightweight checkout"))
511
608
d.destroy_workingtree()
611
class cmd_repair_workingtree(Command):
612
__doc__ = """Reset the working tree state file.
614
This is not meant to be used normally, but more as a way to recover from
615
filesystem corruption, etc. This rebuilds the working inventory back to a
616
'known good' state. Any new modifications (adding a file, renaming, etc)
617
will be lost, though modified files will still be detected as such.
619
Most users will want something more like "brz revert" or "brz update"
620
unless the state file has become corrupted.
622
By default this attempts to recover the current state by looking at the
623
headers of the state file. If the state file is too corrupted to even do
624
that, you can supply --revision to force the state of the tree.
627
takes_options = ['revision', 'directory',
629
help='Reset the tree even if it doesn\'t appear to be'
634
def run(self, revision=None, directory='.', force=False):
635
tree, _ = WorkingTree.open_containing(directory)
636
self.add_cleanup(tree.lock_tree_write().unlock)
640
except errors.BzrError:
641
pass # There seems to be a real error here, so we'll reset
644
raise errors.BzrCommandError(gettext(
645
'The tree does not appear to be corrupt. You probably'
646
' want "brz revert" instead. Use "--force" if you are'
647
' sure you want to reset the working tree.'))
651
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
653
tree.reset_state(revision_ids)
654
except errors.BzrError as e:
655
if revision_ids is None:
656
extra = (gettext(', the header appears corrupt, try passing -r -1'
657
' to set the state to the last commit'))
660
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
663
class cmd_revno(Command):
515
664
__doc__ = """Show current revision number.
520
669
_see_also = ['info']
521
670
takes_args = ['location?']
522
671
takes_options = [
523
Option('tree', help='Show revno of working tree'),
672
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
677
def run(self, tree=False, location=u'.', revision=None):
678
if revision is not None and tree:
679
raise errors.BzrCommandError(gettext("--tree and --revision can "
680
"not be used together"))
530
684
wt = WorkingTree.open_containing(location)[0]
685
self.add_cleanup(wt.lock_read().unlock)
532
686
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
687
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
689
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
691
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
692
self.add_cleanup(b.lock_read().unlock)
694
if len(revision) != 1:
695
raise errors.BzrCommandError(gettext(
696
"Revision numbers only make sense for single "
697
"revisions, not ranges"))
698
revid = revision[0].as_revision_id(b)
700
revid = b.last_revision()
702
revno_t = b.revision_id_to_dotted_revno(revid)
703
except errors.NoSuchRevision:
705
revno = ".".join(str(n) for n in revno_t)
546
706
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
707
self.outf.write(revno + '\n')
550
710
class cmd_revision_info(Command):
675
838
base_tree = base_branch.basis_tree()
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
840
action = breezy.add.AddFromBaseAction(base_tree, base_path,
678
841
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
843
action = breezy.add.AddWithSkipLargeAction(to_file=self.outf,
681
844
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
847
self.add_cleanup(base_tree.lock_read().unlock)
686
848
tree, file_list = tree_files_for_add(file_list)
687
849
added, ignored = tree.smart_add(file_list, not
688
850
no_recurse, action=action, save=not dry_run)
689
851
self.cleanup_now()
690
852
if len(ignored) > 0:
692
for glob in sorted(ignored.keys()):
854
for glob in sorted(ignored):
693
855
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
857
gettext("ignored {0} matching \"{1}\"\n").format(
698
861
class cmd_mkdir(Command):
751
939
help='List entries of a particular kind: file, directory, symlink.',
754
942
takes_args = ['file*']
757
945
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
946
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
947
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
949
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)
950
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
951
self.add_cleanup(work_tree.lock_read().unlock)
765
952
if revision is not None:
766
953
tree = revision.as_tree(work_tree.branch)
768
955
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
956
self.add_cleanup(tree.lock_read().unlock)
961
self.add_cleanup(tree.lock_read().unlock)
775
962
if file_list is not None:
776
963
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
964
require_versioned=True)
778
965
# find_ids_across_trees may include some paths that don't
779
966
# 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)
967
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
969
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
971
for path, entry in sorted(entries):
787
972
if kind and kind != entry.kind:
790
977
self.outf.write('%-50s %s\n' % (path, entry.file_id))
793
980
self.outf.write('\n')
983
class cmd_cp(Command):
984
__doc__ = """Copy a file.
987
brz cp OLDNAME NEWNAME
989
brz cp SOURCE... DESTINATION
991
If the last argument is a versioned directory, all the other names
992
are copied into it. Otherwise, there must be exactly two arguments
993
and the file is copied to a new name.
995
Files cannot be copied between branches. Only files can be copied
999
takes_args = ['names*']
1002
encoding_type = 'replace'
1004
def run(self, names_list):
1006
if names_list is None:
1008
if len(names_list) < 2:
1009
raise errors.BzrCommandError(gettext("missing file argument"))
1010
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1011
for file_name in rel_names[0:-1]:
1013
raise errors.BzrCommandError(gettext("can not copy root of branch"))
1014
self.add_cleanup(tree.lock_tree_write().unlock)
1015
into_existing = osutils.isdir(names_list[-1])
1016
if not into_existing:
1018
(src, dst) = rel_names
1020
raise errors.BzrCommandError(gettext('to copy multiple files the'
1021
' destination must be a versioned'
1023
pairs = [(src, dst)]
1025
pairs = [(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
1026
for n in rel_names[:-1]]
1028
for src, dst in pairs:
1030
src_kind = tree.stored_kind(src)
1031
except errors.NoSuchFile:
1032
raise errors.BzrCommandError(
1033
gettext('Could not copy %s => %s: %s is not versioned.')
1035
if src_kind is None:
1036
raise errors.BzrCommandError(
1037
gettext('Could not copy %s => %s . %s is not versioned\.'
1039
if src_kind == 'directory':
1040
raise errors.BzrCommandError(
1041
gettext('Could not copy %s => %s . %s is a directory.'
1043
dst_parent = osutils.split(dst)[0]
1044
if dst_parent != '':
1046
dst_parent_kind = tree.stored_kind(dst_parent)
1047
except errors.NoSuchFile:
1048
raise errors.BzrCommandError(
1049
gettext('Could not copy %s => %s: %s is not versioned.')
1050
% (src, dst, dst_parent))
1051
if dst_parent_kind != 'directory':
1052
raise errors.BzrCommandError(
1053
gettext('Could not copy to %s: %s is not a directory.')
1054
% (dst_parent, dst_parent))
1056
tree.copy_one(src, dst)
796
1059
class cmd_mv(Command):
797
1060
__doc__ = """Move or rename a file.
800
bzr mv OLDNAME NEWNAME
1063
brz mv OLDNAME NEWNAME
802
bzr mv SOURCE... DESTINATION
1065
brz mv SOURCE... DESTINATION
804
1067
If the last argument is a versioned directory, all the other names
805
1068
are moved into it. Otherwise, there must be exactly two arguments
828
1091
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1093
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1094
if names_list is None:
833
1096
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)
1097
raise errors.BzrCommandError(gettext("missing file argument"))
1098
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1099
for file_name in rel_names[0:-1]:
1101
raise errors.BzrCommandError(gettext("can not move root of branch"))
1102
self.add_cleanup(tree.lock_tree_write().unlock)
838
1103
self._run(tree, names_list, rel_names, after)
840
1105
def run_auto(self, names_list, after, dry_run):
841
1106
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1107
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)
1110
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1112
work_tree, file_list = WorkingTree.open_containing_paths(
1113
names_list, default_directory='.')
1114
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1115
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1117
def _run(self, tree, names_list, rel_names, after):
946
1211
match the remote one, use pull --overwrite. This will work even if the two
947
1212
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.
1214
If there is no default location set, the first pull will set it (use
1215
--no-remember to avoid setting it). After that, you can omit the
1216
location to use the default. To change the default, use --remember. The
1217
value will only be saved if the remote location can be accessed.
1219
The --verbose option will display the revisions pulled using the log_format
1220
configuration option. You can use a different format by overriding it with
1221
-Olog_format=<other_format>.
954
1223
Note: The location can be specified either in the form of a branch,
955
1224
or in the form of a path to a file containing a merge directive generated
959
1228
_see_also = ['push', 'update', 'status-flags', 'send']
960
1229
takes_options = ['remember', 'overwrite', 'revision',
961
1230
custom_help('verbose',
962
1231
help='Show logs of pulled revisions.'),
1232
custom_help('directory',
964
1233
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1234
'rather than the one containing the working directory.'),
970
1236
help="Perform a local pull in a bound "
971
1237
"branch. Local pulls are not applied to "
972
1238
"the master branch."
1241
help="Show base revision text in conflicts."),
1242
Option('overwrite-tags',
1243
help="Overwrite tags only."),
975
1245
takes_args = ['location?']
976
1246
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1248
def run(self, location=None, remember=None, overwrite=False,
979
1249
revision=None, verbose=False,
980
directory=None, local=False):
1250
directory=None, local=False,
1251
show_base=False, overwrite_tags=False):
1254
overwrite = ["history", "tags"]
1255
elif overwrite_tags:
1256
overwrite = ["tags"]
981
1259
# FIXME: too much stuff is in the command class
982
1260
revision_id = None
983
1261
mergeable = None
1070
1354
considered diverged if the destination branch's most recent commit is one
1071
1355
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
1357
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1358
the other branch completely, discarding its unmerged changes.
1076
1360
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.
1361
do a merge (see brz help merge) from the other branch, and commit that.
1078
1362
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.
1364
If there is no default push location set, the first push will set it (use
1365
--no-remember to avoid setting it). After that, you can omit the
1366
location to use the default. To change the default, use --remember. The
1367
value will only be saved if the remote location can be accessed.
1369
The --verbose option will display the revisions pushed using the log_format
1370
configuration option. You can use a different format by overriding it with
1371
-Olog_format=<other_format>.
1086
1374
_see_also = ['pull', 'update', 'working-trees']
1106
1391
help='Create a stacked branch that refers to another branch '
1107
1392
'for the commit history. Only the work not present in the '
1108
1393
'referenced branch is included in the branch created.',
1110
1395
Option('strict',
1111
1396
help='Refuse to push if there are uncommitted changes in'
1112
1397
' the working tree, --no-strict disables the check.'),
1399
help="Don't populate the working tree, even for protocols"
1400
" that support it."),
1401
Option('overwrite-tags',
1402
help="Overwrite tags only."),
1114
1404
takes_args = ['location?']
1115
1405
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1407
def run(self, location=None, remember=None, overwrite=False,
1118
1408
create_prefix=False, verbose=False, revision=None,
1119
1409
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1410
stacked=False, strict=None, no_tree=False,
1411
overwrite_tags=False):
1412
from .push import _show_push_branch
1415
overwrite = ["history", "tags"]
1416
elif overwrite_tags:
1417
overwrite = ["tags"]
1123
1421
if directory is None:
1124
1422
directory = '.'
1125
1423
# Get the source branch
1126
1424
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1425
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1426
# Get the tip's revision_id
1129
1427
revision = _get_one_revision('push', revision)
1130
1428
if revision is not None:
1151
1449
# error by the feedback given to them. RBC 20080227.
1152
1450
stacked_on = parent_url
1153
1451
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1452
raise errors.BzrCommandError(gettext(
1453
"Could not determine branch to refer to."))
1157
1455
# Get the destination location
1158
1456
if location is None:
1159
1457
stored_loc = br_from.get_push_location()
1160
1458
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1459
parent_loc = br_from.get_parent()
1461
raise errors.BzrCommandError(gettext(
1462
"No push location known or specified. To push to the "
1463
"parent branch (at %s), use 'brz push :parent'." %
1464
urlutils.unescape_for_display(parent_loc,
1465
self.outf.encoding)))
1467
raise errors.BzrCommandError(gettext(
1468
"No push location known or specified."))
1164
1470
display_url = urlutils.unescape_for_display(stored_loc,
1165
1471
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1472
note(gettext("Using saved push location: %s") % display_url)
1167
1473
location = stored_loc
1169
1475
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1476
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1477
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1478
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1481
class cmd_branch(Command):
1210
1518
help="Bind new branch to from location."),
1212
aliases = ['get', 'clone']
1214
1521
def run(self, from_location, to_location=None, revision=None,
1215
1522
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(
1523
use_existing_dir=False, switch=False, bind=False,
1525
from breezy import switch as _mod_switch
1526
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1528
if not (hardlink or files_from):
1529
# accelerator_tree is usually slower because you have to read N
1530
# files (no readahead, lots of seeks, etc), but allow the user to
1531
# explicitly request it
1532
accelerator_tree = None
1533
if files_from is not None and files_from != from_location:
1534
accelerator_tree = WorkingTree.open(files_from)
1221
1535
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1536
self.add_cleanup(br_from.lock_read().unlock)
1224
1537
if revision is not None:
1225
1538
revision_id = revision.as_revision_id(br_from)
1230
1543
revision_id = br_from.last_revision()
1231
1544
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1545
to_location = getattr(br_from, "name", None)
1547
to_location = urlutils.derive_to_location(from_location)
1233
1548
to_transport = transport.get_transport(to_location)
1235
1550
to_transport.mkdir('.')
1236
1551
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1553
to_dir = controldir.ControlDir.open_from_transport(
1555
except errors.NotBranchError:
1556
if not use_existing_dir:
1557
raise errors.BzrCommandError(gettext('Target directory "%s" '
1558
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1563
to_dir.open_branch()
1243
1564
except errors.NotBranchError:
1246
1567
raise errors.AlreadyBranchError(to_location)
1247
1568
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1569
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)
1575
# preserve whatever source format we have.
1576
to_dir = br_from.controldir.sprout(
1577
to_transport.base, revision_id,
1578
possible_transports=[to_transport],
1579
accelerator_tree=accelerator_tree, hardlink=hardlink,
1580
stacked=stacked, force_new_repo=standalone,
1581
create_tree_if_local=not no_tree, source_branch=br_from)
1582
branch = to_dir.open_branch(
1583
possible_transports=[
1584
br_from.controldir.root_transport, to_transport])
1585
except errors.NoSuchRevision:
1586
to_transport.delete_tree('.')
1587
msg = gettext("The branch {0} has no revision {1}.").format(
1588
from_location, revision)
1589
raise errors.BzrCommandError(msg)
1592
to_repo = to_dir.open_repository()
1593
except errors.NoRepositoryPresent:
1594
to_repo = to_dir.create_repository()
1595
to_repo.fetch(br_from.repository, revision_id=revision_id)
1596
branch = br_from.sprout(to_dir, revision_id=revision_id)
1597
br_from.tags.merge_to(branch.tags)
1266
1599
# If the source branch is stacked, the new branch may
1267
1600
# be stacked whether we asked for that explicitly or not.
1268
1601
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1603
note(gettext('Created new stacked branch referring to %s.') %
1271
1604
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1605
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1606
errors.UnstackableRepositoryFormat) as e:
1607
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1609
# Bind to the parent
1277
1610
parent_branch = Branch.open(from_location)
1278
1611
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1612
note(gettext('New branch bound to %s') % from_location)
1281
1614
# Switch to the new branch
1282
1615
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1616
_mod_switch.switch(wt.controldir, branch)
1617
note(gettext('Switched to branch: %s'),
1285
1618
urlutils.unescape_for_display(branch.base, 'utf-8'))
1621
class cmd_branches(Command):
1622
__doc__ = """List the branches available at the current location.
1624
This command will print the names of all the branches at the current
1628
takes_args = ['location?']
1630
Option('recursive', short_name='R',
1631
help='Recursively scan for branches rather than '
1632
'just looking in the specified location.')]
1634
def run(self, location=".", recursive=False):
1636
t = transport.get_transport(location)
1637
if not t.listable():
1638
raise errors.BzrCommandError(
1639
"Can't scan this type of location.")
1640
for b in controldir.ControlDir.find_branches(t):
1641
self.outf.write("%s\n" % urlutils.unescape_for_display(
1642
urlutils.relative_url(t.base, b.base),
1643
self.outf.encoding).rstrip("/"))
1645
dir = controldir.ControlDir.open_containing(location)[0]
1647
active_branch = dir.open_branch(name="")
1648
except errors.NotBranchError:
1649
active_branch = None
1651
for name, branch in iter_sibling_branches(dir):
1654
active = (active_branch is not None and
1655
active_branch.base == branch.base)
1656
names[name] = active
1657
# Only mention the current branch explicitly if it's not
1658
# one of the colocated branches
1659
if not any(viewvalues(names)) and active_branch is not None:
1660
self.outf.write("* %s\n" % gettext("(default)"))
1661
for name in sorted(names):
1662
active = names[name]
1667
self.outf.write("%s %s\n" % (
1668
prefix, name.encode(self.outf.encoding)))
1288
1671
class cmd_checkout(Command):
1289
1672
__doc__ = """Create a new checkout of an existing branch.
1389
1773
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
1774
__doc__ = """Update a working tree to a new revision.
1776
This will perform a merge of the destination revision (the tip of the
1777
branch, or the specified revision) into the working tree, and then make
1778
that revision the basis revision for the working tree.
1780
You can use this to visit an older revision, or to update a working tree
1781
that is out of date from its branch.
1783
If there are any uncommitted changes in the tree, they will be carried
1784
across and remain as uncommitted changes after the update. To discard
1785
these changes, use 'brz revert'. The uncommitted changes may conflict
1786
with the changes brought in by the change in basis revision.
1788
If the tree's branch is bound to a master branch, brz will also update
1400
1789
the branch from the master.
1791
You cannot update just a single file or directory, because each Bazaar
1792
working tree has just a single basis revision. If you want to restore a
1793
file that has been removed locally, use 'brz revert' instead of 'brz
1794
update'. If you want to restore a file to its state in a previous
1795
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1796
out the old content of that file to a new location.
1798
The 'dir' argument, if given, must be the location of the root of a
1799
working tree to update. By default, the working tree that contains the
1800
current working directory is used.
1403
1803
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1804
takes_args = ['dir?']
1405
takes_options = ['revision']
1805
takes_options = ['revision',
1807
help="Show base revision text in conflicts."),
1406
1809
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1811
def run(self, dir=None, revision=None, show_base=None):
1409
1812
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]
1813
raise errors.BzrCommandError(gettext(
1814
"brz update --revision takes exactly one revision"))
1816
tree = WorkingTree.open_containing('.')[0]
1818
tree, relpath = WorkingTree.open_containing(dir)
1821
raise errors.BzrCommandError(gettext(
1822
"brz update can only update a whole tree, "
1823
"not a file or subdirectory"))
1413
1824
branch = tree.branch
1414
1825
possible_transports = []
1415
1826
master = branch.get_master_branch(
1416
1827
possible_transports=possible_transports)
1417
1828
if master is not None:
1419
1829
branch_location = master.base
1832
branch_location = tree.branch.base
1421
1833
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1834
self.add_cleanup(tree.unlock)
1424
1835
# get rid of the final '/' and be ready for display
1425
1836
branch_location = urlutils.unescape_for_display(
1451
1862
change_reporter,
1452
1863
possible_transports=possible_transports,
1453
1864
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1866
show_base=show_base)
1867
except errors.NoSuchRevision as e:
1868
raise errors.BzrCommandError(gettext(
1457
1869
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1870
"brz update --revision only works"
1871
" for a revision in the branch history")
1460
1872
% (e.revision))
1461
1873
revno = tree.branch.revision_id_to_dotted_revno(
1462
1874
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1875
note(gettext('Updated to revision {0} of branch {1}').format(
1876
'.'.join(map(str, revno)), branch_location))
1465
1877
parent_ids = tree.get_parent_ids()
1466
1878
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'.")
1879
note(gettext('Your local commits will now show as pending merges with '
1880
"'brz status', and can be committed with 'brz commit'."))
1469
1881
if conflicts != 0:
1530
1943
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1944
'The file deletion mode to be used.',
1532
1945
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.')]
1946
safe='Backup changed files (default).',
1947
keep='Delete from brz but leave the working copy.',
1948
no_backup='Don\'t backup changed files.'),
1538
1950
aliases = ['rm', 'del']
1539
1951
encoding_type = 'replace'
1541
1953
def run(self, file_list, verbose=False, new=False,
1542
1954
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1956
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1958
if file_list is not None:
1546
1959
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1961
self.add_cleanup(tree.lock_write().unlock)
1550
1962
# Heuristics should probably all move into tree.remove_smart or
1742
2170
to_transport.ensure_base()
1743
2171
except errors.NoSuchFile:
1744
2172
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2173
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2174
" does not exist."
1747
2175
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2176
" leading parent directories.")
1750
2178
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2181
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1754
2182
except errors.NotBranchError:
1755
2183
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2184
create_branch = controldir.ControlDir.create_branch_convenience
2186
force_new_tree = False
2188
force_new_tree = None
1757
2189
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2190
possible_transports=[to_transport],
2191
force_new_tree=force_new_tree)
2192
a_controldir = branch.controldir
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2194
from .transport.local import LocalTransport
2195
if a_controldir.has_branch():
1763
2196
if (isinstance(to_transport, LocalTransport)
1764
and not a_bzrdir.has_workingtree()):
2197
and not a_controldir.has_workingtree()):
1765
2198
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2199
raise errors.AlreadyBranchError(location)
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2200
branch = a_controldir.create_branch()
2201
if not no_tree and not a_controldir.has_workingtree():
2202
a_controldir.create_workingtree()
1769
2203
if append_revisions_only:
1771
2205
branch.set_append_revisions_only(True)
1772
2206
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2207
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2208
' to append-revisions-only. Try --default.'))
1775
2209
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2210
from .info import describe_layout, describe_format
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2212
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1779
2213
except (errors.NoWorkingTree, errors.NotLocalUrl):
1781
2215
repository = branch.repository
1782
2216
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))
2217
format = describe_format(a_controldir, repository, branch, tree)
2218
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
2220
if repository.is_shared():
1786
2221
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
2222
url = repository.controldir.root_transport.external_url()
1789
2224
url = urlutils.local_path_from_url(url)
1790
except errors.InvalidURL:
2225
except urlutils.InvalidURL:
1792
self.outf.write("Using shared repository: %s\n" % url)
2227
self.outf.write(gettext("Using shared repository: %s\n") % url)
1795
2230
class cmd_init_repository(Command):
1837
2272
def run(self, location, format=None, no_trees=False):
1838
2273
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2274
format = controldir.format_registry.make_controldir('default')
1841
2276
if location is None:
1844
2279
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)
2281
(repo, newdir, require_stacking, repository_policy) = (
2282
format.initialize_on_transport_ex(to_transport,
2283
create_prefix=True, make_working_trees=not no_trees,
2284
shared_repo=True, force_new_repo=True,
2285
use_existing_dir=True,
2286
repo_format_name=format.repository_format.get_format_string()))
1850
2287
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2288
from .info import show_bzrdir_info
2289
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2292
class cmd_diff(Command):
1875
2319
Shows the difference in the working tree versus the last commit::
1879
2323
Difference between the working tree and revision 1::
1883
2327
Difference between revision 3 and revision 1::
1887
2331
Difference between revision 3 and revision 1 for branch xxx::
1891
To see the changes introduced in revision X::
2335
The changes introduced by revision 2 (equivalent to -r1..2)::
2339
To see the changes introduced by revision X::
1895
2343
Note that in the case of a merge, the -c option shows the changes
1896
2344
compared to the left hand parent. To see the changes against
1897
2345
another parent, use::
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2347
brz diff -r<chosen_parent>..X
2349
The changes between the current revision and the previous revision
2350
(equivalent to -c-1 and -r-2..-1)
1905
2354
Show just the differences for file NEWS::
1909
2358
Show the differences in working tree xxx for file NEWS::
1913
2362
Show the differences from branch xxx to this working tree:
1917
2366
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/
2368
brz diff --old xxx --new yyy NEWS
2370
Same as 'brz diff' but prefix paths with old/ and new/::
2372
brz diff --prefix old/:new/
2374
Show the differences using a custom diff program with options::
2376
brz diff --using /usr/bin/diff --diff-options -wu
1925
2378
_see_also = ['status']
1926
2379
takes_args = ['file*']
1927
2380
takes_options = [
1928
Option('diff-options', type=str,
2381
Option('diff-options', type=text_type,
1929
2382
help='Pass these options to the external diff program.'),
1930
Option('prefix', type=str,
2383
Option('prefix', type=text_type,
1931
2384
short_name='p',
1932
2385
help='Set prefixes added to old and new filenames, as '
1933
2386
'two values separated by a colon. (eg "old/:new/").'),
1935
2388
help='Branch/tree to compare from.',
1939
2392
help='Branch/tree to compare to.',
1944
2397
Option('using',
1945
2398
help='Use this command to compare files.',
1948
2401
RegistryOption('format',
1949
2403
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2404
lazy_registry=('breezy.diff', 'format_registry'),
2405
title='Diff format'),
2407
help='How many lines of context to show.',
1953
2411
aliases = ['di', 'dif']
1954
2412
encoding_type = 'exact'
1956
2414
@display_command
1957
2415
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,
2416
prefix=None, old=None, new=None, using=None, format=None,
2418
from .diff import (get_trees_and_branches_to_diff_locked,
1960
2419
show_diff_trees)
1962
if (prefix is None) or (prefix == '0'):
1963
2422
# diff -p0 format
2425
elif prefix == u'1' or prefix is None:
1967
2426
old_label = 'old/'
1968
2427
new_label = 'new/'
1970
old_label, new_label = prefix.split(":")
2428
elif u':' in prefix:
2429
old_label, new_label = prefix.split(u":")
1972
raise errors.BzrCommandError(
2431
raise errors.BzrCommandError(gettext(
1973
2432
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2433
' (eg "old/:new/")'))
1976
2435
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2436
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2437
' one or two revision specifiers'))
1980
2439
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2440
raise errors.BzrCommandError(gettext(
2441
'{0} and {1} are mutually exclusive').format(
2442
'--using', '--format'))
1984
2444
(old_tree, new_tree,
1985
2445
old_branch, new_branch,
1986
2446
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2447
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2448
# GNU diff on Windows uses ANSI encoding for filenames
2449
path_encoding = osutils.get_diff_header_encoding()
2450
return show_diff_trees(old_tree, new_tree, self.outf,
1989
2451
specific_files=specific_files,
1990
2452
external_diff_options=diff_options,
1991
2453
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2454
extra_trees=extra_trees,
2455
path_encoding=path_encoding,
2456
using=using, context=context,
1993
2457
format_cls=format)
2053
2513
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2514
takes_options = ['directory', 'null']
2060
2516
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2517
def run(self, null=False, directory=u'.'):
2518
wt = WorkingTree.open_containing(directory)[0]
2519
self.add_cleanup(wt.lock_read().unlock)
2065
2520
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):
2521
self.add_cleanup(basis.lock_read().unlock)
2522
root_id = wt.get_root_id()
2523
for path in wt.all_versioned_paths():
2524
if basis.has_filename(path):
2528
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2531
self.outf.write(path + '\0')
2224
2676
:Other filtering:
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2678
The --match option can be used for finding revisions that match a
2679
regular expression in a commit message, committer, author or bug.
2680
Specifying the option several times will match any of the supplied
2681
expressions. --match-author, --match-bugs, --match-committer and
2682
--match-message can be used to only match a specific field.
2229
2684
:Tips & tricks:
2231
2686
GUI tools and IDEs are often better at exploring history than command
2232
2687
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
2688
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2689
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
2690
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2692
You may find it useful to add the aliases below to ``breezy.conf``::
2241
2696
top = log -l10 --line
2242
2697
show = log -v -p
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2699
``brz tip`` will then show the latest revision while ``brz top``
2245
2700
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2701
particular revision X, ``brz show -rX``.
2248
2703
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2704
use ``brz log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2706
``brz log -v`` on a branch with lots of history is currently
2252
2707
very slow. A fix for this issue is currently under development.
2253
2708
With or without that fix, it is recommended that a revision range
2254
2709
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2711
brz has a generic full-text matching plugin, brz-search, that can be
2257
2712
used to find revisions matching user names, commit messages, etc.
2258
2713
Among other features, this plugin can find all revisions containing
2259
2714
a list of words but not others.
2297
2757
Option('show-diff',
2298
2758
short_name='p',
2299
2759
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2760
Option('include-merged',
2301
2761
help='Show merged revisions like --levels 0 does.'),
2762
Option('include-merges', hidden=True,
2763
help='Historical alias for --include-merged.'),
2764
Option('omit-merges',
2765
help='Do not report commits with more than one parent.'),
2302
2766
Option('exclude-common-ancestry',
2303
2767
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2768
' of both ancestries (require -rX..Y).'
2770
Option('signatures',
2771
help='Show digital signature validity.'),
2774
help='Show revisions whose properties match this '
2777
ListOption('match-message',
2778
help='Show revisions whose message matches this '
2781
ListOption('match-committer',
2782
help='Show revisions whose committer matches this '
2785
ListOption('match-author',
2786
help='Show revisions whose authors match this '
2789
ListOption('match-bugs',
2790
help='Show revisions whose bugs match this '
2307
2794
encoding_type = 'replace'
2528
3045
help='Recurse into subdirectories.'),
2529
3046
Option('from-root',
2530
3047
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
3048
Option('unknown', short_name='u',
3049
help='Print unknown files.'),
2532
3050
Option('versioned', help='Print versioned files.',
2533
3051
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.'),
3052
Option('ignored', short_name='i',
3053
help='Print ignored files.'),
3054
Option('kind', short_name='k',
2539
3055
help='List entries of a particular kind: file, directory, symlink.',
2543
3061
@display_command
2544
3062
def run(self, revision=None, verbose=False,
2545
3063
recursive=False, from_root=False,
2546
3064
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
3065
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
3067
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
3068
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
3070
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3071
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
3072
all = not (unknown or versioned or ignored)
2556
3074
selection = {'I':ignored, '?':unknown, 'V':versioned}
2674
3192
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3193
precedence over the '!' exception patterns.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3197
* Ignore patterns containing shell wildcards must be quoted from
3200
* Ignore patterns starting with "#" act as comments in the ignore file.
3201
To ignore patterns that begin with that character, use the "RE:" prefix.
2681
3204
Ignore the top level Makefile::
2683
bzr ignore ./Makefile
3206
brz ignore ./Makefile
2685
3208
Ignore .class files in all directories...::
2687
bzr ignore "*.class"
3210
brz ignore "*.class"
2689
3212
...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"
3214
brz ignore "!special.class"
3216
Ignore files whose name begins with the "#" character::
3220
Ignore .o files under the lib directory::
3222
brz ignore "lib/**/*.o"
3224
Ignore .o files under the lib directory::
3226
brz ignore "RE:lib/.*\\.o"
2701
3228
Ignore everything but the "debian" toplevel directory::
2703
bzr ignore "RE:(?!debian/).*"
3230
brz ignore "RE:(?!debian/).*"
2705
3232
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
3233
but always ignore autosave files ending in ~, even under local/::
2709
bzr ignore "!./local"
3236
brz ignore "!./local"
2713
3240
_see_also = ['status', 'ignored', 'patterns']
2714
3241
takes_args = ['name_pattern*']
3242
takes_options = ['directory',
2716
3243
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3244
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
3247
def run(self, name_pattern_list=None, default_rules=None,
3249
from breezy import ignores
2722
3250
if default_rules is not None:
2723
3251
# dump the default rules and exit
2724
3252
for pattern in ignores.USER_DEFAULTS:
2725
3253
self.outf.write("%s\n" % pattern)
2727
3255
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3256
raise errors.BzrCommandError(gettext("ignore requires at least one "
3257
"NAME_PATTERN or --default-rules."))
2730
3258
name_pattern_list = [globbing.normalize_pattern(p)
2731
3259
for p in name_pattern_list]
3261
bad_patterns_count = 0
3262
for p in name_pattern_list:
3263
if not globbing.Globster.is_pattern_valid(p):
3264
bad_patterns_count += 1
3265
bad_patterns += ('\n %s' % p)
3267
msg = (ngettext('Invalid ignore pattern found. %s',
3268
'Invalid ignore patterns found. %s',
3269
bad_patterns_count) % bad_patterns)
3270
ui.ui_factory.show_error(msg)
3271
raise lazy_regex.InvalidPattern('')
2732
3272
for name_pattern in name_pattern_list:
2733
3273
if (name_pattern[0] == '/' or
2734
3274
(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'.')
3275
raise errors.BzrCommandError(gettext(
3276
"NAME_PATTERN should not be an absolute path"))
3277
tree, relpath = WorkingTree.open_containing(directory)
2738
3278
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3279
ignored = globbing.Globster(name_pattern_list)
3281
self.add_cleanup(tree.lock_read().unlock)
2742
3282
for entry in tree.list_files():
2744
3284
if id is not None:
2745
3285
filename = entry[0]
2746
3286
if ignored.match(filename):
2747
3287
matches.append(filename)
2749
3288
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3289
self.outf.write(gettext("Warning: the following files are version "
3290
"controlled and match your ignore pattern:\n%s"
2752
3291
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3292
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2756
3295
class cmd_ignored(Command):
2829
3369
================= =========================
2831
3372
takes_args = ['dest', 'branch_or_subdir?']
3373
takes_options = ['directory',
2833
3374
Option('format',
2834
3375
help="Type of file to export to.",
2837
3378
Option('filters', help='Apply content filters to export the '
2838
3379
'convenient form.'),
2841
3382
help="Name of the root directory inside the exported file."),
2842
3383
Option('per-file-timestamps',
2843
3384
help='Set modification time of files to that of the last '
2844
3385
'revision in which it was changed.'),
3386
Option('uncommitted',
3387
help='Export the working tree contents rather than that of the '
2846
3390
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
3391
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3393
from .export import export
2850
3395
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3396
branch_or_subdir = directory
3398
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3400
if tree is not None:
3401
self.add_cleanup(tree.lock_read().unlock)
3405
raise errors.BzrCommandError(
3406
gettext("--uncommitted requires a working tree"))
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3409
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3411
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3412
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3413
except errors.NoSuchExportFormat as e:
3414
raise errors.BzrCommandError(
3415
gettext('Unsupported export format: %s') % e.format)
2866
3418
class cmd_cat(Command):
2900
3451
if tree is None:
2901
3452
tree = b.basis_tree()
2902
3453
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3454
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3456
old_file_id = rev_tree.path2id(relpath)
3458
# TODO: Split out this code to something that generically finds the
3459
# best id for a path across one or more trees; it's like
3460
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3462
if name_from_revision:
2909
3463
# Try in revision if requested
2910
3464
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3465
raise errors.BzrCommandError(gettext(
3466
"{0!r} is not present in revision {1}").format(
2913
3467
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3469
actual_file_id = old_file_id
2917
3471
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" % (
3472
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3473
actual_file_id = cur_file_id
3474
elif old_file_id is not None:
3475
actual_file_id = old_file_id
3477
raise errors.BzrCommandError(gettext(
3478
"{0!r} is not present in revision {1}").format(
2935
3479
filename, rev_tree.get_revision_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)
3481
from .filter_tree import ContentFilterTree
3482
filter_tree = ContentFilterTree(rev_tree,
3483
rev_tree._content_filter_stack)
3484
content = filter_tree.get_file_text(relpath, actual_file_id)
2949
self.outf.write(content)
3486
content = rev_tree.get_file_text(relpath, actual_file_id)
3488
self.outf.write(content)
2952
3491
class cmd_local_time_offset(Command):
3000
3539
A common mistake is to forget to add a new file or directory before
3001
3540
running the commit command. The --strict option checks for unknown
3002
3541
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``
3542
checks can be implemented by defining hooks. See ``brz help hooks``
3006
3545
:Things to note:
3008
3547
If you accidentially commit the wrong changes or make a spelling
3009
3548
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3549
to undo it. See ``brz help uncommit`` for details.
3012
3551
Hooks can also be configured to run after a commit. This allows you
3013
3552
to trigger updates to external systems like bug trackers. The --fixes
3014
3553
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.)
3554
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
3557
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3558
takes_args = ['selected*']
3045
3559
takes_options = [
3046
ListOption('exclude', type=str, short_name='x',
3560
ListOption('exclude', type=text_type, short_name='x',
3047
3561
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3562
Option('message', type=text_type,
3049
3563
short_name='m',
3050
3564
help="Description of the new revision."),
3052
3566
Option('unchanged',
3053
3567
help='Commit even if nothing has changed.'),
3054
Option('file', type=str,
3568
Option('file', type=text_type,
3055
3569
short_name='F',
3056
3570
argname='msgfile',
3057
3571
help='Take commit message from this file.'),
3058
3572
Option('strict',
3059
3573
help="Refuse to commit if there are unknown "
3060
3574
"files in the working tree."),
3061
Option('commit-time', type=str,
3575
Option('commit-time', type=text_type,
3062
3576
help="Manually set a commit time using commit date "
3063
3577
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
ListOption('fixes', type=str,
3578
ListOption('fixes', type=text_type,
3065
3579
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3580
"(see \"brz help bugs\")."),
3581
ListOption('author', type=text_type,
3068
3582
help="Set the author's name, if it's different "
3069
3583
"from the committer."),
3070
3584
Option('local',
3076
3590
Option('show-diff', short_name='p',
3077
3591
help='When no message is supplied, show the diff along'
3078
3592
' with the status summary in the message editor.'),
3594
help='When committing to a foreign version control '
3595
'system do not push data that can not be natively '
3080
3598
aliases = ['ci', 'checkin']
3082
3600
def _iter_bug_fix_urls(self, fixes, branch):
3601
default_bugtracker = None
3083
3602
# Configure the properties for bug fixing attributes.
3084
3603
for fixed_bug in fixes:
3085
3604
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3605
if len(tokens) == 1:
3606
if default_bugtracker is None:
3607
branch_config = branch.get_config_stack()
3608
default_bugtracker = branch_config.get(
3610
if default_bugtracker is None:
3611
raise errors.BzrCommandError(gettext(
3612
"No tracker specified for bug %s. Use the form "
3613
"'tracker:id' or specify a default bug tracker "
3614
"using the `bugtracker` option.\nSee "
3615
"\"brz help bugs\" for more information on this "
3616
"feature. Commit refused.") % fixed_bug)
3617
tag = default_bugtracker
3619
elif len(tokens) != 2:
3620
raise errors.BzrCommandError(gettext(
3088
3621
"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
3622
"See \"brz help bugs\" for more information on this "
3623
"feature.\nCommit refused.") % fixed_bug)
3625
tag, bug_id = tokens
3093
3627
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),))
3628
except bugtracker.UnknownBugTrackerAbbreviation:
3629
raise errors.BzrCommandError(gettext(
3630
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3631
except bugtracker.MalformedBugIdentifier as e:
3632
raise errors.BzrCommandError(gettext(
3633
u"%s\nCommit refused.") % (e,))
3101
3635
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3636
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3637
author=None, show_diff=False, exclude=None, commit_time=None,
3639
from .commit import (
3105
3640
PointlessCommit,
3642
from .errors import (
3106
3643
ConflictsInTree,
3107
3644
StrictCommitFailed
3109
from bzrlib.msgeditor import (
3646
from .msgeditor import (
3110
3647
edit_commit_message_encoded,
3111
3648
generate_commit_message_template,
3112
make_commit_message_template_encoded
3649
make_commit_message_template_encoded,
3115
3653
commit_stamp = offset = None
3116
3654
if commit_time is not None:
3118
3656
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.
3657
except ValueError as e:
3658
raise errors.BzrCommandError(gettext(
3659
"Could not parse --commit-time: " + str(e)))
3129
3661
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3663
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3664
if selected_list == ['']:
3133
3665
# workaround - commit of root of tree should be exactly the same
3134
3666
# as just default commit in that tree, and succeed even though
3205
3745
reporter=None, verbose=verbose, revprops=properties,
3206
3746
authors=author, timestamp=commit_stamp,
3207
3747
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3748
exclude=tree.safe_relpath_files(exclude),
3209
3750
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3751
raise errors.BzrCommandError(gettext("No changes to commit."
3752
" Please 'brz add' the files you want to commit, or use"
3753
" --unchanged to force an empty commit."))
3212
3754
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3755
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3756
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3216
3758
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"
3759
raise errors.BzrCommandError(gettext("Commit refused because there are"
3760
" unknown files in the working tree."))
3761
except errors.BoundBranchOutOfDate as e:
3762
e.extra_help = (gettext("\n"
3221
3763
'To commit to master branch, run update and then commit.\n'
3222
3764
'You can also pass --local to commit to continue working '
3297
3839
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.
3840
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3842
When the default format has changed after a major new release of
3843
Bazaar, you may be informed during certain operations that you
3844
should upgrade. Upgrading to a newer format may improve performance
3845
or make new features available. It may however limit interoperability
3846
with older repositories or with older versions of Bazaar.
3848
If you wish to upgrade to a particular format rather than the
3849
current default, that can be specified using the --format option.
3850
As a consequence, you can use the upgrade command this way to
3851
"downgrade" to an earlier format, though some conversions are
3852
a one way process (e.g. changing from the 1.x default to the
3853
2.x default) so downgrading is not always possible.
3855
A backup.bzr.~#~ directory is created at the start of the conversion
3856
process (where # is a number). By default, this is left there on
3857
completion. If the conversion fails, delete the new .bzr directory
3858
and rename this one back in its place. Use the --clean option to ask
3859
for the backup.bzr directory to be removed on successful conversion.
3860
Alternatively, you can delete it by hand if everything looks good
3863
If the location given is a shared repository, dependent branches
3864
are also converted provided the repository converts successfully.
3865
If the conversion of a branch fails, remaining branches are still
3868
For more information on upgrades, see the Bazaar Upgrade Guide,
3869
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3872
_see_also = ['check', 'reconcile', 'formats']
3306
3873
takes_args = ['url?']
3307
3874
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'),
3875
RegistryOption('format',
3876
help='Upgrade to a specific format. See "brz help'
3877
' formats" for details.',
3878
lazy_registry=('breezy.controldir', 'format_registry'),
3879
converter=lambda name: controldir.format_registry.make_controldir(name),
3880
value_switches=True, title='Branch format'),
3882
help='Remove the backup.bzr directory if successful.'),
3884
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)
3887
def run(self, url='.', format=None, clean=False, dry_run=False):
3888
from .upgrade import upgrade
3889
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3891
if len(exceptions) == 1:
3892
# Compatibility with historical behavior
3321
3898
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3899
__doc__ = """Show or set brz user id.
3325
3902
Show the email of the current user::
3329
3906
Set the current user::
3331
bzr whoami "Frank Chu <fchu@example.com>"
3908
brz whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3910
takes_options = [ 'directory',
3334
3912
help='Display email address only.'),
3335
3913
Option('branch',
3336
3914
help='Set identity for the current branch instead of '
3340
3918
encoding_type = 'replace'
3342
3920
@display_command
3343
def run(self, email=False, branch=False, name=None):
3921
def run(self, email=False, branch=False, name=None, directory=None):
3344
3922
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()
3923
if directory is None:
3924
# use branch if we're inside one; otherwise global config
3926
c = Branch.open_containing(u'.')[0].get_config_stack()
3927
except errors.NotBranchError:
3928
c = _mod_config.GlobalStack()
3930
c = Branch.open(directory).get_config_stack()
3931
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3933
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3936
self.outf.write(identity + '\n')
3940
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3943
# 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:
3945
_mod_config.extract_email_address(name)
3946
except _mod_config.NoEmailInUsername as e:
3360
3947
warning('"%s" does not seem to contain an email address. '
3361
3948
'This is allowed, but not recommended.', name)
3363
3950
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3952
if directory is None:
3953
c = Branch.open_containing(u'.')[0].get_config_stack()
3955
b = Branch.open(directory)
3956
self.add_cleanup(b.lock_write().unlock)
3957
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3959
c = _mod_config.GlobalStack()
3960
c.set('email', name)
3371
3963
class cmd_nick(Command):
3372
3964
__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.
3966
If unset, the colocated branch name is used for colocated branches, and
3967
the branch directory name is used for other branches. To print the
3968
current nickname, execute with no argument.
3377
3970
Bound branches use the nickname of its master branch unless it is set
3433
4027
def remove_alias(self, alias_name):
3434
4028
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
4029
raise errors.BzrCommandError(gettext(
4030
'brz alias --remove expects an alias to remove.'))
3437
4031
# If alias is not found, print something like:
3438
4032
# unalias: foo: not found
3439
c = config.GlobalConfig()
4033
c = _mod_config.GlobalConfig()
3440
4034
c.unset_alias(alias_name)
3442
4036
@display_command
3443
4037
def print_aliases(self):
3444
4038
"""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))
4039
aliases = _mod_config.GlobalConfig().get_aliases()
4040
for key, value in sorted(viewitems(aliases)):
4041
self.outf.write('brz alias %s="%s"\n' % (key, value))
3449
4043
@display_command
3450
4044
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
4045
from .commands import get_alias
3452
4046
alias = get_alias(alias_name)
3453
4047
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
4048
self.outf.write("brz alias: %s: not found\n" % alias_name)
3456
4050
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
4051
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3459
4053
def set_alias(self, alias_name, alias_command):
3460
4054
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
4055
c = _mod_config.GlobalConfig()
3462
4056
c.set_alias(alias_name, alias_command)
3496
4090
Tests that need working space on disk use a common temporary directory,
3497
4091
typically inside $TMPDIR or /tmp.
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4093
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4094
into a pdb postmortem session.
4096
The --coverage=DIRNAME global option produces a report with covered code
3503
4100
Run only tests relating to 'ignore'::
3507
4104
Disable plugins and list tests as they're run::
3509
bzr --no-plugins selftest -v
4106
brz --no-plugins selftest -v
3511
4108
# NB: this is used from the class without creating an instance, which is
3512
4109
# why it does not have a self parameter.
3513
4110
def get_transport_type(typestring):
3514
4111
"""Parse and return a transport specifier."""
3515
4112
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4113
from .tests import stub_sftp
3517
4114
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4115
elif typestring == "memory":
4116
from .tests import test_server
3520
4117
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4118
elif typestring == "fakenfs":
4119
from .tests import test_server
3523
4120
return test_server.FakeNFSServer
3524
4121
msg = "No known transport type %s. Supported types are: sftp\n" %\
3554
4149
help='List the tests instead of running them.'),
3555
4150
RegistryOption('parallel',
3556
4151
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4152
lazy_registry=('breezy.tests', 'parallel_registry'),
3558
4153
value_switches=False,
3560
Option('randomize', type=str, argname="SEED",
4155
Option('randomize', type=text_type, argname="SEED",
3561
4156
help='Randomize the order of tests using the given'
3562
4157
' 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.'),
4158
ListOption('exclude', type=text_type, argname="PATTERN",
4160
help='Exclude tests that match this regular'
4163
help='Output test progress via subunit v1.'),
4165
help='Output test progress via subunit v2.'),
3569
4166
Option('strict', help='Fail on missing dependencies or '
3570
4167
'known failures.'),
3571
Option('load-list', type=str, argname='TESTLISTFILE',
4168
Option('load-list', type=text_type, argname='TESTLISTFILE',
3572
4169
help='Load a test id list from a text file.'),
3573
ListOption('debugflag', type=str, short_name='E',
4170
ListOption('debugflag', type=text_type, short_name='E',
3574
4171
help='Turn on a selftest debug flag.'),
3575
ListOption('starting-with', type=str, argname='TESTID',
4172
ListOption('starting-with', type=text_type, argname='TESTID',
3576
4173
param_name='starting_with', short_name='s',
3578
4175
'Load only the tests starting with TESTID.'),
4177
help="By default we disable fsync and fdatasync"
4178
" while running the test suite.")
3580
4180
encoding_type = 'replace'
3586
4186
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4187
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4189
first=False, list_only=False,
3590
4190
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)
4191
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4192
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4194
# During selftest, disallow proxying, as it can cause severe
4195
# performance penalties and is only needed for thread
4196
# safety. The selftest command is assumed to not use threads
4197
# too heavily. The call should be as early as possible, as
4198
# error reporting for past duplicate imports won't have useful
4200
if sys.version_info[0] < 3:
4201
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4202
# disallowing it currently leads to failures in many places.
4203
lazy_import.disallow_proxying()
3602
4207
if testspecs_list is not None:
3603
4208
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
4213
from .tests import SubUnitBzrRunnerv1
3609
4214
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
4215
raise errors.BzrCommandError(gettext(
4216
"subunit not available. subunit needs to be installed "
4217
"to use --subunit."))
4218
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3613
4219
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4220
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4221
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4222
# following code can be deleted when it's sufficiently deployed
4223
# -- vila/mgz 20100514
4224
if (sys.platform == "win32"
4225
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4227
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4230
from .tests import SubUnitBzrRunnerv2
4232
raise errors.BzrCommandError(gettext(
4233
"subunit not available. subunit "
4234
"needs to be installed to use --subunit2."))
4235
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3619
4238
self.additional_selftest_args.setdefault(
3620
4239
'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)
4241
raise errors.BzrCommandError(gettext(
4242
"--benchmark is no longer supported from brz 2.2; "
4243
"use bzr-usertest instead"))
4244
test_suite_factory = None
4246
exclude_pattern = None
3629
test_suite_factory = None
4248
exclude_pattern = '(' + '|'.join(exclude) + ')'
4250
self._disable_fsync()
3631
4251
selftest_kwargs = {"verbose": verbose,
3632
4252
"pattern": pattern,
3633
4253
"stop_on_failure": one,
3635
4255
"test_suite_factory": test_suite_factory,
3636
4256
"lsprof_timed": lsprof_timed,
3637
4257
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4258
"matching_tests_first": first,
3640
4259
"list_only": list_only,
3641
4260
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4261
"exclude_pattern": exclude_pattern,
3643
4262
"strict": strict,
3644
4263
"load_list": load_list,
3645
4264
"debug_flags": debugflag,
3646
4265
"starting_with": starting_with
3648
4267
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4269
# Make deprecation warnings visible, unless -Werror is set
4270
cleanup = symbol_versioning.activate_deprecation_warnings(
4273
result = tests.selftest(**selftest_kwargs)
3650
4276
return int(not result)
4278
def _disable_fsync(self):
4279
"""Change the 'os' functionality to not synchronize."""
4280
self._orig_fsync = getattr(os, 'fsync', None)
4281
if self._orig_fsync is not None:
4282
os.fsync = lambda filedes: None
4283
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4284
if self._orig_fdatasync is not None:
4285
os.fdatasync = lambda filedes: None
3653
4288
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4289
__doc__ = """Show version of brz."""
3656
4291
encoding_type = 'replace'
3657
4292
takes_options = [
3709
4342
The source of the merge can be specified either in the form of a branch,
3710
4343
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.
4344
with brz send. If neither is specified, the default is the upstream branch
4345
or the branch most recently merged using --remember. The source of the
4346
merge may also be specified in the form of a path to a file in another
4347
branch: in this case, only the modifications to that file are merged into
4348
the current working tree.
4350
When merging from a branch, by default brz will try to merge in all new
4351
work from the other branch, automatically determining an appropriate base
4352
revision. If this fails, you may need to give an explicit base.
4354
To pick a different ending revision, pass "--revision OTHER". brz will
4355
try to merge in all new work up to and including revision OTHER.
4357
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4358
through OTHER, excluding BASE but including OTHER, will be merged. If this
4359
causes some revisions to be skipped, i.e. if the destination branch does
4360
not already contain revision BASE, such a merge is commonly referred to as
4361
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4362
cherrypicks. The changes look like a normal commit, and the history of the
4363
changes from the other branch is not stored in the commit.
4365
Revision numbers are always relative to the source branch.
3725
4367
Merge will do its best to combine the changes in two branches, but there
3726
4368
are some kinds of problems only a human can fix. When it encounters those,
3727
4369
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.
4370
before you can commit.
4372
Use brz resolve when you have fixed a problem. See also brz conflicts.
4374
If there is no default branch set, the first merge will set it (use
4375
--no-remember to avoid setting it). After that, you can omit the branch
4376
to use the default. To change the default, use --remember. The value will
4377
only be saved if the remote location can be accessed.
3737
4379
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4380
directory, where they can be reviewed (with brz diff), tested, and then
3739
4381
committed to record the result of the merge.
3741
4383
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
4384
--force is given. If --force is given, then the changes from the source
4385
will be merged with the current working tree, including any uncommitted
4386
changes in the tree. The --force option can also be used to create a
3743
4387
merge revision which has more than two parents.
3745
4389
If one would like to merge changes from the working tree of the other
3873
4517
self.sanity_check_merger(merger)
3874
4518
if (merger.base_rev_id == merger.other_rev_id and
3875
4519
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4520
# check if location is a nonexistent file (and not a branch) to
4521
# disambiguate the 'Nothing to do'
4522
if merger.interesting_files:
4523
if not merger.other_tree.has_filename(
4524
merger.interesting_files[0]):
4525
note(gettext("merger: ") + str(merger))
4526
raise errors.PathsDoNotExist([location])
4527
note(gettext('Nothing to do.'))
4529
if pull and not preview:
3879
4530
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4531
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4532
if (merger.base_rev_id == tree.last_revision()):
3882
4533
result = tree.pull(merger.other_branch, False,
3883
4534
merger.other_rev_id)
3884
4535
result.report(self.outf)
3886
4537
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4538
raise errors.BzrCommandError(gettext(
3888
4539
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4540
" (perhaps you would prefer 'brz pull')"))
3891
4542
return self._do_preview(merger)
3892
4543
elif interactive:
3950
4603
# Use reprocess if the merger supports it
3951
4604
merger.reprocess = merger.merge_type.supports_reprocess
3952
4605
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4606
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4607
" for merge type %s.") %
3955
4608
merger.merge_type)
3956
4609
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4610
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4613
if (merger.merge_type.requires_file_merge_plan and
4614
(not getattr(merger.this_tree, 'plan_file_merge', None) or
4615
not getattr(merger.other_tree, 'plan_file_merge', None) or
4616
(merger.base_tree is not None and
4617
not getattr(merger.base_tree, 'plan_file_merge', None)))):
4618
raise errors.BzrCommandError(
4619
gettext('Plan file merge unsupported: '
4620
'Merge type incompatible with tree formats.'))
3960
4622
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4623
possible_transports, pb):
3962
4624
"""Produce a merger from a location, assuming it refers to a branch."""
3963
from bzrlib.tag import _merge_tags_if_possible
3964
4625
# find the branch locations
3965
4626
other_loc, user_location = self._select_branch_location(tree, location,
3988
4649
if other_revision_id is None:
3989
4650
other_revision_id = _mod_revision.ensure_null(
3990
4651
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):
4652
# Remember where we merge from. We need to remember if:
4653
# - user specify a location (and we don't merge from the parent
4655
# - user ask to remember or there is no previous location set to merge
4656
# from and user didn't ask to *not* remember
4657
if (user_location is not None
4659
or (remember is None
4660
and tree.branch.get_submit_branch() is None)))):
3994
4661
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,
4662
# Merge tags (but don't set them in the master branch yet, the user
4663
# might revert this merge). Commit will propagate them.
4664
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4665
merger = _mod_merge.Merger.from_revision_ids(tree,
3997
4666
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4667
if other_path != '':
3999
4668
allow_pending = False
4162
4831
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4833
Set files in the working tree back to the contents of a previous revision.
4165
4835
Giving a list of files will revert only those files. Otherwise, all files
4166
4836
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4837
working tree basis revision is used. A revert operation affects only the
4838
working tree, not any revision history like the branch and repository or
4839
the working tree basis revision.
4169
4841
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.
4842
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4843
will remove the changes introduced by the second last commit (-2), without
4844
affecting the changes introduced by the last commit (-1). To remove
4845
certain changes on a hunk-by-hunk basis, see the shelve command.
4846
To update the branch to a specific revision or the latest revision and
4847
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.
4850
Uncommitted changes to files that are reverted will be discarded.
4851
Howver, by default, any files that have been manually changed will be
4852
backed up first. (Files changed only by merge are not backed up.) Backup
4853
files have '.~#~' appended to their name, where # is a number.
4178
4855
When you provide files, you can use their current pathname or the pathname
4179
4856
from the target revision. So you can use revert to "undelete" a file by
4293
4969
Determine the missing revisions between this and the branch at the
4294
4970
remembered pull location::
4298
4974
Determine the missing revisions between this and another branch::
4300
bzr missing http://server/branch
4976
brz missing http://server/branch
4302
4978
Determine the missing revisions up to a specific revision on the other
4305
bzr missing -r ..-10
4981
brz missing -r ..-10
4307
4983
Determine the missing revisions up to a specific revision on this
4310
bzr missing --my-revision ..-10
4986
brz missing --my-revision ..-10
4313
4989
_see_also = ['merge', 'pull']
4314
4990
takes_args = ['other_branch?']
4315
4991
takes_options = [
4316
4993
Option('reverse', 'Reverse the order of revisions.'),
4317
4994
Option('mine-only',
4318
4995
'Display changes in the local branch only.'),
4319
Option('this' , 'Same as --mine-only.'),
4996
Option('this', 'Same as --mine-only.'),
4320
4997
Option('theirs-only',
4321
4998
'Display changes in the remote branch only.'),
4322
4999
Option('other', 'Same as --theirs-only.'),
4419
5105
if remote_extra and not mine_only:
4420
5106
if printed_local is True:
4421
5107
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5108
message(ngettext("You are missing %d revision:\n",
5109
"You are missing %d revisions:\n",
5110
len(remote_extra)) %
4423
5111
len(remote_extra))
5112
if remote_branch.supports_tags():
5113
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5114
for revision in iter_log_revisions(remote_extra,
4425
5115
remote_branch.repository,
4427
5118
lf.log_revision(revision)
4428
5119
status_code = 1
4430
5121
if mine_only and not local_extra:
4431
5122
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5123
message(gettext('This branch has no new revisions.\n'))
4433
5124
elif theirs_only and not remote_extra:
4434
5125
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5126
message(gettext('Other branch has no new revisions.\n'))
4436
5127
elif not (mine_only or theirs_only or local_extra or
4438
5129
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5131
message(gettext("Branches are up to date.\n"))
4441
5132
self.cleanup_now()
4442
5133
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)
5134
self.add_cleanup(local_branch.lock_write().unlock)
4445
5135
# handle race conditions - a parent might be set while we run.
4446
5136
if local_branch.get_parent() is None:
4447
5137
local_branch.set_parent(remote_branch.base)
4578
5252
Option('long', help='Show commit date in annotations.'),
4582
5257
encoding_type = 'exact'
4584
5259
@display_command
4585
5260
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5261
show_ids=False, directory=None):
5262
from .annotate import (
4588
5265
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5266
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5267
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5268
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5270
self.add_cleanup(branch.lock_read().unlock)
4596
5271
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5272
self.add_cleanup(tree.lock_read().unlock)
5273
if wt is not None and revision is None:
4600
5274
file_id = wt.path2id(relpath)
4602
5276
file_id = tree.path2id(relpath)
4603
5277
if file_id is None:
4604
5278
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5279
if wt is not None and revision is None:
4607
5280
# If there is a tree and we're not annotating historical
4608
5281
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5282
annotate_file_tree(wt, relpath, self.outf, long, all,
5283
show_ids=show_ids, file_id=file_id)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5285
annotate_file_tree(tree, relpath, self.outf, long, all,
5286
show_ids=show_ids, branch=branch, file_id=file_id)
4616
5289
class cmd_re_sign(Command):
4620
5293
hidden = True # is this right ?
4621
5294
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5295
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5297
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5298
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')
5299
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5300
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)
5301
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5302
b = WorkingTree.open_containing(directory)[0].branch
5303
self.add_cleanup(b.lock_write().unlock)
4632
5304
return self._run(b, revision_id_list, revision)
4634
5306
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5308
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5309
if revision_id_list is not None:
4638
5310
b.repository.start_write_group()
4640
5312
for revision_id in revision_id_list:
5313
revision_id = cache_utf8.encode(revision_id)
4641
5314
b.repository.sign_revision(revision_id, gpg_strategy)
4643
5316
b.repository.abort_write_group()
4694
5367
_see_also = ['checkouts', 'unbind']
4695
5368
takes_args = ['location?']
5369
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5371
def run(self, location=None, directory=u'.'):
5372
b, relpath = Branch.open_containing(directory)
4700
5373
if location is None:
4702
5375
location = b.get_old_bound_location()
4703
5376
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5377
raise errors.BzrCommandError(gettext('No location supplied. '
5378
'This format does not remember old locations.'))
4707
5380
if location is None:
4708
5381
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5382
raise errors.BzrCommandError(
5383
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5385
raise errors.BzrCommandError(
5386
gettext('No location supplied'
5387
' and no previous location known'))
4713
5388
b_other = Branch.open(location)
4715
5390
b.bind(b_other)
4716
5391
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5392
raise errors.BzrCommandError(gettext('These branches have diverged.'
5393
' Try merging, and then bind again.'))
4719
5394
if b.get_config().has_explicit_nickname():
4720
5395
b.nick = b_other.nick
4784
5460
b = control.open_branch()
4786
5462
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5463
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)
5465
self.add_cleanup(b.lock_write().unlock)
5466
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
5469
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5471
from .log import log_formatter, show_log
5472
from .uncommit import uncommit
4798
5474
last_revno, last_rev_id = b.last_revision_info()
4827
5503
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5506
self.outf.write(gettext('Dry-run, pretending to remove'
5507
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5509
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')
5512
if not ui.ui_factory.confirm_action(
5513
gettext(u'Uncommit these revisions'),
5514
'breezy.builtins.uncommit',
5516
self.outf.write(gettext('Canceled\n'))
4840
5519
mutter('Uncommitting from {%s} to {%s}',
4841
5520
last_rev_id, rev_id)
4842
5521
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)
5522
revno=revno, local=local, keep_tags=keep_tags)
5523
self.outf.write(gettext('You can restore the old tip by running:\n'
5524
' brz pull . -r revid:%s\n') % last_rev_id)
4848
5527
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5528
__doc__ = """Break a dead lock.
5530
This command breaks a lock on a repository, branch, working directory or
4851
5533
CAUTION: Locks should only be broken when you are sure that the process
4852
5534
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
5536
You can get information on what locks are open via the 'brz info
4855
5537
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5541
brz break-lock brz+ssh://example.com/brz/foo
5542
brz break-lock --conf ~/.bazaar
4861
5545
takes_args = ['location?']
5548
help='LOCATION is the directory where the config lock is.'),
5550
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5553
def run(self, location=None, config=False, force=False):
4864
5554
if location is None:
4865
5555
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5557
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5559
{'breezy.lockdir.break': True})
5561
conf = _mod_config.LockableConfig(file_name=location)
5564
control, relpath = controldir.ControlDir.open_containing(location)
5566
control.break_lock()
5567
except NotImplementedError:
4873
5571
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5572
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4876
5574
This just prints a line to signal when it is ready, then blocks on stdin.
4894
5592
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5593
RegistryOption('protocol',
4896
5594
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5595
lazy_registry=('breezy.transport', 'transport_server_registry'),
4898
5596
value_switches=True),
5598
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.',
5600
help='Listen for connections on nominated port. Passing 0 as '
5601
'the port number will result in a dynamically allocated '
5602
'port. The default port depends on the protocol.',
5604
custom_help('directory',
5605
help='Serve contents of this directory.'),
4908
5606
Option('allow-writes',
4909
5607
help='By default the server is a readonly server. Supplying '
4910
5608
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5609
'the served directory and below. Note that ``brz serve`` '
4912
5610
'does not perform authentication, so unless some form of '
4913
5611
'external authentication is arranged supplying this '
4914
5612
'option leads to global uncontrolled write access to your '
5615
Option('client-timeout', type=float,
5616
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
5619
def run(self, listen=None, port=None, inet=False, directory=None,
5620
allow_writes=False, protocol=None, client_timeout=None):
5621
from . import transport
4941
5622
if directory is None:
4942
directory = os.getcwd()
5623
directory = osutils.getcwd()
4943
5624
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)
5625
protocol = transport.transport_server_registry.get()
5626
url = transport.location_to_url(directory)
4947
5627
if not allow_writes:
4948
5628
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5629
t = transport.get_transport_from_url(url)
5630
protocol(t, listen, port, inet, client_timeout)
4953
5633
class cmd_join(Command):
4973
5653
def run(self, tree, reference=False):
5654
from breezy.mutabletree import BadReferenceTarget
4974
5655
sub_tree = WorkingTree.open(tree)
4975
5656
parent_dir = osutils.dirname(sub_tree.basedir)
4976
5657
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5658
repo = containing_tree.branch.repository
4978
5659
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5660
raise errors.BzrCommandError(gettext(
4980
5661
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5662
"You can use brz upgrade on the repository.")
4985
5666
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5667
except BadReferenceTarget as e:
4987
5668
# XXX: Would be better to just raise a nicely printable
4988
5669
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5670
raise errors.BzrCommandError(
5671
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5674
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5675
except errors.BadSubsumeSource as e:
5676
raise errors.BzrCommandError(
5677
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5680
class cmd_split(Command):
5055
5737
diff='Normal unified diff.',
5056
5738
plain='No patch, just directive.'),
5057
5739
Option('sign', help='GPG-sign the directive.'), 'revision',
5058
Option('mail-to', type=str,
5740
Option('mail-to', type=text_type,
5059
5741
help='Instead of printing the directive, email to this address.'),
5060
Option('message', type=str, short_name='m',
5742
Option('message', type=text_type, short_name='m',
5061
5743
help='Message to use when committing this merge.')
5064
5746
encoding_type = 'exact'
5066
5748
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
5749
sign=False, revision=None, mail_to=None, message=None,
5751
from .revision import ensure_null, NULL_REVISION
5069
5752
include_patch, include_bundle = {
5070
5753
'plain': (False, False),
5071
5754
'diff': (True, False),
5072
5755
'bundle': (True, True),
5074
branch = Branch.open('.')
5757
branch = Branch.open(directory)
5075
5758
stored_submit_branch = branch.get_submit_branch()
5076
5759
if submit_branch is None:
5077
5760
submit_branch = stored_submit_branch
5208
5898
help='Branch to generate the submission from, '
5209
5899
'rather than the one containing the working directory.',
5210
5900
short_name='f',
5212
5902
Option('output', short_name='o',
5213
5903
help='Write merge directive to this file or directory; '
5214
5904
'use - for stdout.',
5216
5906
Option('strict',
5217
5907
help='Refuse to send if there are uncommitted changes in'
5218
5908
' the working tree, --no-strict disables the check.'),
5219
5909
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5913
Option('body', help='Body for the email.', type=text_type),
5224
5914
RegistryOption('format',
5225
5915
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5916
lazy_registry=('breezy.send', 'format_registry')),
5229
5919
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5920
no_patch=False, revision=None, remember=None, output=None,
5231
5921
format=None, mail_to=None, message=None, body=None,
5232
5922
strict=None, **kwargs):
5233
from bzrlib.send import send
5923
from .send import send
5234
5924
return send(submit_branch, revision, public_branch, remember,
5235
5925
format, no_bundle, no_patch, output,
5236
5926
kwargs.get('from', '.'), mail_to, message, body,
5359
6046
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
6047
self.add_cleanup(branch.lock_write().unlock)
5363
6049
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
6050
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
6051
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
6052
note(gettext('Deleted tag %s.') % tag_name)
5369
6055
if len(revision) != 1:
5370
raise errors.BzrCommandError(
6056
raise errors.BzrCommandError(gettext(
5371
6057
"Tags can only be placed on a single revision, "
5373
6059
revision_id = revision[0].as_revision_id(branch)
5375
6061
revision_id = branch.last_revision()
5376
6062
if tag_name is None:
5377
6063
tag_name = branch.automatic_tag_name(revision_id)
5378
6064
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):
6065
raise errors.BzrCommandError(gettext(
6066
"Please specify a tag name."))
6068
existing_target = branch.tags.lookup_tag(tag_name)
6069
except errors.NoSuchTag:
6070
existing_target = None
6071
if not force and existing_target not in (None, revision_id):
5382
6072
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6073
if existing_target == revision_id:
6074
note(gettext('Tag %s already exists for that revision.') % tag_name)
6076
branch.tags.set_tag(tag_name, revision_id)
6077
if existing_target is None:
6078
note(gettext('Created tag %s.') % tag_name)
6080
note(gettext('Updated tag %s.') % tag_name)
5387
6083
class cmd_tags(Command):
5393
6089
_see_also = ['tag']
5394
6090
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6091
custom_help('directory',
6092
help='Branch whose tags should be displayed.'),
6093
RegistryOption('sort',
5401
6094
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6095
lazy_registry=('breezy.tag', 'tag_sort_methods')
5409
6101
@display_command
6102
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6103
from .tag import tag_sort_methods
5416
6104
branch, relpath = Branch.open_containing(directory)
5418
tags = branch.tags.get_tag_dict().items()
6106
tags = list(viewitems(branch.tags.get_tag_dict()))
5423
self.add_cleanup(branch.unlock)
6110
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]])
6112
# Restrict to the specified range
6113
tags = self._tags_for_range(branch, revision)
6115
sort = tag_sort_methods.get()
5444
6117
if not show_ids:
5445
6118
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6119
for index, (tag, revid) in enumerate(tags):
5457
6132
for tag, revspec in tags:
5458
6133
self.outf.write('%-20s %s\n' % (tag, revspec))
6135
def _tags_for_range(self, branch, revision):
6137
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6138
revid1, revid2 = rev1.rev_id, rev2.rev_id
6139
# _get_revision_range will always set revid2 if it's not specified.
6140
# If revid1 is None, it means we want to start from the branch
6141
# origin which is always a valid ancestor. If revid1 == revid2, the
6142
# ancestry check is useless.
6143
if revid1 and revid1 != revid2:
6144
# FIXME: We really want to use the same graph than
6145
# branch.iter_merge_sorted_revisions below, but this is not
6146
# easily available -- vila 2011-09-23
6147
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6148
# We don't want to output anything in this case...
6150
# only show revisions between revid1 and revid2 (inclusive)
6151
tagged_revids = branch.tags.get_reverse_tag_dict()
6153
for r in branch.iter_merge_sorted_revisions(
6154
start_revision_id=revid2, stop_revision_id=revid1,
6155
stop_rule='include'):
6156
revid_tags = tagged_revids.get(r[0], None)
6158
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6162
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6163
__doc__ = """Reconfigure the type of a brz directory.
5464
6165
A target configuration must be specified.
5476
6177
takes_args = ['location?']
5477
6178
takes_options = [
5478
6179
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6182
help='The relation between branch and tree.',
5482
6183
value_switches=True, enum_switch=False,
5483
6184
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6185
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6186
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6187
lightweight_checkout='Reconfigure to be a lightweight'
5487
6188
' checkout (with no local history).',
6190
RegistryOption.from_kwargs(
6192
title='Repository type',
6193
help='Location fo the repository.',
6194
value_switches=True, enum_switch=False,
5488
6195
standalone='Reconfigure to be a standalone branch '
5489
6196
'(i.e. stop using shared repository).',
5490
6197
use_shared='Reconfigure to use a shared repository.',
6199
RegistryOption.from_kwargs(
6201
title='Trees in Repository',
6202
help='Whether new branches in the repository have trees.',
6203
value_switches=True, enum_switch=False,
5491
6204
with_trees='Reconfigure repository to create '
5492
6205
'working trees on branches by default.',
5493
6206
with_no_trees='Reconfigure repository to not create '
5494
6207
'working trees on branches by default.'
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
6209
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5497
6210
Option('force',
5498
6211
help='Perform reconfiguration even if local changes'
5499
6212
' will be lost.'),
5500
6213
Option('stacked-on',
5501
6214
help='Reconfigure a branch to be stacked on another branch.',
5504
6217
Option('unstacked',
5505
6218
help='Reconfigure a branch to be unstacked. This '
5520
6233
# At the moment you can use --stacked-on and a different
5521
6234
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6236
if (tree_type is None and
6237
repository_type is None and
6238
repository_trees is None):
5524
6239
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6242
raise errors.BzrCommandError(gettext('No target configuration '
6244
reconfiguration = None
6245
if tree_type == 'branch':
5530
6246
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6247
elif tree_type == 'tree':
5532
6248
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6249
elif tree_type == 'checkout':
5534
6250
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6251
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6252
elif tree_type == 'lightweight-checkout':
5537
6253
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6254
directory, bind_to)
5539
elif target_type == 'use-shared':
6256
reconfiguration.apply(force)
6257
reconfiguration = None
6258
if repository_type == 'use-shared':
5540
6259
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6260
elif repository_type == 'standalone':
5542
6261
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6263
reconfiguration.apply(force)
6264
reconfiguration = None
6265
if repository_trees == 'with-trees':
5544
6266
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6267
directory, True)
5546
elif target_type == 'with-no-trees':
6268
elif repository_trees == 'with-no-trees':
5547
6269
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6270
directory, False)
5549
reconfiguration.apply(force)
6272
reconfiguration.apply(force)
6273
reconfiguration = None
5552
6276
class cmd_switch(Command):
5575
6299
takes_args = ['to_location?']
5576
takes_options = [Option('force',
6300
takes_options = ['directory',
5577
6302
help='Switch even if local commits will be lost.'),
5579
6304
Option('create-branch', short_name='b',
5580
6305
help='Create the target branch from this one before'
5581
6306
' switching to it.'),
6308
help='Store and restore uncommitted changes in the'
5584
6312
def run(self, to_location=None, force=False, create_branch=False,
5586
from bzrlib import switch
6313
revision=None, directory=u'.', store=False):
6314
from . import switch
6315
tree_location = directory
5588
6316
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6317
possible_transports = []
6318
control_dir = controldir.ControlDir.open_containing(tree_location,
6319
possible_transports=possible_transports)[0]
5590
6320
if to_location is None:
5591
6321
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6322
raise errors.BzrCommandError(gettext('You must supply either a'
6323
' revision or a location'))
6324
to_location = tree_location
5596
branch = control_dir.open_branch()
6326
branch = control_dir.open_branch(
6327
possible_transports=possible_transports)
5597
6328
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6329
except errors.NotBranchError:
5600
6331
had_explicit_nick = False
5601
6332
if create_branch:
5602
6333
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()
6334
raise errors.BzrCommandError(
6335
gettext('cannot create branch without source branch'))
6336
to_location = lookup_new_sibling_branch(control_dir, to_location,
6337
possible_transports=possible_transports)
6338
to_branch = branch.controldir.sprout(to_location,
6339
possible_transports=possible_transports,
6340
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6343
to_branch = Branch.open(to_location,
6344
possible_transports=possible_transports)
5617
6345
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6346
to_branch = open_sibling_branch(control_dir, to_location,
6347
possible_transports=possible_transports)
5621
6348
if revision is not None:
5622
6349
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6350
switch.switch(control_dir, to_branch, force, revision_id=revision,
6351
store_uncommitted=store)
5624
6352
if had_explicit_nick:
5625
6353
branch = control_dir.open_branch() #get the new branch!
5626
6354
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6355
note(gettext('Switched to branch: %s'),
5628
6356
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
6360
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6447
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6449
current_view, view_dict = tree.views.get_view_info()
5737
6450
if name is None:
5738
6451
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6454
raise errors.BzrCommandError(gettext(
6455
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6457
raise errors.BzrCommandError(gettext(
6458
"Both --delete and --switch specified"))
5747
6460
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6461
self.outf.write(gettext("Deleted all views.\n"))
5749
6462
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6463
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6465
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6466
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6469
raise errors.BzrCommandError(gettext(
6470
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6472
raise errors.BzrCommandError(gettext(
6473
"Both --switch and --all specified"))
5761
6474
elif switch == 'off':
5762
6475
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6476
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6477
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6478
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6480
tree.views.set_view_info(switch, view_dict)
5768
6481
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6482
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6485
self.outf.write(gettext('Views defined:\n'))
5773
6486
for view in sorted(view_dict):
5774
6487
if view == current_view:
5778
6491
view_str = views.view_display_str(view_dict[view])
5779
6492
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6494
self.outf.write(gettext('No views defined.\n'))
5782
6495
elif file_list:
5783
6496
if name is None:
5784
6497
# No name given and no current view set
5786
6499
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6500
raise errors.BzrCommandError(gettext(
6501
"Cannot change the 'off' pseudo view"))
5789
6502
tree.views.set_view(name, sorted(file_list))
5790
6503
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6504
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6506
# list the files
5794
6507
if name is None:
5795
6508
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6509
self.outf.write(gettext('No current view.\n'))
5798
6511
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6512
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6515
class cmd_hooks(Command):
5830
6543
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
6545
brz remove-branch repo/trunk
5836
6549
takes_args = ["location?"]
6551
takes_options = ['directory',
6552
Option('force', help='Remove branch even if it is the active branch.')]
5838
6554
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()
6556
def run(self, directory=None, location=None, force=False):
6557
br = open_nearby_branch(near=directory, location=location)
6558
if not force and br.controldir.has_workingtree():
6560
active_branch = br.controldir.open_branch(name="")
6561
except errors.NotBranchError:
6562
active_branch = None
6563
if (active_branch is not None and
6564
br.control_url == active_branch.control_url):
6565
raise errors.BzrCommandError(
6566
gettext("Branch is active. Use --force to remove it."))
6567
br.controldir.destroy_branch(br.name)
5847
6570
class cmd_shelve(Command):
5848
6571
__doc__ = """Temporarily set aside some changes from the current tree.
5868
6591
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6592
restore the most recently shelved changes.
6594
For complicated changes, it is possible to edit the changes in a separate
6595
editor program to decide what the file remaining in the working copy
6596
should look like. To do this, add the configuration option
6598
change_editor = PROGRAM @new_path @old_path
6600
where @new_path is replaced with the path of the new version of the
6601
file and @old_path is replaced with the path of the old version of
6602
the file. The PROGRAM should save the new file with the desired
6603
contents of the file in the working tree.
5872
6607
takes_args = ['file*']
5874
6609
takes_options = [
5876
6612
Option('all', help='Shelve all changes.'),
5878
6614
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6615
breezy.option.diff_writer_registry,
5880
6616
value_switches=True, enum_switch=False),
5882
6618
Option('list', help='List shelved changes.'),
5883
6619
Option('destroy',
5884
6620
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6622
_see_also = ['unshelve', 'configuration']
5888
6624
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6625
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6627
return self.run_for_list(directory=directory)
6628
from .shelf_ui import Shelver
5893
6629
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6630
writer = breezy.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6632
shelver = Shelver.from_args(writer(self.outf), revision, all,
6633
file_list, message, destroy=destroy, directory=directory)
5967
6705
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'
6707
takes_options = ['directory',
6708
Option('ignored', help='Delete all ignored files.'),
6709
Option('detritus', help='Delete conflict files, merge and revert'
5971
6710
' backups, and failed selftest dirs.'),
5972
6711
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6712
help='Delete files unknown to brz (default).'),
5974
6713
Option('dry-run', help='Show files to delete instead of'
5975
6714
' deleting them.'),
5976
6715
Option('force', help='Do not prompt before deleting.')]
5977
6716
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
6717
force=False, directory=u'.'):
6718
from .clean_tree import clean_tree
5980
6719
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6723
clean_tree(directory, unknown=unknown, ignored=ignored,
6724
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6727
class cmd_reference(Command):
6032
6771
self.outf.write('%s %s\n' % (path, location))
6774
class cmd_export_pot(Command):
6775
__doc__ = """Export command helps and error messages in po format."""
6778
takes_options = [Option('plugin',
6779
help='Export help text from named command '\
6780
'(defaults to all built in commands).',
6782
Option('include-duplicates',
6783
help='Output multiple copies of the same msgid '
6784
'string if it appears more than once.'),
6787
def run(self, plugin=None, include_duplicates=False):
6788
from .export_pot import export_pot
6789
export_pot(self.outf, plugin, include_duplicates)
6792
class cmd_import(Command):
6793
__doc__ = """Import sources from a directory, tarball or zip file
6795
This command will import a directory, tarball or zip file into a bzr
6796
tree, replacing any versioned files already present. If a directory is
6797
specified, it is used as the target. If the directory does not exist, or
6798
is not versioned, it is created.
6800
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6802
If the tarball or zip has a single root directory, that directory is
6803
stripped when extracting the tarball. This is not done for directories.
6806
takes_args = ['source', 'tree?']
6808
def run(self, source, tree=None):
6809
from .upstream_import import do_import
6810
do_import(source, tree)
6813
class cmd_link_tree(Command):
6814
__doc__ = """Hardlink matching files to another tree.
6816
Only files with identical content and execute bit will be linked.
6819
takes_args = ['location']
6821
def run(self, location):
6822
from .transform import link_tree
6823
target_tree = WorkingTree.open_containing(".")[0]
6824
source_tree = WorkingTree.open(location)
6825
target_tree.lock_write()
6827
source_tree.lock_read()
6829
link_tree(target_tree, source_tree)
6831
source_tree.unlock()
6833
target_tree.unlock()
6836
class cmd_fetch_ghosts(Command):
6837
__doc__ = """Attempt to retrieve ghosts from another branch.
6839
If the other branch is not supplied, the last-pulled branch is used.
6843
aliases = ['fetch-missing']
6844
takes_args = ['branch?']
6845
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6847
def run(self, branch=None, no_fix=False):
6848
from .fetch_ghosts import GhostFetcher
6849
installed, failed = GhostFetcher.from_cmdline(branch).run()
6850
if len(installed) > 0:
6851
self.outf.write("Installed:\n")
6852
for rev in installed:
6853
self.outf.write(rev + "\n")
6855
self.outf.write("Still missing:\n")
6857
self.outf.write(rev + "\n")
6858
if not no_fix and len(installed) > 0:
6859
cmd_reconcile().run(".")
6035
6862
def _register_lazy_builtins():
6036
6863
# register lazy builtins from other modules; called at startup and should
6037
6864
# be only called once.
6038
6865
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'),
6866
('cmd_bisect', [], 'breezy.bisect'),
6867
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6868
('cmd_config', [], 'breezy.config'),
6869
('cmd_dpush', [], 'breezy.foreign'),
6870
('cmd_version_info', [], 'breezy.cmd_version_info'),
6871
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6872
('cmd_conflicts', [], 'breezy.conflicts'),
6873
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6874
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6875
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6876
('cmd_test_script', [], 'breezy.cmd_test_script'),
6046
6878
builtin_command_registry.register_lazy(name, aliases, module_name)