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
60
from breezy.bzr import (
63
from breezy.branch import Branch, UnstackableBranchFormat
64
from breezy.conflicts import ConflictList
65
from breezy.transport import memory
66
from breezy.smtp_connection import SMTPConnection
67
from breezy.workingtree import WorkingTree
68
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
71
from .commands import (
65
73
builtin_command_registry,
68
from bzrlib.option import (
73
81
_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]))
83
from .revisionspec import (
93
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
96
def _get_branch_location(control_dir, possible_transports=None):
97
"""Return location of branch for this control dir."""
99
target = control_dir.get_branch_reference()
100
except errors.NotBranchError:
101
return control_dir.root_transport.base
102
if target is not None:
104
this_branch = control_dir.open_branch(
105
possible_transports=possible_transports)
106
# This may be a heavy checkout, where we want the master branch
107
master_location = this_branch.get_bound_location()
108
if master_location is not None:
109
return master_location
110
# If not, use a local sibling
111
return this_branch.base
114
def _is_colocated(control_dir, possible_transports=None):
115
"""Check if the branch in control_dir is colocated.
117
:param control_dir: Control directory
118
:return: Tuple with boolean indicating whether the branch is colocated
119
and the full URL to the actual branch
121
# This path is meant to be relative to the existing branch
122
this_url = _get_branch_location(control_dir,
123
possible_transports=possible_transports)
124
# Perhaps the target control dir supports colocated branches?
126
root = controldir.ControlDir.open(this_url,
127
possible_transports=possible_transports)
128
except errors.NotBranchError:
129
return (False, this_url)
132
wt = control_dir.open_workingtree()
133
except (errors.NoWorkingTree, errors.NotLocalUrl):
134
return (False, this_url)
137
root._format.colocated_branches and
138
control_dir.control_url == root.control_url,
142
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
143
"""Lookup the location for a new sibling branch.
145
:param control_dir: Control directory to find sibling branches from
146
:param location: Name of the new branch
147
:return: Full location to the new branch
149
location = directory_service.directories.dereference(location)
150
if '/' not in location and '\\' not in location:
151
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
154
return urlutils.join_segment_parameters(this_url,
155
{"branch": urlutils.escape(location)})
157
return urlutils.join(this_url, '..', urlutils.escape(location))
161
def open_sibling_branch(control_dir, location, possible_transports=None):
162
"""Open a branch, possibly a sibling of another.
164
:param control_dir: Control directory relative to which to lookup the
166
:param location: Location to look up
167
:return: branch to open
170
# Perhaps it's a colocated branch?
171
return control_dir.open_branch(location,
172
possible_transports=possible_transports)
173
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
174
this_url = _get_branch_location(control_dir)
177
this_url, '..', urlutils.escape(location)))
180
def open_nearby_branch(near=None, location=None, possible_transports=None):
181
"""Open a nearby branch.
183
:param near: Optional location of container from which to open branch
184
:param location: Location of the branch
185
:return: Branch instance
191
return Branch.open(location,
192
possible_transports=possible_transports)
193
except errors.NotBranchError:
195
cdir = controldir.ControlDir.open(near,
196
possible_transports=possible_transports)
197
return open_sibling_branch(cdir, location,
198
possible_transports=possible_transports)
201
def iter_sibling_branches(control_dir, possible_transports=None):
202
"""Iterate over the siblings of a branch.
204
:param control_dir: Control directory for which to look up the siblings
205
:return: Iterator over tuples with branch name and branch object
209
reference = control_dir.get_branch_reference()
210
except errors.NotBranchError:
211
# There is no active branch, just return the colocated branches.
212
for name, branch in viewitems(control_dir.get_branches()):
215
if reference is not None:
216
ref_branch = Branch.open(reference,
217
possible_transports=possible_transports)
220
if ref_branch is None or ref_branch.name:
221
if ref_branch is not None:
222
control_dir = ref_branch.controldir
223
for name, branch in viewitems(control_dir.get_branches()):
226
repo = ref_branch.controldir.find_repository()
227
for branch in repo.find_branches(using=True):
228
name = urlutils.relative_url(repo.user_url,
229
branch.user_url).rstrip("/")
88
233
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
223
298
def _get_view_info_for_change_reporter(tree):
224
299
"""Get the view information from a tree for change reporting."""
342
435
takes_args = ['revision_id?']
343
takes_options = ['revision']
436
takes_options = ['directory', 'revision']
344
437
# cat-revision is more for frontends so should be exact
345
438
encoding = 'strict'
347
440
def print_revision(self, revisions, revid):
348
441
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
442
record = next(stream)
350
443
if record.storage_kind == 'absent':
351
444
raise errors.NoSuchRevision(revisions, revid)
352
445
revtext = record.get_bytes_as('fulltext')
353
446
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
449
def run(self, revision_id=None, revision=None, directory=u'.'):
357
450
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
451
raise errors.BzrCommandError(gettext('You can only supply one of'
452
' revision_id or --revision'))
360
453
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
454
raise errors.BzrCommandError(gettext('You must supply either'
455
' --revision or a revision_id'))
457
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
459
revisions = b.repository.revisions
366
460
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
461
raise errors.BzrCommandError(gettext('Repository %r does not support '
462
'access to raw revision texts'))
370
b.repository.lock_read()
464
with b.repository.lock_read():
372
465
# TODO: jam 20060112 should cat-revision always output utf-8?
373
466
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
467
revision_id = cache_utf8.encode(revision_id)
376
469
self.print_revision(revisions, revision_id)
377
470
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
471
msg = gettext("The repository {0} contains no revision {1}.").format(
379
472
b.repository.base, revision_id)
380
473
raise errors.BzrCommandError(msg)
381
474
elif revision is not None:
382
475
for rev in revision:
384
477
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
478
gettext('You cannot specify a NULL revision.'))
386
479
rev_id = rev.as_revision_id(b)
387
480
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
483
class cmd_dump_btree(Command):
393
484
__doc__ = """Dump the contents of a btree index file to stdout.
491
585
location_list=['.']
493
587
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
588
d = controldir.ControlDir.open(location)
497
591
working = d.open_workingtree()
498
592
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
593
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
594
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
595
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
596
" of a remote path"))
504
598
if (working.has_changes()):
505
599
raise errors.UncommittedChanges(working)
600
if working.get_shelf_manager().last_shelf() is not None:
601
raise errors.ShelvedChanges(working)
507
603
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
604
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
605
" from a lightweight checkout"))
511
607
d.destroy_workingtree()
610
class cmd_repair_workingtree(Command):
611
__doc__ = """Reset the working tree state file.
613
This is not meant to be used normally, but more as a way to recover from
614
filesystem corruption, etc. This rebuilds the working inventory back to a
615
'known good' state. Any new modifications (adding a file, renaming, etc)
616
will be lost, though modified files will still be detected as such.
618
Most users will want something more like "brz revert" or "brz update"
619
unless the state file has become corrupted.
621
By default this attempts to recover the current state by looking at the
622
headers of the state file. If the state file is too corrupted to even do
623
that, you can supply --revision to force the state of the tree.
626
takes_options = ['revision', 'directory',
628
help='Reset the tree even if it doesn\'t appear to be'
633
def run(self, revision=None, directory='.', force=False):
634
tree, _ = WorkingTree.open_containing(directory)
635
self.add_cleanup(tree.lock_tree_write().unlock)
639
except errors.BzrError:
640
pass # There seems to be a real error here, so we'll reset
643
raise errors.BzrCommandError(gettext(
644
'The tree does not appear to be corrupt. You probably'
645
' want "brz revert" instead. Use "--force" if you are'
646
' sure you want to reset the working tree.'))
650
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
652
tree.reset_state(revision_ids)
653
except errors.BzrError as e:
654
if revision_ids is None:
655
extra = (gettext(', the header appears corrupt, try passing -r -1'
656
' to set the state to the last commit'))
659
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
662
class cmd_revno(Command):
515
663
__doc__ = """Show current revision number.
520
668
_see_also = ['info']
521
669
takes_args = ['location?']
522
670
takes_options = [
523
Option('tree', help='Show revno of working tree'),
671
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
676
def run(self, tree=False, location=u'.', revision=None):
677
if revision is not None and tree:
678
raise errors.BzrCommandError(gettext("--tree and --revision can "
679
"not be used together"))
530
683
wt = WorkingTree.open_containing(location)[0]
684
self.add_cleanup(wt.lock_read().unlock)
532
685
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
686
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
688
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
690
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
691
self.add_cleanup(b.lock_read().unlock)
693
if len(revision) != 1:
694
raise errors.BzrCommandError(gettext(
695
"Revision numbers only make sense for single "
696
"revisions, not ranges"))
697
revid = revision[0].as_revision_id(b)
699
revid = b.last_revision()
701
revno_t = b.revision_id_to_dotted_revno(revid)
702
except errors.NoSuchRevision:
704
revno = ".".join(str(n) for n in revno_t)
546
705
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
706
self.outf.write(revno + '\n')
550
709
class cmd_revision_info(Command):
675
837
base_tree = base_branch.basis_tree()
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
839
action = breezy.add.AddFromBaseAction(base_tree, base_path,
678
840
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
842
action = breezy.add.AddWithSkipLargeAction(to_file=self.outf,
681
843
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
846
self.add_cleanup(base_tree.lock_read().unlock)
686
847
tree, file_list = tree_files_for_add(file_list)
687
848
added, ignored = tree.smart_add(file_list, not
688
849
no_recurse, action=action, save=not dry_run)
689
850
self.cleanup_now()
690
851
if len(ignored) > 0:
692
for glob in sorted(ignored.keys()):
853
for glob in sorted(ignored):
693
854
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
856
gettext("ignored {0} matching \"{1}\"\n").format(
698
860
class cmd_mkdir(Command):
751
938
help='List entries of a particular kind: file, directory, symlink.',
754
941
takes_args = ['file*']
757
944
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
945
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
946
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
948
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)
949
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
950
self.add_cleanup(work_tree.lock_read().unlock)
765
951
if revision is not None:
766
952
tree = revision.as_tree(work_tree.branch)
768
954
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
955
self.add_cleanup(tree.lock_read().unlock)
960
self.add_cleanup(tree.lock_read().unlock)
775
961
if file_list is not None:
776
962
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
963
require_versioned=True)
778
964
# find_ids_across_trees may include some paths that don't
779
965
# 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)
966
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
968
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
970
for path, entry in sorted(entries):
787
971
if kind and kind != entry.kind:
790
976
self.outf.write('%-50s %s\n' % (path, entry.file_id))
793
979
self.outf.write('\n')
982
class cmd_cp(Command):
983
__doc__ = """Copy a file.
986
brz cp OLDNAME NEWNAME
988
brz cp SOURCE... DESTINATION
990
If the last argument is a versioned directory, all the other names
991
are copied into it. Otherwise, there must be exactly two arguments
992
and the file is copied to a new name.
994
Files cannot be copied between branches. Only files can be copied
998
takes_args = ['names*']
1001
encoding_type = 'replace'
1003
def run(self, names_list):
1005
if names_list is None:
1007
if len(names_list) < 2:
1008
raise errors.BzrCommandError(gettext("missing file argument"))
1009
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1010
for file_name in rel_names[0:-1]:
1012
raise errors.BzrCommandError(gettext("can not copy root of branch"))
1013
self.add_cleanup(tree.lock_tree_write().unlock)
1014
into_existing = osutils.isdir(names_list[-1])
1015
if not into_existing:
1017
(src, dst) = rel_names
1019
raise errors.BzrCommandError(gettext('to copy multiple files the'
1020
' destination must be a versioned'
1022
pairs = [(src, dst)]
1024
pairs = [(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
1025
for n in rel_names[:-1]]
1027
for src, dst in pairs:
1029
src_kind = tree.stored_kind(src)
1030
except errors.NoSuchFile:
1031
raise errors.BzrCommandError(
1032
gettext('Could not copy %s => %s: %s is not versioned.')
1034
if src_kind is None:
1035
raise errors.BzrCommandError(
1036
gettext('Could not copy %s => %s . %s is not versioned\.'
1038
if src_kind == 'directory':
1039
raise errors.BzrCommandError(
1040
gettext('Could not copy %s => %s . %s is a directory.'
1042
dst_parent = osutils.split(dst)[0]
1043
if dst_parent != '':
1045
dst_parent_kind = tree.stored_kind(dst_parent)
1046
except errors.NoSuchFile:
1047
raise errors.BzrCommandError(
1048
gettext('Could not copy %s => %s: %s is not versioned.')
1049
% (src, dst, dst_parent))
1050
if dst_parent_kind != 'directory':
1051
raise errors.BzrCommandError(
1052
gettext('Could not copy to %s: %s is not a directory.')
1053
% (dst_parent, dst_parent))
1055
tree.copy_one(src, dst)
796
1058
class cmd_mv(Command):
797
1059
__doc__ = """Move or rename a file.
800
bzr mv OLDNAME NEWNAME
1062
brz mv OLDNAME NEWNAME
802
bzr mv SOURCE... DESTINATION
1064
brz mv SOURCE... DESTINATION
804
1066
If the last argument is a versioned directory, all the other names
805
1067
are moved into it. Otherwise, there must be exactly two arguments
828
1090
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1092
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1093
if names_list is None:
833
1095
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)
1096
raise errors.BzrCommandError(gettext("missing file argument"))
1097
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1098
for file_name in rel_names[0:-1]:
1100
raise errors.BzrCommandError(gettext("can not move root of branch"))
1101
self.add_cleanup(tree.lock_tree_write().unlock)
838
1102
self._run(tree, names_list, rel_names, after)
840
1104
def run_auto(self, names_list, after, dry_run):
841
1105
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1106
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)
1109
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1111
work_tree, file_list = WorkingTree.open_containing_paths(
1112
names_list, default_directory='.')
1113
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1114
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1116
def _run(self, tree, names_list, rel_names, after):
946
1210
match the remote one, use pull --overwrite. This will work even if the two
947
1211
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.
1213
If there is no default location set, the first pull will set it (use
1214
--no-remember to avoid setting it). After that, you can omit the
1215
location to use the default. To change the default, use --remember. The
1216
value will only be saved if the remote location can be accessed.
1218
The --verbose option will display the revisions pulled using the log_format
1219
configuration option. You can use a different format by overriding it with
1220
-Olog_format=<other_format>.
954
1222
Note: The location can be specified either in the form of a branch,
955
1223
or in the form of a path to a file containing a merge directive generated
959
1227
_see_also = ['push', 'update', 'status-flags', 'send']
960
1228
takes_options = ['remember', 'overwrite', 'revision',
961
1229
custom_help('verbose',
962
1230
help='Show logs of pulled revisions.'),
1231
custom_help('directory',
964
1232
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1233
'rather than the one containing the working directory.'),
970
1235
help="Perform a local pull in a bound "
971
1236
"branch. Local pulls are not applied to "
972
1237
"the master branch."
1240
help="Show base revision text in conflicts."),
1241
Option('overwrite-tags',
1242
help="Overwrite tags only."),
975
1244
takes_args = ['location?']
976
1245
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1247
def run(self, location=None, remember=None, overwrite=False,
979
1248
revision=None, verbose=False,
980
directory=None, local=False):
1249
directory=None, local=False,
1250
show_base=False, overwrite_tags=False):
1253
overwrite = ["history", "tags"]
1254
elif overwrite_tags:
1255
overwrite = ["tags"]
981
1258
# FIXME: too much stuff is in the command class
982
1259
revision_id = None
983
1260
mergeable = None
1070
1353
considered diverged if the destination branch's most recent commit is one
1071
1354
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
1356
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1357
the other branch completely, discarding its unmerged changes.
1076
1359
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.
1360
do a merge (see brz help merge) from the other branch, and commit that.
1078
1361
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.
1363
If there is no default push location set, the first push will set it (use
1364
--no-remember to avoid setting it). After that, you can omit the
1365
location to use the default. To change the default, use --remember. The
1366
value will only be saved if the remote location can be accessed.
1368
The --verbose option will display the revisions pushed using the log_format
1369
configuration option. You can use a different format by overriding it with
1370
-Olog_format=<other_format>.
1086
1373
_see_also = ['pull', 'update', 'working-trees']
1106
1390
help='Create a stacked branch that refers to another branch '
1107
1391
'for the commit history. Only the work not present in the '
1108
1392
'referenced branch is included in the branch created.',
1110
1394
Option('strict',
1111
1395
help='Refuse to push if there are uncommitted changes in'
1112
1396
' the working tree, --no-strict disables the check.'),
1398
help="Don't populate the working tree, even for protocols"
1399
" that support it."),
1400
Option('overwrite-tags',
1401
help="Overwrite tags only."),
1114
1403
takes_args = ['location?']
1115
1404
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1406
def run(self, location=None, remember=None, overwrite=False,
1118
1407
create_prefix=False, verbose=False, revision=None,
1119
1408
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1409
stacked=False, strict=None, no_tree=False,
1410
overwrite_tags=False):
1411
from .push import _show_push_branch
1414
overwrite = ["history", "tags"]
1415
elif overwrite_tags:
1416
overwrite = ["tags"]
1123
1420
if directory is None:
1124
1421
directory = '.'
1125
1422
# Get the source branch
1126
1423
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1424
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1425
# Get the tip's revision_id
1129
1426
revision = _get_one_revision('push', revision)
1130
1427
if revision is not None:
1151
1448
# error by the feedback given to them. RBC 20080227.
1152
1449
stacked_on = parent_url
1153
1450
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1451
raise errors.BzrCommandError(gettext(
1452
"Could not determine branch to refer to."))
1157
1454
# Get the destination location
1158
1455
if location is None:
1159
1456
stored_loc = br_from.get_push_location()
1160
1457
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1458
parent_loc = br_from.get_parent()
1460
raise errors.BzrCommandError(gettext(
1461
"No push location known or specified. To push to the "
1462
"parent branch (at %s), use 'brz push :parent'." %
1463
urlutils.unescape_for_display(parent_loc,
1464
self.outf.encoding)))
1466
raise errors.BzrCommandError(gettext(
1467
"No push location known or specified."))
1164
1469
display_url = urlutils.unescape_for_display(stored_loc,
1165
1470
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1471
note(gettext("Using saved push location: %s") % display_url)
1167
1472
location = stored_loc
1169
1474
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1475
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1476
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1477
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1480
class cmd_branch(Command):
1210
1517
help="Bind new branch to from location."),
1212
aliases = ['get', 'clone']
1214
1520
def run(self, from_location, to_location=None, revision=None,
1215
1521
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(
1522
use_existing_dir=False, switch=False, bind=False,
1524
from breezy import switch as _mod_switch
1525
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1527
if not (hardlink or files_from):
1528
# accelerator_tree is usually slower because you have to read N
1529
# files (no readahead, lots of seeks, etc), but allow the user to
1530
# explicitly request it
1531
accelerator_tree = None
1532
if files_from is not None and files_from != from_location:
1533
accelerator_tree = WorkingTree.open(files_from)
1221
1534
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1535
self.add_cleanup(br_from.lock_read().unlock)
1224
1536
if revision is not None:
1225
1537
revision_id = revision.as_revision_id(br_from)
1230
1542
revision_id = br_from.last_revision()
1231
1543
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1544
to_location = getattr(br_from, "name", None)
1546
to_location = urlutils.derive_to_location(from_location)
1233
1547
to_transport = transport.get_transport(to_location)
1235
1549
to_transport.mkdir('.')
1236
1550
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1552
to_dir = controldir.ControlDir.open_from_transport(
1554
except errors.NotBranchError:
1555
if not use_existing_dir:
1556
raise errors.BzrCommandError(gettext('Target directory "%s" '
1557
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1562
to_dir.open_branch()
1243
1563
except errors.NotBranchError:
1246
1566
raise errors.AlreadyBranchError(to_location)
1247
1567
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1568
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)
1574
# preserve whatever source format we have.
1575
to_dir = br_from.controldir.sprout(
1576
to_transport.base, revision_id,
1577
possible_transports=[to_transport],
1578
accelerator_tree=accelerator_tree, hardlink=hardlink,
1579
stacked=stacked, force_new_repo=standalone,
1580
create_tree_if_local=not no_tree, source_branch=br_from)
1581
branch = to_dir.open_branch(
1582
possible_transports=[
1583
br_from.controldir.root_transport, to_transport])
1584
except errors.NoSuchRevision:
1585
to_transport.delete_tree('.')
1586
msg = gettext("The branch {0} has no revision {1}.").format(
1587
from_location, revision)
1588
raise errors.BzrCommandError(msg)
1591
to_repo = to_dir.open_repository()
1592
except errors.NoRepositoryPresent:
1593
to_repo = to_dir.create_repository()
1594
to_repo.fetch(br_from.repository, revision_id=revision_id)
1595
branch = br_from.sprout(to_dir, revision_id=revision_id)
1596
br_from.tags.merge_to(branch.tags)
1266
1598
# If the source branch is stacked, the new branch may
1267
1599
# be stacked whether we asked for that explicitly or not.
1268
1600
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1602
note(gettext('Created new stacked branch referring to %s.') %
1271
1603
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1604
except (errors.NotStacked, UnstackableBranchFormat,
1605
errors.UnstackableRepositoryFormat) as e:
1606
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1608
# Bind to the parent
1277
1609
parent_branch = Branch.open(from_location)
1278
1610
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1611
note(gettext('New branch bound to %s') % from_location)
1281
1613
# Switch to the new branch
1282
1614
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1615
_mod_switch.switch(wt.controldir, branch)
1616
note(gettext('Switched to branch: %s'),
1285
1617
urlutils.unescape_for_display(branch.base, 'utf-8'))
1620
class cmd_branches(Command):
1621
__doc__ = """List the branches available at the current location.
1623
This command will print the names of all the branches at the current
1627
takes_args = ['location?']
1629
Option('recursive', short_name='R',
1630
help='Recursively scan for branches rather than '
1631
'just looking in the specified location.')]
1633
def run(self, location=".", recursive=False):
1635
t = transport.get_transport(location)
1636
if not t.listable():
1637
raise errors.BzrCommandError(
1638
"Can't scan this type of location.")
1639
for b in controldir.ControlDir.find_branches(t):
1640
self.outf.write("%s\n" % urlutils.unescape_for_display(
1641
urlutils.relative_url(t.base, b.base),
1642
self.outf.encoding).rstrip("/"))
1644
dir = controldir.ControlDir.open_containing(location)[0]
1646
active_branch = dir.open_branch(name="")
1647
except errors.NotBranchError:
1648
active_branch = None
1650
for name, branch in iter_sibling_branches(dir):
1653
active = (active_branch is not None and
1654
active_branch.base == branch.base)
1655
names[name] = active
1656
# Only mention the current branch explicitly if it's not
1657
# one of the colocated branches
1658
if not any(viewvalues(names)) and active_branch is not None:
1659
self.outf.write("* %s\n" % gettext("(default)"))
1660
for name in sorted(names):
1661
active = names[name]
1666
self.outf.write("%s %s\n" % (
1667
prefix, name.encode(self.outf.encoding)))
1288
1670
class cmd_checkout(Command):
1289
1671
__doc__ = """Create a new checkout of an existing branch.
1389
1772
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
1773
__doc__ = """Update a working tree to a new revision.
1775
This will perform a merge of the destination revision (the tip of the
1776
branch, or the specified revision) into the working tree, and then make
1777
that revision the basis revision for the working tree.
1779
You can use this to visit an older revision, or to update a working tree
1780
that is out of date from its branch.
1782
If there are any uncommitted changes in the tree, they will be carried
1783
across and remain as uncommitted changes after the update. To discard
1784
these changes, use 'brz revert'. The uncommitted changes may conflict
1785
with the changes brought in by the change in basis revision.
1787
If the tree's branch is bound to a master branch, brz will also update
1400
1788
the branch from the master.
1790
You cannot update just a single file or directory, because each Bazaar
1791
working tree has just a single basis revision. If you want to restore a
1792
file that has been removed locally, use 'brz revert' instead of 'brz
1793
update'. If you want to restore a file to its state in a previous
1794
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1795
out the old content of that file to a new location.
1797
The 'dir' argument, if given, must be the location of the root of a
1798
working tree to update. By default, the working tree that contains the
1799
current working directory is used.
1403
1802
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1803
takes_args = ['dir?']
1405
takes_options = ['revision']
1804
takes_options = ['revision',
1806
help="Show base revision text in conflicts."),
1406
1808
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1810
def run(self, dir=None, revision=None, show_base=None):
1409
1811
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]
1812
raise errors.BzrCommandError(gettext(
1813
"brz update --revision takes exactly one revision"))
1815
tree = WorkingTree.open_containing('.')[0]
1817
tree, relpath = WorkingTree.open_containing(dir)
1820
raise errors.BzrCommandError(gettext(
1821
"brz update can only update a whole tree, "
1822
"not a file or subdirectory"))
1413
1823
branch = tree.branch
1414
1824
possible_transports = []
1415
1825
master = branch.get_master_branch(
1416
1826
possible_transports=possible_transports)
1417
1827
if master is not None:
1419
1828
branch_location = master.base
1831
branch_location = tree.branch.base
1421
1832
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1833
self.add_cleanup(tree.unlock)
1424
1834
# get rid of the final '/' and be ready for display
1425
1835
branch_location = urlutils.unescape_for_display(
1451
1861
change_reporter,
1452
1862
possible_transports=possible_transports,
1453
1863
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1865
show_base=show_base)
1866
except errors.NoSuchRevision as e:
1867
raise errors.BzrCommandError(gettext(
1457
1868
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1869
"brz update --revision only works"
1870
" for a revision in the branch history")
1460
1871
% (e.revision))
1461
1872
revno = tree.branch.revision_id_to_dotted_revno(
1462
1873
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1874
note(gettext('Updated to revision {0} of branch {1}').format(
1875
'.'.join(map(str, revno)), branch_location))
1465
1876
parent_ids = tree.get_parent_ids()
1466
1877
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'.")
1878
note(gettext('Your local commits will now show as pending merges with '
1879
"'brz status', and can be committed with 'brz commit'."))
1469
1880
if conflicts != 0:
1530
1942
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1943
'The file deletion mode to be used.',
1532
1944
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.')]
1945
safe='Backup changed files (default).',
1946
keep='Delete from brz but leave the working copy.',
1947
no_backup='Don\'t backup changed files.'),
1538
1949
aliases = ['rm', 'del']
1539
1950
encoding_type = 'replace'
1541
1952
def run(self, file_list, verbose=False, new=False,
1542
1953
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1955
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1957
if file_list is not None:
1546
1958
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1960
self.add_cleanup(tree.lock_write().unlock)
1550
1961
# Heuristics should probably all move into tree.remove_smart or
1742
2169
to_transport.ensure_base()
1743
2170
except errors.NoSuchFile:
1744
2171
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2172
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2173
" does not exist."
1747
2174
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2175
" leading parent directories.")
1750
2177
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2180
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1754
2181
except errors.NotBranchError:
1755
2182
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2183
create_branch = controldir.ControlDir.create_branch_convenience
2185
force_new_tree = False
2187
force_new_tree = None
1757
2188
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2189
possible_transports=[to_transport],
2190
force_new_tree=force_new_tree)
2191
a_controldir = branch.controldir
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2193
from .transport.local import LocalTransport
2194
if a_controldir.has_branch():
1763
2195
if (isinstance(to_transport, LocalTransport)
1764
and not a_bzrdir.has_workingtree()):
2196
and not a_controldir.has_workingtree()):
1765
2197
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2198
raise errors.AlreadyBranchError(location)
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2199
branch = a_controldir.create_branch()
2200
if not no_tree and not a_controldir.has_workingtree():
2201
a_controldir.create_workingtree()
1769
2202
if append_revisions_only:
1771
2204
branch.set_append_revisions_only(True)
1772
2205
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2206
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2207
' to append-revisions-only. Try --default.'))
1775
2208
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2209
from .info import describe_layout, describe_format
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2211
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1779
2212
except (errors.NoWorkingTree, errors.NotLocalUrl):
1781
2214
repository = branch.repository
1782
2215
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))
2216
format = describe_format(a_controldir, repository, branch, tree)
2217
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
2219
if repository.is_shared():
1786
2220
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
2221
url = repository.controldir.root_transport.external_url()
1789
2223
url = urlutils.local_path_from_url(url)
1790
except errors.InvalidURL:
2224
except urlutils.InvalidURL:
1792
self.outf.write("Using shared repository: %s\n" % url)
2226
self.outf.write(gettext("Using shared repository: %s\n") % url)
1795
2229
class cmd_init_repository(Command):
1837
2271
def run(self, location, format=None, no_trees=False):
1838
2272
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2273
format = controldir.format_registry.make_controldir('default')
1841
2275
if location is None:
1844
2278
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)
2280
(repo, newdir, require_stacking, repository_policy) = (
2281
format.initialize_on_transport_ex(to_transport,
2282
create_prefix=True, make_working_trees=not no_trees,
2283
shared_repo=True, force_new_repo=True,
2284
use_existing_dir=True,
2285
repo_format_name=format.repository_format.get_format_string()))
1850
2286
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2287
from .info import show_bzrdir_info
2288
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2291
class cmd_diff(Command):
1875
2318
Shows the difference in the working tree versus the last commit::
1879
2322
Difference between the working tree and revision 1::
1883
2326
Difference between revision 3 and revision 1::
1887
2330
Difference between revision 3 and revision 1 for branch xxx::
1891
To see the changes introduced in revision X::
2334
The changes introduced by revision 2 (equivalent to -r1..2)::
2338
To see the changes introduced by revision X::
1895
2342
Note that in the case of a merge, the -c option shows the changes
1896
2343
compared to the left hand parent. To see the changes against
1897
2344
another parent, use::
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2346
brz diff -r<chosen_parent>..X
2348
The changes between the current revision and the previous revision
2349
(equivalent to -c-1 and -r-2..-1)
1905
2353
Show just the differences for file NEWS::
1909
2357
Show the differences in working tree xxx for file NEWS::
1913
2361
Show the differences from branch xxx to this working tree:
1917
2365
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/
2367
brz diff --old xxx --new yyy NEWS
2369
Same as 'brz diff' but prefix paths with old/ and new/::
2371
brz diff --prefix old/:new/
2373
Show the differences using a custom diff program with options::
2375
brz diff --using /usr/bin/diff --diff-options -wu
1925
2377
_see_also = ['status']
1926
2378
takes_args = ['file*']
1927
2379
takes_options = [
1928
Option('diff-options', type=str,
2380
Option('diff-options', type=text_type,
1929
2381
help='Pass these options to the external diff program.'),
1930
Option('prefix', type=str,
2382
Option('prefix', type=text_type,
1931
2383
short_name='p',
1932
2384
help='Set prefixes added to old and new filenames, as '
1933
2385
'two values separated by a colon. (eg "old/:new/").'),
1935
2387
help='Branch/tree to compare from.',
1939
2391
help='Branch/tree to compare to.',
1944
2396
Option('using',
1945
2397
help='Use this command to compare files.',
1948
2400
RegistryOption('format',
1949
2402
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2403
lazy_registry=('breezy.diff', 'format_registry'),
2404
title='Diff format'),
2406
help='How many lines of context to show.',
1953
2410
aliases = ['di', 'dif']
1954
2411
encoding_type = 'exact'
1956
2413
@display_command
1957
2414
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,
2415
prefix=None, old=None, new=None, using=None, format=None,
2417
from .diff import (get_trees_and_branches_to_diff_locked,
1960
2418
show_diff_trees)
1962
if (prefix is None) or (prefix == '0'):
1963
2421
# diff -p0 format
2424
elif prefix == u'1' or prefix is None:
1967
2425
old_label = 'old/'
1968
2426
new_label = 'new/'
1970
old_label, new_label = prefix.split(":")
2427
elif u':' in prefix:
2428
old_label, new_label = prefix.split(u":")
1972
raise errors.BzrCommandError(
2430
raise errors.BzrCommandError(gettext(
1973
2431
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2432
' (eg "old/:new/")'))
1976
2434
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2435
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2436
' one or two revision specifiers'))
1980
2438
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2439
raise errors.BzrCommandError(gettext(
2440
'{0} and {1} are mutually exclusive').format(
2441
'--using', '--format'))
1984
2443
(old_tree, new_tree,
1985
2444
old_branch, new_branch,
1986
2445
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2446
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2447
# GNU diff on Windows uses ANSI encoding for filenames
2448
path_encoding = osutils.get_diff_header_encoding()
2449
return show_diff_trees(old_tree, new_tree, self.outf,
1989
2450
specific_files=specific_files,
1990
2451
external_diff_options=diff_options,
1991
2452
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2453
extra_trees=extra_trees,
2454
path_encoding=path_encoding,
2455
using=using, context=context,
1993
2456
format_cls=format)
2053
2512
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2513
takes_options = ['directory', 'null']
2060
2515
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2516
def run(self, null=False, directory=u'.'):
2517
wt = WorkingTree.open_containing(directory)[0]
2518
self.add_cleanup(wt.lock_read().unlock)
2065
2519
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):
2520
self.add_cleanup(basis.lock_read().unlock)
2521
root_id = wt.get_root_id()
2522
for path in wt.all_versioned_paths():
2523
if basis.has_filename(path):
2527
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2530
self.outf.write(path + '\0')
2224
2675
:Other filtering:
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2677
The --match option can be used for finding revisions that match a
2678
regular expression in a commit message, committer, author or bug.
2679
Specifying the option several times will match any of the supplied
2680
expressions. --match-author, --match-bugs, --match-committer and
2681
--match-message can be used to only match a specific field.
2229
2683
:Tips & tricks:
2231
2685
GUI tools and IDEs are often better at exploring history than command
2232
2686
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
2687
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2688
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
2689
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2691
You may find it useful to add the aliases below to ``breezy.conf``::
2241
2695
top = log -l10 --line
2242
2696
show = log -v -p
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2698
``brz tip`` will then show the latest revision while ``brz top``
2245
2699
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2700
particular revision X, ``brz show -rX``.
2248
2702
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2703
use ``brz log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2705
``brz log -v`` on a branch with lots of history is currently
2252
2706
very slow. A fix for this issue is currently under development.
2253
2707
With or without that fix, it is recommended that a revision range
2254
2708
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2710
brz has a generic full-text matching plugin, brz-search, that can be
2257
2711
used to find revisions matching user names, commit messages, etc.
2258
2712
Among other features, this plugin can find all revisions containing
2259
2713
a list of words but not others.
2297
2756
Option('show-diff',
2298
2757
short_name='p',
2299
2758
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2759
Option('include-merged',
2301
2760
help='Show merged revisions like --levels 0 does.'),
2761
Option('include-merges', hidden=True,
2762
help='Historical alias for --include-merged.'),
2763
Option('omit-merges',
2764
help='Do not report commits with more than one parent.'),
2302
2765
Option('exclude-common-ancestry',
2303
2766
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2767
' of both ancestries (require -rX..Y).'
2769
Option('signatures',
2770
help='Show digital signature validity.'),
2773
help='Show revisions whose properties match this '
2776
ListOption('match-message',
2777
help='Show revisions whose message matches this '
2780
ListOption('match-committer',
2781
help='Show revisions whose committer matches this '
2784
ListOption('match-author',
2785
help='Show revisions whose authors match this '
2788
ListOption('match-bugs',
2789
help='Show revisions whose bugs match this '
2307
2793
encoding_type = 'replace'
2528
3044
help='Recurse into subdirectories.'),
2529
3045
Option('from-root',
2530
3046
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
3047
Option('unknown', short_name='u',
3048
help='Print unknown files.'),
2532
3049
Option('versioned', help='Print versioned files.',
2533
3050
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.'),
3051
Option('ignored', short_name='i',
3052
help='Print ignored files.'),
3053
Option('kind', short_name='k',
2539
3054
help='List entries of a particular kind: file, directory, symlink.',
2543
3060
@display_command
2544
3061
def run(self, revision=None, verbose=False,
2545
3062
recursive=False, from_root=False,
2546
3063
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
3064
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
3066
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
3067
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
3069
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3070
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
3071
all = not (unknown or versioned or ignored)
2556
3073
selection = {'I':ignored, '?':unknown, 'V':versioned}
2674
3191
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3192
precedence over the '!' exception patterns.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3196
* Ignore patterns containing shell wildcards must be quoted from
3199
* Ignore patterns starting with "#" act as comments in the ignore file.
3200
To ignore patterns that begin with that character, use the "RE:" prefix.
2681
3203
Ignore the top level Makefile::
2683
bzr ignore ./Makefile
3205
brz ignore ./Makefile
2685
3207
Ignore .class files in all directories...::
2687
bzr ignore "*.class"
3209
brz ignore "*.class"
2689
3211
...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"
3213
brz ignore "!special.class"
3215
Ignore files whose name begins with the "#" character::
3219
Ignore .o files under the lib directory::
3221
brz ignore "lib/**/*.o"
3223
Ignore .o files under the lib directory::
3225
brz ignore "RE:lib/.*\\.o"
2701
3227
Ignore everything but the "debian" toplevel directory::
2703
bzr ignore "RE:(?!debian/).*"
3229
brz ignore "RE:(?!debian/).*"
2705
3231
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
3232
but always ignore autosave files ending in ~, even under local/::
2709
bzr ignore "!./local"
3235
brz ignore "!./local"
2713
3239
_see_also = ['status', 'ignored', 'patterns']
2714
3240
takes_args = ['name_pattern*']
3241
takes_options = ['directory',
2716
3242
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3243
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
3246
def run(self, name_pattern_list=None, default_rules=None,
3248
from breezy import ignores
2722
3249
if default_rules is not None:
2723
3250
# dump the default rules and exit
2724
3251
for pattern in ignores.USER_DEFAULTS:
2725
3252
self.outf.write("%s\n" % pattern)
2727
3254
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3255
raise errors.BzrCommandError(gettext("ignore requires at least one "
3256
"NAME_PATTERN or --default-rules."))
2730
3257
name_pattern_list = [globbing.normalize_pattern(p)
2731
3258
for p in name_pattern_list]
3260
bad_patterns_count = 0
3261
for p in name_pattern_list:
3262
if not globbing.Globster.is_pattern_valid(p):
3263
bad_patterns_count += 1
3264
bad_patterns += ('\n %s' % p)
3266
msg = (ngettext('Invalid ignore pattern found. %s',
3267
'Invalid ignore patterns found. %s',
3268
bad_patterns_count) % bad_patterns)
3269
ui.ui_factory.show_error(msg)
3270
raise lazy_regex.InvalidPattern('')
2732
3271
for name_pattern in name_pattern_list:
2733
3272
if (name_pattern[0] == '/' or
2734
3273
(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'.')
3274
raise errors.BzrCommandError(gettext(
3275
"NAME_PATTERN should not be an absolute path"))
3276
tree, relpath = WorkingTree.open_containing(directory)
2738
3277
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3278
ignored = globbing.Globster(name_pattern_list)
3280
self.add_cleanup(tree.lock_read().unlock)
2742
3281
for entry in tree.list_files():
2744
3283
if id is not None:
2745
3284
filename = entry[0]
2746
3285
if ignored.match(filename):
2747
3286
matches.append(filename)
2749
3287
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3288
self.outf.write(gettext("Warning: the following files are version "
3289
"controlled and match your ignore pattern:\n%s"
2752
3290
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3291
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2756
3294
class cmd_ignored(Command):
2829
3368
================= =========================
2831
3371
takes_args = ['dest', 'branch_or_subdir?']
3372
takes_options = ['directory',
2833
3373
Option('format',
2834
3374
help="Type of file to export to.",
2837
3377
Option('filters', help='Apply content filters to export the '
2838
3378
'convenient form.'),
2841
3381
help="Name of the root directory inside the exported file."),
2842
3382
Option('per-file-timestamps',
2843
3383
help='Set modification time of files to that of the last '
2844
3384
'revision in which it was changed.'),
3385
Option('uncommitted',
3386
help='Export the working tree contents rather than that of the '
2846
3389
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
3390
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3392
from .export import export
2850
3394
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3395
branch_or_subdir = directory
3397
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3399
if tree is not None:
3400
self.add_cleanup(tree.lock_read().unlock)
3404
raise errors.BzrCommandError(
3405
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)
3408
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3410
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3411
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3412
except errors.NoSuchExportFormat as e:
3413
raise errors.BzrCommandError(
3414
gettext('Unsupported export format: %s') % e.format)
2866
3417
class cmd_cat(Command):
2900
3450
if tree is None:
2901
3451
tree = b.basis_tree()
2902
3452
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3453
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3455
old_file_id = rev_tree.path2id(relpath)
3457
# TODO: Split out this code to something that generically finds the
3458
# best id for a path across one or more trees; it's like
3459
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3461
if name_from_revision:
2909
3462
# Try in revision if requested
2910
3463
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3464
raise errors.BzrCommandError(gettext(
3465
"{0!r} is not present in revision {1}").format(
2913
3466
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3468
actual_file_id = old_file_id
2917
3470
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" % (
3471
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3472
actual_file_id = cur_file_id
3473
elif old_file_id is not None:
3474
actual_file_id = old_file_id
3476
raise errors.BzrCommandError(gettext(
3477
"{0!r} is not present in revision {1}").format(
2935
3478
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)
3480
from .filter_tree import ContentFilterTree
3481
filter_tree = ContentFilterTree(rev_tree,
3482
rev_tree._content_filter_stack)
3483
content = filter_tree.get_file_text(relpath, actual_file_id)
2949
self.outf.write(content)
3485
content = rev_tree.get_file_text(relpath, actual_file_id)
3487
self.outf.write(content)
2952
3490
class cmd_local_time_offset(Command):
3000
3538
A common mistake is to forget to add a new file or directory before
3001
3539
running the commit command. The --strict option checks for unknown
3002
3540
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``
3541
checks can be implemented by defining hooks. See ``brz help hooks``
3006
3544
:Things to note:
3008
3546
If you accidentially commit the wrong changes or make a spelling
3009
3547
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3548
to undo it. See ``brz help uncommit`` for details.
3012
3550
Hooks can also be configured to run after a commit. This allows you
3013
3551
to trigger updates to external systems like bug trackers. The --fixes
3014
3552
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.)
3553
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
3556
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3557
takes_args = ['selected*']
3045
3558
takes_options = [
3046
ListOption('exclude', type=str, short_name='x',
3559
ListOption('exclude', type=text_type, short_name='x',
3047
3560
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3561
Option('message', type=text_type,
3049
3562
short_name='m',
3050
3563
help="Description of the new revision."),
3052
3565
Option('unchanged',
3053
3566
help='Commit even if nothing has changed.'),
3054
Option('file', type=str,
3567
Option('file', type=text_type,
3055
3568
short_name='F',
3056
3569
argname='msgfile',
3057
3570
help='Take commit message from this file.'),
3058
3571
Option('strict',
3059
3572
help="Refuse to commit if there are unknown "
3060
3573
"files in the working tree."),
3061
Option('commit-time', type=str,
3574
Option('commit-time', type=text_type,
3062
3575
help="Manually set a commit time using commit date "
3063
3576
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
ListOption('fixes', type=str,
3577
ListOption('fixes', type=text_type,
3065
3578
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3579
"(see \"brz help bugs\")."),
3580
ListOption('author', type=text_type,
3068
3581
help="Set the author's name, if it's different "
3069
3582
"from the committer."),
3070
3583
Option('local',
3076
3589
Option('show-diff', short_name='p',
3077
3590
help='When no message is supplied, show the diff along'
3078
3591
' with the status summary in the message editor.'),
3593
help='When committing to a foreign version control '
3594
'system do not push data that can not be natively '
3080
3597
aliases = ['ci', 'checkin']
3082
3599
def _iter_bug_fix_urls(self, fixes, branch):
3600
default_bugtracker = None
3083
3601
# Configure the properties for bug fixing attributes.
3084
3602
for fixed_bug in fixes:
3085
3603
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3604
if len(tokens) == 1:
3605
if default_bugtracker is None:
3606
branch_config = branch.get_config_stack()
3607
default_bugtracker = branch_config.get(
3609
if default_bugtracker is None:
3610
raise errors.BzrCommandError(gettext(
3611
"No tracker specified for bug %s. Use the form "
3612
"'tracker:id' or specify a default bug tracker "
3613
"using the `bugtracker` option.\nSee "
3614
"\"brz help bugs\" for more information on this "
3615
"feature. Commit refused.") % fixed_bug)
3616
tag = default_bugtracker
3618
elif len(tokens) != 2:
3619
raise errors.BzrCommandError(gettext(
3088
3620
"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
3621
"See \"brz help bugs\" for more information on this "
3622
"feature.\nCommit refused.") % fixed_bug)
3624
tag, bug_id = tokens
3093
3626
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),))
3627
except bugtracker.UnknownBugTrackerAbbreviation:
3628
raise errors.BzrCommandError(gettext(
3629
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3630
except bugtracker.MalformedBugIdentifier as e:
3631
raise errors.BzrCommandError(gettext(
3632
u"%s\nCommit refused.") % (e,))
3101
3634
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3635
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3636
author=None, show_diff=False, exclude=None, commit_time=None,
3638
from .commit import (
3105
3639
PointlessCommit,
3641
from .errors import (
3106
3642
ConflictsInTree,
3107
3643
StrictCommitFailed
3109
from bzrlib.msgeditor import (
3645
from .msgeditor import (
3110
3646
edit_commit_message_encoded,
3111
3647
generate_commit_message_template,
3112
make_commit_message_template_encoded
3648
make_commit_message_template_encoded,
3115
3652
commit_stamp = offset = None
3116
3653
if commit_time is not None:
3118
3655
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.
3656
except ValueError as e:
3657
raise errors.BzrCommandError(gettext(
3658
"Could not parse --commit-time: " + str(e)))
3129
3660
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3662
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3663
if selected_list == ['']:
3133
3664
# workaround - commit of root of tree should be exactly the same
3134
3665
# as just default commit in that tree, and succeed even though
3205
3741
reporter=None, verbose=verbose, revprops=properties,
3206
3742
authors=author, timestamp=commit_stamp,
3207
3743
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3744
exclude=tree.safe_relpath_files(exclude),
3209
3746
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3747
raise errors.BzrCommandError(gettext("No changes to commit."
3748
" Please 'brz add' the files you want to commit, or use"
3749
" --unchanged to force an empty commit."))
3212
3750
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3751
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3752
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3216
3754
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"
3755
raise errors.BzrCommandError(gettext("Commit refused because there are"
3756
" unknown files in the working tree."))
3757
except errors.BoundBranchOutOfDate as e:
3758
e.extra_help = (gettext("\n"
3221
3759
'To commit to master branch, run update and then commit.\n'
3222
3760
'You can also pass --local to commit to continue working '
3297
3835
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.
3836
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3838
When the default format has changed after a major new release of
3839
Bazaar, you may be informed during certain operations that you
3840
should upgrade. Upgrading to a newer format may improve performance
3841
or make new features available. It may however limit interoperability
3842
with older repositories or with older versions of Bazaar.
3844
If you wish to upgrade to a particular format rather than the
3845
current default, that can be specified using the --format option.
3846
As a consequence, you can use the upgrade command this way to
3847
"downgrade" to an earlier format, though some conversions are
3848
a one way process (e.g. changing from the 1.x default to the
3849
2.x default) so downgrading is not always possible.
3851
A backup.bzr.~#~ directory is created at the start of the conversion
3852
process (where # is a number). By default, this is left there on
3853
completion. If the conversion fails, delete the new .bzr directory
3854
and rename this one back in its place. Use the --clean option to ask
3855
for the backup.bzr directory to be removed on successful conversion.
3856
Alternatively, you can delete it by hand if everything looks good
3859
If the location given is a shared repository, dependent branches
3860
are also converted provided the repository converts successfully.
3861
If the conversion of a branch fails, remaining branches are still
3864
For more information on upgrades, see the Bazaar Upgrade Guide,
3865
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3868
_see_also = ['check', 'reconcile', 'formats']
3306
3869
takes_args = ['url?']
3307
3870
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'),
3871
RegistryOption('format',
3872
help='Upgrade to a specific format. See "brz help'
3873
' formats" for details.',
3874
lazy_registry=('breezy.controldir', 'format_registry'),
3875
converter=lambda name: controldir.format_registry.make_controldir(name),
3876
value_switches=True, title='Branch format'),
3878
help='Remove the backup.bzr directory if successful.'),
3880
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)
3883
def run(self, url='.', format=None, clean=False, dry_run=False):
3884
from .upgrade import upgrade
3885
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3887
if len(exceptions) == 1:
3888
# Compatibility with historical behavior
3321
3894
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3895
__doc__ = """Show or set brz user id.
3325
3898
Show the email of the current user::
3329
3902
Set the current user::
3331
bzr whoami "Frank Chu <fchu@example.com>"
3904
brz whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3906
takes_options = [ 'directory',
3334
3908
help='Display email address only.'),
3335
3909
Option('branch',
3336
3910
help='Set identity for the current branch instead of '
3340
3914
encoding_type = 'replace'
3342
3916
@display_command
3343
def run(self, email=False, branch=False, name=None):
3917
def run(self, email=False, branch=False, name=None, directory=None):
3344
3918
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()
3919
if directory is None:
3920
# use branch if we're inside one; otherwise global config
3922
c = Branch.open_containing(u'.')[0].get_config_stack()
3923
except errors.NotBranchError:
3924
c = _mod_config.GlobalStack()
3926
c = Branch.open(directory).get_config_stack()
3927
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3929
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3932
self.outf.write(identity + '\n')
3936
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3939
# 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:
3941
_mod_config.extract_email_address(name)
3942
except _mod_config.NoEmailInUsername as e:
3360
3943
warning('"%s" does not seem to contain an email address. '
3361
3944
'This is allowed, but not recommended.', name)
3363
3946
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3948
if directory is None:
3949
c = Branch.open_containing(u'.')[0].get_config_stack()
3951
b = Branch.open(directory)
3952
self.add_cleanup(b.lock_write().unlock)
3953
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3955
c = _mod_config.GlobalStack()
3956
c.set('email', name)
3371
3959
class cmd_nick(Command):
3372
3960
__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.
3962
If unset, the colocated branch name is used for colocated branches, and
3963
the branch directory name is used for other branches. To print the
3964
current nickname, execute with no argument.
3377
3966
Bound branches use the nickname of its master branch unless it is set
3433
4023
def remove_alias(self, alias_name):
3434
4024
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
4025
raise errors.BzrCommandError(gettext(
4026
'brz alias --remove expects an alias to remove.'))
3437
4027
# If alias is not found, print something like:
3438
4028
# unalias: foo: not found
3439
c = config.GlobalConfig()
4029
c = _mod_config.GlobalConfig()
3440
4030
c.unset_alias(alias_name)
3442
4032
@display_command
3443
4033
def print_aliases(self):
3444
4034
"""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))
4035
aliases = _mod_config.GlobalConfig().get_aliases()
4036
for key, value in sorted(viewitems(aliases)):
4037
self.outf.write('brz alias %s="%s"\n' % (key, value))
3449
4039
@display_command
3450
4040
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
4041
from .commands import get_alias
3452
4042
alias = get_alias(alias_name)
3453
4043
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
4044
self.outf.write("brz alias: %s: not found\n" % alias_name)
3456
4046
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
4047
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3459
4049
def set_alias(self, alias_name, alias_command):
3460
4050
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
4051
c = _mod_config.GlobalConfig()
3462
4052
c.set_alias(alias_name, alias_command)
3496
4086
Tests that need working space on disk use a common temporary directory,
3497
4087
typically inside $TMPDIR or /tmp.
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4089
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4090
into a pdb postmortem session.
4092
The --coverage=DIRNAME global option produces a report with covered code
3503
4096
Run only tests relating to 'ignore'::
3507
4100
Disable plugins and list tests as they're run::
3509
bzr --no-plugins selftest -v
4102
brz --no-plugins selftest -v
3511
4104
# NB: this is used from the class without creating an instance, which is
3512
4105
# why it does not have a self parameter.
3513
4106
def get_transport_type(typestring):
3514
4107
"""Parse and return a transport specifier."""
3515
4108
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4109
from .tests import stub_sftp
3517
4110
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4111
elif typestring == "memory":
4112
from .tests import test_server
3520
4113
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4114
elif typestring == "fakenfs":
4115
from .tests import test_server
3523
4116
return test_server.FakeNFSServer
3524
4117
msg = "No known transport type %s. Supported types are: sftp\n" %\
3554
4145
help='List the tests instead of running them.'),
3555
4146
RegistryOption('parallel',
3556
4147
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4148
lazy_registry=('breezy.tests', 'parallel_registry'),
3558
4149
value_switches=False,
3560
Option('randomize', type=str, argname="SEED",
4151
Option('randomize', type=text_type, argname="SEED",
3561
4152
help='Randomize the order of tests using the given'
3562
4153
' 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.'),
4154
ListOption('exclude', type=text_type, argname="PATTERN",
4156
help='Exclude tests that match this regular'
4159
help='Output test progress via subunit v1.'),
4161
help='Output test progress via subunit v2.'),
3569
4162
Option('strict', help='Fail on missing dependencies or '
3570
4163
'known failures.'),
3571
Option('load-list', type=str, argname='TESTLISTFILE',
4164
Option('load-list', type=text_type, argname='TESTLISTFILE',
3572
4165
help='Load a test id list from a text file.'),
3573
ListOption('debugflag', type=str, short_name='E',
4166
ListOption('debugflag', type=text_type, short_name='E',
3574
4167
help='Turn on a selftest debug flag.'),
3575
ListOption('starting-with', type=str, argname='TESTID',
4168
ListOption('starting-with', type=text_type, argname='TESTID',
3576
4169
param_name='starting_with', short_name='s',
3578
4171
'Load only the tests starting with TESTID.'),
4173
help="By default we disable fsync and fdatasync"
4174
" while running the test suite.")
3580
4176
encoding_type = 'replace'
3586
4182
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4183
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4185
first=False, list_only=False,
3590
4186
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)
4187
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4188
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4190
# During selftest, disallow proxying, as it can cause severe
4191
# performance penalties and is only needed for thread
4192
# safety. The selftest command is assumed to not use threads
4193
# too heavily. The call should be as early as possible, as
4194
# error reporting for past duplicate imports won't have useful
4196
if sys.version_info[0] < 3:
4197
# TODO(jelmer): Disable proxying on Python 3, until it's fixed.
4199
lazy_import.disallow_proxying()
3602
4203
if testspecs_list is not None:
3603
4204
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
4209
from .tests import SubUnitBzrRunnerv1
3609
4210
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
4211
raise errors.BzrCommandError(gettext(
4212
"subunit not available. subunit needs to be installed "
4213
"to use --subunit."))
4214
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3613
4215
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4216
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4217
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4218
# following code can be deleted when it's sufficiently deployed
4219
# -- vila/mgz 20100514
4220
if (sys.platform == "win32"
4221
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4223
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4226
from .tests import SubUnitBzrRunnerv2
4228
raise errors.BzrCommandError(gettext(
4229
"subunit not available. subunit "
4230
"needs to be installed to use --subunit2."))
4231
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3619
4234
self.additional_selftest_args.setdefault(
3620
4235
'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)
4237
raise errors.BzrCommandError(gettext(
4238
"--benchmark is no longer supported from brz 2.2; "
4239
"use bzr-usertest instead"))
4240
test_suite_factory = None
4242
exclude_pattern = None
3629
test_suite_factory = None
4244
exclude_pattern = '(' + '|'.join(exclude) + ')'
4246
self._disable_fsync()
3631
4247
selftest_kwargs = {"verbose": verbose,
3632
4248
"pattern": pattern,
3633
4249
"stop_on_failure": one,
3635
4251
"test_suite_factory": test_suite_factory,
3636
4252
"lsprof_timed": lsprof_timed,
3637
4253
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4254
"matching_tests_first": first,
3640
4255
"list_only": list_only,
3641
4256
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4257
"exclude_pattern": exclude_pattern,
3643
4258
"strict": strict,
3644
4259
"load_list": load_list,
3645
4260
"debug_flags": debugflag,
3646
4261
"starting_with": starting_with
3648
4263
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4265
# Make deprecation warnings visible, unless -Werror is set
4266
cleanup = symbol_versioning.activate_deprecation_warnings(
4269
result = tests.selftest(**selftest_kwargs)
3650
4272
return int(not result)
4274
def _disable_fsync(self):
4275
"""Change the 'os' functionality to not synchronize."""
4276
self._orig_fsync = getattr(os, 'fsync', None)
4277
if self._orig_fsync is not None:
4278
os.fsync = lambda filedes: None
4279
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4280
if self._orig_fdatasync is not None:
4281
os.fdatasync = lambda filedes: None
3653
4284
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4285
__doc__ = """Show version of brz."""
3656
4287
encoding_type = 'replace'
3657
4288
takes_options = [
3709
4338
The source of the merge can be specified either in the form of a branch,
3710
4339
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.
4340
with brz send. If neither is specified, the default is the upstream branch
4341
or the branch most recently merged using --remember. The source of the
4342
merge may also be specified in the form of a path to a file in another
4343
branch: in this case, only the modifications to that file are merged into
4344
the current working tree.
4346
When merging from a branch, by default brz will try to merge in all new
4347
work from the other branch, automatically determining an appropriate base
4348
revision. If this fails, you may need to give an explicit base.
4350
To pick a different ending revision, pass "--revision OTHER". brz will
4351
try to merge in all new work up to and including revision OTHER.
4353
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4354
through OTHER, excluding BASE but including OTHER, will be merged. If this
4355
causes some revisions to be skipped, i.e. if the destination branch does
4356
not already contain revision BASE, such a merge is commonly referred to as
4357
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4358
cherrypicks. The changes look like a normal commit, and the history of the
4359
changes from the other branch is not stored in the commit.
4361
Revision numbers are always relative to the source branch.
3725
4363
Merge will do its best to combine the changes in two branches, but there
3726
4364
are some kinds of problems only a human can fix. When it encounters those,
3727
4365
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.
4366
before you can commit.
4368
Use brz resolve when you have fixed a problem. See also brz conflicts.
4370
If there is no default branch set, the first merge will set it (use
4371
--no-remember to avoid setting it). After that, you can omit the branch
4372
to use the default. To change the default, use --remember. The value will
4373
only be saved if the remote location can be accessed.
3737
4375
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4376
directory, where they can be reviewed (with brz diff), tested, and then
3739
4377
committed to record the result of the merge.
3741
4379
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
4380
--force is given. If --force is given, then the changes from the source
4381
will be merged with the current working tree, including any uncommitted
4382
changes in the tree. The --force option can also be used to create a
3743
4383
merge revision which has more than two parents.
3745
4385
If one would like to merge changes from the working tree of the other
3873
4513
self.sanity_check_merger(merger)
3874
4514
if (merger.base_rev_id == merger.other_rev_id and
3875
4515
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4516
# check if location is a nonexistent file (and not a branch) to
4517
# disambiguate the 'Nothing to do'
4518
if merger.interesting_files:
4519
if not merger.other_tree.has_filename(
4520
merger.interesting_files[0]):
4521
note(gettext("merger: ") + str(merger))
4522
raise errors.PathsDoNotExist([location])
4523
note(gettext('Nothing to do.'))
4525
if pull and not preview:
3879
4526
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4527
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4528
if (merger.base_rev_id == tree.last_revision()):
3882
4529
result = tree.pull(merger.other_branch, False,
3883
4530
merger.other_rev_id)
3884
4531
result.report(self.outf)
3886
4533
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4534
raise errors.BzrCommandError(gettext(
3888
4535
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4536
" (perhaps you would prefer 'brz pull')"))
3891
4538
return self._do_preview(merger)
3892
4539
elif interactive:
3988
4636
if other_revision_id is None:
3989
4637
other_revision_id = _mod_revision.ensure_null(
3990
4638
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):
4639
# Remember where we merge from. We need to remember if:
4640
# - user specify a location (and we don't merge from the parent
4642
# - user ask to remember or there is no previous location set to merge
4643
# from and user didn't ask to *not* remember
4644
if (user_location is not None
4646
or (remember is None
4647
and tree.branch.get_submit_branch() is None)))):
3994
4648
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,
4649
# Merge tags (but don't set them in the master branch yet, the user
4650
# might revert this merge). Commit will propagate them.
4651
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4652
merger = _mod_merge.Merger.from_revision_ids(tree,
3997
4653
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4654
if other_path != '':
3999
4655
allow_pending = False
4162
4818
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4820
Set files in the working tree back to the contents of a previous revision.
4165
4822
Giving a list of files will revert only those files. Otherwise, all files
4166
4823
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4824
working tree basis revision is used. A revert operation affects only the
4825
working tree, not any revision history like the branch and repository or
4826
the working tree basis revision.
4169
4828
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.
4829
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4830
will remove the changes introduced by the second last commit (-2), without
4831
affecting the changes introduced by the last commit (-1). To remove
4832
certain changes on a hunk-by-hunk basis, see the shelve command.
4833
To update the branch to a specific revision or the latest revision and
4834
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.
4837
Uncommitted changes to files that are reverted will be discarded.
4838
Howver, by default, any files that have been manually changed will be
4839
backed up first. (Files changed only by merge are not backed up.) Backup
4840
files have '.~#~' appended to their name, where # is a number.
4178
4842
When you provide files, you can use their current pathname or the pathname
4179
4843
from the target revision. So you can use revert to "undelete" a file by
4293
4956
Determine the missing revisions between this and the branch at the
4294
4957
remembered pull location::
4298
4961
Determine the missing revisions between this and another branch::
4300
bzr missing http://server/branch
4963
brz missing http://server/branch
4302
4965
Determine the missing revisions up to a specific revision on the other
4305
bzr missing -r ..-10
4968
brz missing -r ..-10
4307
4970
Determine the missing revisions up to a specific revision on this
4310
bzr missing --my-revision ..-10
4973
brz missing --my-revision ..-10
4313
4976
_see_also = ['merge', 'pull']
4314
4977
takes_args = ['other_branch?']
4315
4978
takes_options = [
4316
4980
Option('reverse', 'Reverse the order of revisions.'),
4317
4981
Option('mine-only',
4318
4982
'Display changes in the local branch only.'),
4319
Option('this' , 'Same as --mine-only.'),
4983
Option('this', 'Same as --mine-only.'),
4320
4984
Option('theirs-only',
4321
4985
'Display changes in the remote branch only.'),
4322
4986
Option('other', 'Same as --theirs-only.'),
4419
5092
if remote_extra and not mine_only:
4420
5093
if printed_local is True:
4421
5094
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5095
message(ngettext("You are missing %d revision:\n",
5096
"You are missing %d revisions:\n",
5097
len(remote_extra)) %
4423
5098
len(remote_extra))
5099
if remote_branch.supports_tags():
5100
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5101
for revision in iter_log_revisions(remote_extra,
4425
5102
remote_branch.repository,
4427
5105
lf.log_revision(revision)
4428
5106
status_code = 1
4430
5108
if mine_only and not local_extra:
4431
5109
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5110
message(gettext('This branch has no new revisions.\n'))
4433
5111
elif theirs_only and not remote_extra:
4434
5112
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5113
message(gettext('Other branch has no new revisions.\n'))
4436
5114
elif not (mine_only or theirs_only or local_extra or
4438
5116
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5118
message(gettext("Branches are up to date.\n"))
4441
5119
self.cleanup_now()
4442
5120
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)
5121
self.add_cleanup(local_branch.lock_write().unlock)
4445
5122
# handle race conditions - a parent might be set while we run.
4446
5123
if local_branch.get_parent() is None:
4447
5124
local_branch.set_parent(remote_branch.base)
4578
5239
Option('long', help='Show commit date in annotations.'),
4582
5244
encoding_type = 'exact'
4584
5246
@display_command
4585
5247
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5248
show_ids=False, directory=None):
5249
from .annotate import (
4588
5252
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5253
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5254
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5255
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5257
self.add_cleanup(branch.lock_read().unlock)
4596
5258
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5259
self.add_cleanup(tree.lock_read().unlock)
5260
if wt is not None and revision is None:
4600
5261
file_id = wt.path2id(relpath)
4602
5263
file_id = tree.path2id(relpath)
4603
5264
if file_id is None:
4604
5265
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5266
if wt is not None and revision is None:
4607
5267
# If there is a tree and we're not annotating historical
4608
5268
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5269
annotate_file_tree(wt, relpath, self.outf, long, all,
5270
show_ids=show_ids, file_id=file_id)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5272
annotate_file_tree(tree, relpath, self.outf, long, all,
5273
show_ids=show_ids, branch=branch, file_id=file_id)
4616
5276
class cmd_re_sign(Command):
4620
5280
hidden = True # is this right ?
4621
5281
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5282
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5284
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5285
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')
5286
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5287
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)
5288
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5289
b = WorkingTree.open_containing(directory)[0].branch
5290
self.add_cleanup(b.lock_write().unlock)
4632
5291
return self._run(b, revision_id_list, revision)
4634
5293
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5295
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5296
if revision_id_list is not None:
4638
5297
b.repository.start_write_group()
4640
5299
for revision_id in revision_id_list:
5300
revision_id = cache_utf8.encode(revision_id)
4641
5301
b.repository.sign_revision(revision_id, gpg_strategy)
4643
5303
b.repository.abort_write_group()
4694
5354
_see_also = ['checkouts', 'unbind']
4695
5355
takes_args = ['location?']
5356
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5358
def run(self, location=None, directory=u'.'):
5359
b, relpath = Branch.open_containing(directory)
4700
5360
if location is None:
4702
5362
location = b.get_old_bound_location()
4703
5363
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5364
raise errors.BzrCommandError(gettext('No location supplied. '
5365
'This format does not remember old locations.'))
4707
5367
if location is None:
4708
5368
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5369
raise errors.BzrCommandError(
5370
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5372
raise errors.BzrCommandError(
5373
gettext('No location supplied'
5374
' and no previous location known'))
4713
5375
b_other = Branch.open(location)
4715
5377
b.bind(b_other)
4716
5378
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5379
raise errors.BzrCommandError(gettext('These branches have diverged.'
5380
' Try merging, and then bind again.'))
4719
5381
if b.get_config().has_explicit_nickname():
4720
5382
b.nick = b_other.nick
4784
5447
b = control.open_branch()
4786
5449
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5450
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)
5452
self.add_cleanup(b.lock_write().unlock)
5453
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
5456
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5458
from .log import log_formatter, show_log
5459
from .uncommit import uncommit
4798
5461
last_revno, last_rev_id = b.last_revision_info()
4827
5490
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5493
self.outf.write(gettext('Dry-run, pretending to remove'
5494
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5496
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')
5499
if not ui.ui_factory.confirm_action(
5500
gettext(u'Uncommit these revisions'),
5501
'breezy.builtins.uncommit',
5503
self.outf.write(gettext('Canceled\n'))
4840
5506
mutter('Uncommitting from {%s} to {%s}',
4841
5507
last_rev_id, rev_id)
4842
5508
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)
5509
revno=revno, local=local, keep_tags=keep_tags)
5510
self.outf.write(gettext('You can restore the old tip by running:\n'
5511
' brz pull . -r revid:%s\n') % last_rev_id)
4848
5514
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5515
__doc__ = """Break a dead lock.
5517
This command breaks a lock on a repository, branch, working directory or
4851
5520
CAUTION: Locks should only be broken when you are sure that the process
4852
5521
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
5523
You can get information on what locks are open via the 'brz info
4855
5524
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5528
brz break-lock brz+ssh://example.com/brz/foo
5529
brz break-lock --conf ~/.bazaar
4861
5532
takes_args = ['location?']
5535
help='LOCATION is the directory where the config lock is.'),
5537
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5540
def run(self, location=None, config=False, force=False):
4864
5541
if location is None:
4865
5542
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5544
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5546
{'breezy.lockdir.break': True})
5548
conf = _mod_config.LockableConfig(file_name=location)
5551
control, relpath = controldir.ControlDir.open_containing(location)
5553
control.break_lock()
5554
except NotImplementedError:
4873
5558
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5559
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4876
5561
This just prints a line to signal when it is ready, then blocks on stdin.
4894
5579
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5580
RegistryOption('protocol',
4896
5581
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5582
lazy_registry=('breezy.transport', 'transport_server_registry'),
4898
5583
value_switches=True),
5585
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.',
5587
help='Listen for connections on nominated port. Passing 0 as '
5588
'the port number will result in a dynamically allocated '
5589
'port. The default port depends on the protocol.',
5591
custom_help('directory',
5592
help='Serve contents of this directory.'),
4908
5593
Option('allow-writes',
4909
5594
help='By default the server is a readonly server. Supplying '
4910
5595
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5596
'the served directory and below. Note that ``brz serve`` '
4912
5597
'does not perform authentication, so unless some form of '
4913
5598
'external authentication is arranged supplying this '
4914
5599
'option leads to global uncontrolled write access to your '
5602
Option('client-timeout', type=float,
5603
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
5606
def run(self, listen=None, port=None, inet=False, directory=None,
5607
allow_writes=False, protocol=None, client_timeout=None):
5608
from . import transport
4941
5609
if directory is None:
4942
directory = os.getcwd()
5610
directory = osutils.getcwd()
4943
5611
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)
5612
protocol = transport.transport_server_registry.get()
5613
url = transport.location_to_url(directory)
4947
5614
if not allow_writes:
4948
5615
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5616
t = transport.get_transport_from_url(url)
5617
protocol(t, listen, port, inet, client_timeout)
4953
5620
class cmd_join(Command):
4973
5640
def run(self, tree, reference=False):
5641
from breezy.mutabletree import BadReferenceTarget
4974
5642
sub_tree = WorkingTree.open(tree)
4975
5643
parent_dir = osutils.dirname(sub_tree.basedir)
4976
5644
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5645
repo = containing_tree.branch.repository
4978
5646
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5647
raise errors.BzrCommandError(gettext(
4980
5648
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5649
"You can use brz upgrade on the repository.")
4985
5653
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5654
except BadReferenceTarget as e:
4987
5655
# XXX: Would be better to just raise a nicely printable
4988
5656
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5657
raise errors.BzrCommandError(
5658
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5661
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5662
except errors.BadSubsumeSource as e:
5663
raise errors.BzrCommandError(
5664
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5667
class cmd_split(Command):
5055
5724
diff='Normal unified diff.',
5056
5725
plain='No patch, just directive.'),
5057
5726
Option('sign', help='GPG-sign the directive.'), 'revision',
5058
Option('mail-to', type=str,
5727
Option('mail-to', type=text_type,
5059
5728
help='Instead of printing the directive, email to this address.'),
5060
Option('message', type=str, short_name='m',
5729
Option('message', type=text_type, short_name='m',
5061
5730
help='Message to use when committing this merge.')
5064
5733
encoding_type = 'exact'
5066
5735
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
5736
sign=False, revision=None, mail_to=None, message=None,
5738
from .revision import ensure_null, NULL_REVISION
5069
5739
include_patch, include_bundle = {
5070
5740
'plain': (False, False),
5071
5741
'diff': (True, False),
5072
5742
'bundle': (True, True),
5074
branch = Branch.open('.')
5744
branch = Branch.open(directory)
5075
5745
stored_submit_branch = branch.get_submit_branch()
5076
5746
if submit_branch is None:
5077
5747
submit_branch = stored_submit_branch
5208
5885
help='Branch to generate the submission from, '
5209
5886
'rather than the one containing the working directory.',
5210
5887
short_name='f',
5212
5889
Option('output', short_name='o',
5213
5890
help='Write merge directive to this file or directory; '
5214
5891
'use - for stdout.',
5216
5893
Option('strict',
5217
5894
help='Refuse to send if there are uncommitted changes in'
5218
5895
' the working tree, --no-strict disables the check.'),
5219
5896
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5900
Option('body', help='Body for the email.', type=text_type),
5224
5901
RegistryOption('format',
5225
5902
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5903
lazy_registry=('breezy.send', 'format_registry')),
5229
5906
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5907
no_patch=False, revision=None, remember=None, output=None,
5231
5908
format=None, mail_to=None, message=None, body=None,
5232
5909
strict=None, **kwargs):
5233
from bzrlib.send import send
5910
from .send import send
5234
5911
return send(submit_branch, revision, public_branch, remember,
5235
5912
format, no_bundle, no_patch, output,
5236
5913
kwargs.get('from', '.'), mail_to, message, body,
5359
6033
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
6034
self.add_cleanup(branch.lock_write().unlock)
5363
6036
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
6037
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
6038
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
6039
note(gettext('Deleted tag %s.') % tag_name)
5369
6042
if len(revision) != 1:
5370
raise errors.BzrCommandError(
6043
raise errors.BzrCommandError(gettext(
5371
6044
"Tags can only be placed on a single revision, "
5373
6046
revision_id = revision[0].as_revision_id(branch)
5375
6048
revision_id = branch.last_revision()
5376
6049
if tag_name is None:
5377
6050
tag_name = branch.automatic_tag_name(revision_id)
5378
6051
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):
6052
raise errors.BzrCommandError(gettext(
6053
"Please specify a tag name."))
6055
existing_target = branch.tags.lookup_tag(tag_name)
6056
except errors.NoSuchTag:
6057
existing_target = None
6058
if not force and existing_target not in (None, revision_id):
5382
6059
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6060
if existing_target == revision_id:
6061
note(gettext('Tag %s already exists for that revision.') % tag_name)
6063
branch.tags.set_tag(tag_name, revision_id)
6064
if existing_target is None:
6065
note(gettext('Created tag %s.') % tag_name)
6067
note(gettext('Updated tag %s.') % tag_name)
5387
6070
class cmd_tags(Command):
5393
6076
_see_also = ['tag']
5394
6077
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6078
custom_help('directory',
6079
help='Branch whose tags should be displayed.'),
6080
RegistryOption('sort',
5401
6081
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6082
lazy_registry=('breezy.tag', 'tag_sort_methods')
5409
6088
@display_command
6089
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6090
from .tag import tag_sort_methods
5416
6091
branch, relpath = Branch.open_containing(directory)
5418
tags = branch.tags.get_tag_dict().items()
6093
tags = list(viewitems(branch.tags.get_tag_dict()))
5423
self.add_cleanup(branch.unlock)
6097
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]])
6099
# Restrict to the specified range
6100
tags = self._tags_for_range(branch, revision)
6102
sort = tag_sort_methods.get()
5444
6104
if not show_ids:
5445
6105
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6106
for index, (tag, revid) in enumerate(tags):
5457
6119
for tag, revspec in tags:
5458
6120
self.outf.write('%-20s %s\n' % (tag, revspec))
6122
def _tags_for_range(self, branch, revision):
6124
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6125
revid1, revid2 = rev1.rev_id, rev2.rev_id
6126
# _get_revision_range will always set revid2 if it's not specified.
6127
# If revid1 is None, it means we want to start from the branch
6128
# origin which is always a valid ancestor. If revid1 == revid2, the
6129
# ancestry check is useless.
6130
if revid1 and revid1 != revid2:
6131
# FIXME: We really want to use the same graph than
6132
# branch.iter_merge_sorted_revisions below, but this is not
6133
# easily available -- vila 2011-09-23
6134
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6135
# We don't want to output anything in this case...
6137
# only show revisions between revid1 and revid2 (inclusive)
6138
tagged_revids = branch.tags.get_reverse_tag_dict()
6140
for r in branch.iter_merge_sorted_revisions(
6141
start_revision_id=revid2, stop_revision_id=revid1,
6142
stop_rule='include'):
6143
revid_tags = tagged_revids.get(r[0], None)
6145
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6149
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6150
__doc__ = """Reconfigure the type of a brz directory.
5464
6152
A target configuration must be specified.
5476
6164
takes_args = ['location?']
5477
6165
takes_options = [
5478
6166
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6169
help='The relation between branch and tree.',
5482
6170
value_switches=True, enum_switch=False,
5483
6171
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6172
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6173
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6174
lightweight_checkout='Reconfigure to be a lightweight'
5487
6175
' checkout (with no local history).',
6177
RegistryOption.from_kwargs(
6179
title='Repository type',
6180
help='Location fo the repository.',
6181
value_switches=True, enum_switch=False,
5488
6182
standalone='Reconfigure to be a standalone branch '
5489
6183
'(i.e. stop using shared repository).',
5490
6184
use_shared='Reconfigure to use a shared repository.',
6186
RegistryOption.from_kwargs(
6188
title='Trees in Repository',
6189
help='Whether new branches in the repository have trees.',
6190
value_switches=True, enum_switch=False,
5491
6191
with_trees='Reconfigure repository to create '
5492
6192
'working trees on branches by default.',
5493
6193
with_no_trees='Reconfigure repository to not create '
5494
6194
'working trees on branches by default.'
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
6196
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5497
6197
Option('force',
5498
6198
help='Perform reconfiguration even if local changes'
5499
6199
' will be lost.'),
5500
6200
Option('stacked-on',
5501
6201
help='Reconfigure a branch to be stacked on another branch.',
5504
6204
Option('unstacked',
5505
6205
help='Reconfigure a branch to be unstacked. This '
5520
6220
# At the moment you can use --stacked-on and a different
5521
6221
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6223
if (tree_type is None and
6224
repository_type is None and
6225
repository_trees is None):
5524
6226
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6229
raise errors.BzrCommandError(gettext('No target configuration '
6231
reconfiguration = None
6232
if tree_type == 'branch':
5530
6233
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6234
elif tree_type == 'tree':
5532
6235
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6236
elif tree_type == 'checkout':
5534
6237
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6238
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6239
elif tree_type == 'lightweight-checkout':
5537
6240
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6241
directory, bind_to)
5539
elif target_type == 'use-shared':
6243
reconfiguration.apply(force)
6244
reconfiguration = None
6245
if repository_type == 'use-shared':
5540
6246
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6247
elif repository_type == 'standalone':
5542
6248
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6250
reconfiguration.apply(force)
6251
reconfiguration = None
6252
if repository_trees == 'with-trees':
5544
6253
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6254
directory, True)
5546
elif target_type == 'with-no-trees':
6255
elif repository_trees == 'with-no-trees':
5547
6256
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6257
directory, False)
5549
reconfiguration.apply(force)
6259
reconfiguration.apply(force)
6260
reconfiguration = None
5552
6263
class cmd_switch(Command):
5575
6286
takes_args = ['to_location?']
5576
takes_options = [Option('force',
6287
takes_options = ['directory',
5577
6289
help='Switch even if local commits will be lost.'),
5579
6291
Option('create-branch', short_name='b',
5580
6292
help='Create the target branch from this one before'
5581
6293
' switching to it.'),
6295
help='Store and restore uncommitted changes in the'
5584
6299
def run(self, to_location=None, force=False, create_branch=False,
5586
from bzrlib import switch
6300
revision=None, directory=u'.', store=False):
6301
from . import switch
6302
tree_location = directory
5588
6303
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6304
possible_transports = []
6305
control_dir = controldir.ControlDir.open_containing(tree_location,
6306
possible_transports=possible_transports)[0]
5590
6307
if to_location is None:
5591
6308
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6309
raise errors.BzrCommandError(gettext('You must supply either a'
6310
' revision or a location'))
6311
to_location = tree_location
5596
branch = control_dir.open_branch()
6313
branch = control_dir.open_branch(
6314
possible_transports=possible_transports)
5597
6315
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6316
except errors.NotBranchError:
5600
6318
had_explicit_nick = False
5601
6319
if create_branch:
5602
6320
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()
6321
raise errors.BzrCommandError(
6322
gettext('cannot create branch without source branch'))
6323
to_location = lookup_new_sibling_branch(control_dir, to_location,
6324
possible_transports=possible_transports)
6325
to_branch = branch.controldir.sprout(to_location,
6326
possible_transports=possible_transports,
6327
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6330
to_branch = Branch.open(to_location,
6331
possible_transports=possible_transports)
5617
6332
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6333
to_branch = open_sibling_branch(control_dir, to_location,
6334
possible_transports=possible_transports)
5621
6335
if revision is not None:
5622
6336
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6337
switch.switch(control_dir, to_branch, force, revision_id=revision,
6338
store_uncommitted=store)
5624
6339
if had_explicit_nick:
5625
6340
branch = control_dir.open_branch() #get the new branch!
5626
6341
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6342
note(gettext('Switched to branch: %s'),
5628
6343
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
6347
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6434
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6436
current_view, view_dict = tree.views.get_view_info()
5737
6437
if name is None:
5738
6438
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6441
raise errors.BzrCommandError(gettext(
6442
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6444
raise errors.BzrCommandError(gettext(
6445
"Both --delete and --switch specified"))
5747
6447
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6448
self.outf.write(gettext("Deleted all views.\n"))
5749
6449
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6450
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6452
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6453
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6456
raise errors.BzrCommandError(gettext(
6457
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6459
raise errors.BzrCommandError(gettext(
6460
"Both --switch and --all specified"))
5761
6461
elif switch == 'off':
5762
6462
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6463
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6464
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6465
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6467
tree.views.set_view_info(switch, view_dict)
5768
6468
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6469
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6472
self.outf.write(gettext('Views defined:\n'))
5773
6473
for view in sorted(view_dict):
5774
6474
if view == current_view:
5778
6478
view_str = views.view_display_str(view_dict[view])
5779
6479
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6481
self.outf.write(gettext('No views defined.\n'))
5782
6482
elif file_list:
5783
6483
if name is None:
5784
6484
# No name given and no current view set
5786
6486
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6487
raise errors.BzrCommandError(gettext(
6488
"Cannot change the 'off' pseudo view"))
5789
6489
tree.views.set_view(name, sorted(file_list))
5790
6490
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6491
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6493
# list the files
5794
6494
if name is None:
5795
6495
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6496
self.outf.write(gettext('No current view.\n'))
5798
6498
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6499
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6502
class cmd_hooks(Command):
5830
6530
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
6532
brz remove-branch repo/trunk
5836
6536
takes_args = ["location?"]
6538
takes_options = ['directory',
6539
Option('force', help='Remove branch even if it is the active branch.')]
5838
6541
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()
6543
def run(self, directory=None, location=None, force=False):
6544
br = open_nearby_branch(near=directory, location=location)
6545
if not force and br.controldir.has_workingtree():
6547
active_branch = br.controldir.open_branch(name="")
6548
except errors.NotBranchError:
6549
active_branch = None
6550
if (active_branch is not None and
6551
br.control_url == active_branch.control_url):
6552
raise errors.BzrCommandError(
6553
gettext("Branch is active. Use --force to remove it."))
6554
br.controldir.destroy_branch(br.name)
5847
6557
class cmd_shelve(Command):
5848
6558
__doc__ = """Temporarily set aside some changes from the current tree.
5868
6578
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6579
restore the most recently shelved changes.
6581
For complicated changes, it is possible to edit the changes in a separate
6582
editor program to decide what the file remaining in the working copy
6583
should look like. To do this, add the configuration option
6585
change_editor = PROGRAM @new_path @old_path
6587
where @new_path is replaced with the path of the new version of the
6588
file and @old_path is replaced with the path of the old version of
6589
the file. The PROGRAM should save the new file with the desired
6590
contents of the file in the working tree.
5872
6594
takes_args = ['file*']
5874
6596
takes_options = [
5876
6599
Option('all', help='Shelve all changes.'),
5878
6601
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6602
breezy.option.diff_writer_registry,
5880
6603
value_switches=True, enum_switch=False),
5882
6605
Option('list', help='List shelved changes.'),
5883
6606
Option('destroy',
5884
6607
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6609
_see_also = ['unshelve', 'configuration']
5888
6611
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6612
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6614
return self.run_for_list(directory=directory)
6615
from .shelf_ui import Shelver
5893
6616
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6617
writer = breezy.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6619
shelver = Shelver.from_args(writer(self.outf), revision, all,
6620
file_list, message, destroy=destroy, directory=directory)
5967
6692
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'
6694
takes_options = ['directory',
6695
Option('ignored', help='Delete all ignored files.'),
6696
Option('detritus', help='Delete conflict files, merge and revert'
5971
6697
' backups, and failed selftest dirs.'),
5972
6698
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6699
help='Delete files unknown to brz (default).'),
5974
6700
Option('dry-run', help='Show files to delete instead of'
5975
6701
' deleting them.'),
5976
6702
Option('force', help='Do not prompt before deleting.')]
5977
6703
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
6704
force=False, directory=u'.'):
6705
from .clean_tree import clean_tree
5980
6706
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6710
clean_tree(directory, unknown=unknown, ignored=ignored,
6711
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6714
class cmd_reference(Command):
6032
6758
self.outf.write('%s %s\n' % (path, location))
6761
class cmd_export_pot(Command):
6762
__doc__ = """Export command helps and error messages in po format."""
6765
takes_options = [Option('plugin',
6766
help='Export help text from named command '\
6767
'(defaults to all built in commands).',
6769
Option('include-duplicates',
6770
help='Output multiple copies of the same msgid '
6771
'string if it appears more than once.'),
6774
def run(self, plugin=None, include_duplicates=False):
6775
from .export_pot import export_pot
6776
export_pot(self.outf, plugin, include_duplicates)
6779
class cmd_import(Command):
6780
__doc__ = """Import sources from a directory, tarball or zip file
6782
This command will import a directory, tarball or zip file into a bzr
6783
tree, replacing any versioned files already present. If a directory is
6784
specified, it is used as the target. If the directory does not exist, or
6785
is not versioned, it is created.
6787
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6789
If the tarball or zip has a single root directory, that directory is
6790
stripped when extracting the tarball. This is not done for directories.
6793
takes_args = ['source', 'tree?']
6795
def run(self, source, tree=None):
6796
from .upstream_import import do_import
6797
do_import(source, tree)
6800
class cmd_link_tree(Command):
6801
__doc__ = """Hardlink matching files to another tree.
6803
Only files with identical content and execute bit will be linked.
6806
takes_args = ['location']
6808
def run(self, location):
6809
from .transform import link_tree
6810
target_tree = WorkingTree.open_containing(".")[0]
6811
source_tree = WorkingTree.open(location)
6812
target_tree.lock_write()
6814
source_tree.lock_read()
6816
link_tree(target_tree, source_tree)
6818
source_tree.unlock()
6820
target_tree.unlock()
6823
class cmd_fetch_ghosts(Command):
6824
__doc__ = """Attempt to retrieve ghosts from another branch.
6826
If the other branch is not supplied, the last-pulled branch is used.
6830
aliases = ['fetch-missing']
6831
takes_args = ['branch?']
6832
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6834
def run(self, branch=None, no_fix=False):
6835
from .fetch_ghosts import GhostFetcher
6836
installed, failed = GhostFetcher.from_cmdline(branch).run()
6837
if len(installed) > 0:
6838
self.outf.write("Installed:\n")
6839
for rev in installed:
6840
self.outf.write(rev + "\n")
6842
self.outf.write("Still missing:\n")
6844
self.outf.write(rev + "\n")
6845
if not no_fix and len(installed) > 0:
6846
cmd_reconcile().run(".")
6035
6849
def _register_lazy_builtins():
6036
6850
# register lazy builtins from other modules; called at startup and should
6037
6851
# be only called once.
6038
6852
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'),
6853
('cmd_bisect', [], 'breezy.bisect'),
6854
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6855
('cmd_config', [], 'breezy.config'),
6856
('cmd_dpush', [], 'breezy.foreign'),
6857
('cmd_version_info', [], 'breezy.cmd_version_info'),
6858
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6859
('cmd_conflicts', [], 'breezy.conflicts'),
6860
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6861
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6862
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6863
('cmd_test_script', [], 'breezy.cmd_test_script'),
6046
6865
builtin_command_registry.register_lazy(name, aliases, module_name)