46
52
revision as _mod_revision,
55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
61
from breezy.branch import Branch
62
from breezy.conflicts import ConflictList
63
from breezy.transport import memory
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
69
from .commands import (
65
71
builtin_command_registry,
68
from bzrlib.option import (
73
79
_parse_revision_str,
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
81
from .revisionspec import (
91
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
94
def _get_branch_location(control_dir, possible_transports=None):
95
"""Return location of branch for this control dir."""
97
target = control_dir.get_branch_reference()
98
except errors.NotBranchError:
99
return control_dir.root_transport.base
100
if target is not None:
102
this_branch = control_dir.open_branch(
103
possible_transports=possible_transports)
104
# This may be a heavy checkout, where we want the master branch
105
master_location = this_branch.get_bound_location()
106
if master_location is not None:
107
return master_location
108
# If not, use a local sibling
109
return this_branch.base
112
def _is_colocated(control_dir, possible_transports=None):
113
"""Check if the branch in control_dir is colocated.
115
:param control_dir: Control directory
116
:return: Tuple with boolean indicating whether the branch is colocated
117
and the full URL to the actual branch
119
# This path is meant to be relative to the existing branch
120
this_url = _get_branch_location(control_dir,
121
possible_transports=possible_transports)
122
# Perhaps the target control dir supports colocated branches?
124
root = controldir.ControlDir.open(this_url,
125
possible_transports=possible_transports)
126
except errors.NotBranchError:
127
return (False, this_url)
130
wt = control_dir.open_workingtree()
131
except (errors.NoWorkingTree, errors.NotLocalUrl):
132
return (False, this_url)
135
root._format.colocated_branches and
136
control_dir.control_url == root.control_url,
140
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
141
"""Lookup the location for a new sibling branch.
143
:param control_dir: Control directory to find sibling branches from
144
:param location: Name of the new branch
145
:return: Full location to the new branch
147
location = directory_service.directories.dereference(location)
148
if '/' not in location and '\\' not in location:
149
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
152
return urlutils.join_segment_parameters(this_url,
153
{"branch": urlutils.escape(location)})
155
return urlutils.join(this_url, '..', urlutils.escape(location))
159
def open_sibling_branch(control_dir, location, possible_transports=None):
160
"""Open a branch, possibly a sibling of another.
162
:param control_dir: Control directory relative to which to lookup the
164
:param location: Location to look up
165
:return: branch to open
168
# Perhaps it's a colocated branch?
169
return control_dir.open_branch(location,
170
possible_transports=possible_transports)
171
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
172
this_url = _get_branch_location(control_dir)
175
this_url, '..', urlutils.escape(location)))
178
def open_nearby_branch(near=None, location=None, possible_transports=None):
179
"""Open a nearby branch.
181
:param near: Optional location of container from which to open branch
182
:param location: Location of the branch
183
:return: Branch instance
189
return Branch.open(location,
190
possible_transports=possible_transports)
191
except errors.NotBranchError:
193
cdir = controldir.ControlDir.open(near,
194
possible_transports=possible_transports)
195
return open_sibling_branch(cdir, location,
196
possible_transports=possible_transports)
199
def iter_sibling_branches(control_dir, possible_transports=None):
200
"""Iterate over the siblings of a branch.
202
:param control_dir: Control directory for which to look up the siblings
203
:return: Iterator over tuples with branch name and branch object
207
reference = control_dir.get_branch_reference()
208
except errors.NotBranchError:
209
# There is no active branch, just return the colocated branches.
210
for name, branch in viewitems(control_dir.get_branches()):
213
if reference is not None:
214
ref_branch = Branch.open(reference,
215
possible_transports=possible_transports)
218
if ref_branch is None or ref_branch.name:
219
if ref_branch is not None:
220
control_dir = ref_branch.controldir
221
for name, branch in viewitems(control_dir.get_branches()):
224
repo = ref_branch.controldir.find_repository()
225
for branch in repo.find_branches(using=True):
226
name = urlutils.relative_url(repo.user_url,
227
branch.user_url).rstrip("/")
88
231
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
223
296
def _get_view_info_for_change_reporter(tree):
224
297
"""Get the view information from a tree for change reporting."""
342
433
takes_args = ['revision_id?']
343
takes_options = ['revision']
434
takes_options = ['directory', 'revision']
344
435
# cat-revision is more for frontends so should be exact
345
436
encoding = 'strict'
347
438
def print_revision(self, revisions, revid):
348
439
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
440
record = next(stream)
350
441
if record.storage_kind == 'absent':
351
442
raise errors.NoSuchRevision(revisions, revid)
352
443
revtext = record.get_bytes_as('fulltext')
353
444
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
447
def run(self, revision_id=None, revision=None, directory=u'.'):
357
448
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
449
raise errors.BzrCommandError(gettext('You can only supply one of'
450
' revision_id or --revision'))
360
451
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
452
raise errors.BzrCommandError(gettext('You must supply either'
453
' --revision or a revision_id'))
455
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
457
revisions = b.repository.revisions
366
458
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
459
raise errors.BzrCommandError(gettext('Repository %r does not support '
460
'access to raw revision texts'))
370
b.repository.lock_read()
462
with b.repository.lock_read():
372
463
# TODO: jam 20060112 should cat-revision always output utf-8?
373
464
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
465
revision_id = cache_utf8.encode(revision_id)
376
467
self.print_revision(revisions, revision_id)
377
468
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
469
msg = gettext("The repository {0} contains no revision {1}.").format(
379
470
b.repository.base, revision_id)
380
471
raise errors.BzrCommandError(msg)
381
472
elif revision is not None:
382
473
for rev in revision:
384
475
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
476
gettext('You cannot specify a NULL revision.'))
386
477
rev_id = rev.as_revision_id(b)
387
478
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
395
PATH is a btree index file, it can be any URL. This includes things like
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
398
By default, the tuples stored in the index file will be displayed. With
399
--raw, we will uncompress the pages, but otherwise display the raw bytes
403
# TODO: Do we want to dump the internal nodes as well?
404
# TODO: It would be nice to be able to dump the un-parsed information,
405
# rather than only going through iter_all_entries. However, this is
406
# good enough for a start
408
encoding_type = 'exact'
409
takes_args = ['path']
410
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
411
' rather than the parsed tuples.'),
414
def run(self, path, raw=False):
415
dirname, basename = osutils.split(path)
416
t = transport.get_transport(dirname)
418
self._dump_raw_bytes(t, basename)
420
self._dump_entries(t, basename)
422
def _get_index_and_bytes(self, trans, basename):
423
"""Create a BTreeGraphIndex and raw bytes."""
424
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
427
bt._size = len(bytes)
430
def _dump_raw_bytes(self, trans, basename):
433
# We need to parse at least the root node.
434
# This is because the first page of every row starts with an
435
# uncompressed header.
436
bt, bytes = self._get_index_and_bytes(trans, basename)
437
for page_idx, page_start in enumerate(xrange(0, len(bytes),
438
btree_index._PAGE_SIZE)):
439
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
440
page_bytes = bytes[page_start:page_end]
442
self.outf.write('Root node:\n')
443
header_end, data = bt._parse_header_from_bytes(page_bytes)
444
self.outf.write(page_bytes[:header_end])
446
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
451
def _dump_entries(self, trans, basename):
453
st = trans.stat(basename)
454
except errors.TransportNotPossible:
455
# We can't stat, so we'll fake it because we have to do the 'get()'
457
bt, _ = self._get_index_and_bytes(trans, basename)
459
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
460
for node in bt.iter_all_entries():
461
# Node is made up of:
462
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
473
481
class cmd_remove_tree(Command):
491
499
location_list=['.']
493
501
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
502
d = controldir.ControlDir.open(location)
497
505
working = d.open_workingtree()
498
506
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
507
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
508
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
509
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
510
" of a remote path"))
504
512
if (working.has_changes()):
505
513
raise errors.UncommittedChanges(working)
514
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
507
517
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
518
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
519
" from a lightweight checkout"))
511
521
d.destroy_workingtree()
524
class cmd_repair_workingtree(Command):
525
__doc__ = """Reset the working tree state file.
527
This is not meant to be used normally, but more as a way to recover from
528
filesystem corruption, etc. This rebuilds the working inventory back to a
529
'known good' state. Any new modifications (adding a file, renaming, etc)
530
will be lost, though modified files will still be detected as such.
532
Most users will want something more like "brz revert" or "brz update"
533
unless the state file has become corrupted.
535
By default this attempts to recover the current state by looking at the
536
headers of the state file. If the state file is too corrupted to even do
537
that, you can supply --revision to force the state of the tree.
540
takes_options = ['revision', 'directory',
542
help='Reset the tree even if it doesn\'t appear to be'
547
def run(self, revision=None, directory='.', force=False):
548
tree, _ = WorkingTree.open_containing(directory)
549
self.add_cleanup(tree.lock_tree_write().unlock)
553
except errors.BzrError:
554
pass # There seems to be a real error here, so we'll reset
557
raise errors.BzrCommandError(gettext(
558
'The tree does not appear to be corrupt. You probably'
559
' want "brz revert" instead. Use "--force" if you are'
560
' sure you want to reset the working tree.'))
564
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
566
tree.reset_state(revision_ids)
567
except errors.BzrError as e:
568
if revision_ids is None:
569
extra = (gettext(', the header appears corrupt, try passing -r -1'
570
' to set the state to the last commit'))
573
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
576
class cmd_revno(Command):
515
577
__doc__ = """Show current revision number.
520
582
_see_also = ['info']
521
583
takes_args = ['location?']
522
584
takes_options = [
523
Option('tree', help='Show revno of working tree'),
585
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
590
def run(self, tree=False, location=u'.', revision=None):
591
if revision is not None and tree:
592
raise errors.BzrCommandError(gettext("--tree and --revision can "
593
"not be used together"))
530
597
wt = WorkingTree.open_containing(location)[0]
531
598
self.add_cleanup(wt.lock_read().unlock)
532
599
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
600
raise errors.NoWorkingTree(location)
534
602
revid = wt.last_revision()
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
539
revno = ".".join(str(n) for n in revno_t)
541
604
b = Branch.open_containing(location)[0]
542
605
self.add_cleanup(b.lock_read().unlock)
607
if len(revision) != 1:
608
raise errors.BzrCommandError(gettext(
609
"Revision numbers only make sense for single "
610
"revisions, not ranges"))
611
revid = revision[0].as_revision_id(b)
613
revid = b.last_revision()
615
revno_t = b.revision_id_to_dotted_revno(revid)
616
except errors.NoSuchRevision:
618
revno = ".".join(str(n) for n in revno_t)
544
619
self.cleanup_now()
545
self.outf.write(str(revno) + '\n')
620
self.outf.write(revno + '\n')
548
623
class cmd_revision_info(Command):
786
893
self.outf.write('\n')
896
class cmd_cp(Command):
897
__doc__ = """Copy a file.
900
brz cp OLDNAME NEWNAME
902
brz cp SOURCE... DESTINATION
904
If the last argument is a versioned directory, all the other names
905
are copied into it. Otherwise, there must be exactly two arguments
906
and the file is copied to a new name.
908
Files cannot be copied between branches. Only files can be copied
912
takes_args = ['names*']
915
encoding_type = 'replace'
917
def run(self, names_list):
919
if names_list is None:
921
if len(names_list) < 2:
922
raise errors.BzrCommandError(gettext("missing file argument"))
923
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
924
for file_name in rel_names[0:-1]:
926
raise errors.BzrCommandError(gettext("can not copy root of branch"))
927
self.add_cleanup(tree.lock_tree_write().unlock)
928
into_existing = osutils.isdir(names_list[-1])
929
if not into_existing:
931
(src, dst) = rel_names
933
raise errors.BzrCommandError(gettext('to copy multiple files the'
934
' destination must be a versioned'
938
pairs = [(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
939
for n in rel_names[:-1]]
941
for src, dst in pairs:
943
src_kind = tree.stored_kind(src)
944
except errors.NoSuchFile:
945
raise errors.BzrCommandError(
946
gettext('Could not copy %s => %s: %s is not versioned.')
949
raise errors.BzrCommandError(
950
gettext('Could not copy %s => %s . %s is not versioned\.'
952
if src_kind == 'directory':
953
raise errors.BzrCommandError(
954
gettext('Could not copy %s => %s . %s is a directory.'
956
dst_parent = osutils.split(dst)[0]
959
dst_parent_kind = tree.stored_kind(dst_parent)
960
except errors.NoSuchFile:
961
raise errors.BzrCommandError(
962
gettext('Could not copy %s => %s: %s is not versioned.')
963
% (src, dst, dst_parent))
964
if dst_parent_kind != 'directory':
965
raise errors.BzrCommandError(
966
gettext('Could not copy to %s: %s is not a directory.')
967
% (dst_parent, dst_parent))
969
tree.copy_one(src, dst)
789
972
class cmd_mv(Command):
790
973
__doc__ = """Move or rename a file.
793
bzr mv OLDNAME NEWNAME
976
brz mv OLDNAME NEWNAME
795
bzr mv SOURCE... DESTINATION
978
brz mv SOURCE... DESTINATION
797
980
If the last argument is a versioned directory, all the other names
798
981
are moved into it. Otherwise, there must be exactly two arguments
821
1004
return self.run_auto(names_list, after, dry_run)
823
raise errors.BzrCommandError('--dry-run requires --auto.')
1006
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
824
1007
if names_list is None:
826
1009
if len(names_list) < 2:
827
raise errors.BzrCommandError("missing file argument")
828
tree, rel_names = tree_files(names_list, canonicalize=False)
1010
raise errors.BzrCommandError(gettext("missing file argument"))
1011
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1012
for file_name in rel_names[0:-1]:
1014
raise errors.BzrCommandError(gettext("can not move root of branch"))
829
1015
self.add_cleanup(tree.lock_tree_write().unlock)
830
1016
self._run(tree, names_list, rel_names, after)
832
1018
def run_auto(self, names_list, after, dry_run):
833
1019
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
1020
raise errors.BzrCommandError(gettext('Only one path may be specified to'
837
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
1023
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1025
work_tree, file_list = WorkingTree.open_containing_paths(
1026
names_list, default_directory='.')
840
1027
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1028
rename_map.RenameMap.guess_renames(
1029
work_tree.basis_tree(), work_tree, dry_run)
843
1031
def _run(self, tree, names_list, rel_names, after):
844
1032
into_existing = osutils.isdir(names_list[-1])
937
1124
match the remote one, use pull --overwrite. This will work even if the two
938
1125
branches have diverged.
940
If there is no default location set, the first pull will set it. After
941
that, you can omit the location to use the default. To change the
942
default, use --remember. The value will only be saved if the remote
943
location can be accessed.
1127
If there is no default location set, the first pull will set it (use
1128
--no-remember to avoid setting it). After that, you can omit the
1129
location to use the default. To change the default, use --remember. The
1130
value will only be saved if the remote location can be accessed.
1132
The --verbose option will display the revisions pulled using the log_format
1133
configuration option. You can use a different format by overriding it with
1134
-Olog_format=<other_format>.
945
1136
Note: The location can be specified either in the form of a branch,
946
1137
or in the form of a path to a file containing a merge directive generated
950
1141
_see_also = ['push', 'update', 'status-flags', 'send']
951
1142
takes_options = ['remember', 'overwrite', 'revision',
952
1143
custom_help('verbose',
953
1144
help='Show logs of pulled revisions.'),
1145
custom_help('directory',
955
1146
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
1147
'rather than the one containing the working directory.'),
961
1149
help="Perform a local pull in a bound "
962
1150
"branch. Local pulls are not applied to "
963
1151
"the master branch."
1154
help="Show base revision text in conflicts."),
1155
Option('overwrite-tags',
1156
help="Overwrite tags only."),
966
1158
takes_args = ['location?']
967
1159
encoding_type = 'replace'
969
def run(self, location=None, remember=False, overwrite=False,
1161
def run(self, location=None, remember=None, overwrite=False,
970
1162
revision=None, verbose=False,
971
directory=None, local=False):
1163
directory=None, local=False,
1164
show_base=False, overwrite_tags=False):
1167
overwrite = ["history", "tags"]
1168
elif overwrite_tags:
1169
overwrite = ["tags"]
972
1172
# FIXME: too much stuff is in the command class
973
1173
revision_id = None
974
1174
mergeable = None
1058
1267
considered diverged if the destination branch's most recent commit is one
1059
1268
that has not been merged (directly or indirectly) by the source branch.
1061
If branches have diverged, you can use 'bzr push --overwrite' to replace
1270
If branches have diverged, you can use 'brz push --overwrite' to replace
1062
1271
the other branch completely, discarding its unmerged changes.
1064
1273
If you want to ensure you have the different changes in the other branch,
1065
do a merge (see bzr help merge) from the other branch, and commit that.
1274
do a merge (see brz help merge) from the other branch, and commit that.
1066
1275
After that you will be able to do a push without '--overwrite'.
1068
If there is no default push location set, the first push will set it.
1069
After that, you can omit the location to use the default. To change the
1070
default, use --remember. The value will only be saved if the remote
1071
location can be accessed.
1277
If there is no default push location set, the first push will set it (use
1278
--no-remember to avoid setting it). After that, you can omit the
1279
location to use the default. To change the default, use --remember. The
1280
value will only be saved if the remote location can be accessed.
1282
The --verbose option will display the revisions pushed using the log_format
1283
configuration option. You can use a different format by overriding it with
1284
-Olog_format=<other_format>.
1074
1287
_see_also = ['pull', 'update', 'working-trees']
1094
1304
help='Create a stacked branch that refers to another branch '
1095
1305
'for the commit history. Only the work not present in the '
1096
1306
'referenced branch is included in the branch created.',
1098
1308
Option('strict',
1099
1309
help='Refuse to push if there are uncommitted changes in'
1100
1310
' the working tree, --no-strict disables the check.'),
1312
help="Don't populate the working tree, even for protocols"
1313
" that support it."),
1314
Option('overwrite-tags',
1315
help="Overwrite tags only."),
1316
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1317
"that can't be represented in the target.")
1102
1319
takes_args = ['location?']
1103
1320
encoding_type = 'replace'
1105
def run(self, location=None, remember=False, overwrite=False,
1322
def run(self, location=None, remember=None, overwrite=False,
1106
1323
create_prefix=False, verbose=False, revision=None,
1107
1324
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1109
from bzrlib.push import _show_push_branch
1325
stacked=False, strict=None, no_tree=False,
1326
overwrite_tags=False, lossy=False):
1327
from .push import _show_push_branch
1330
overwrite = ["history", "tags"]
1331
elif overwrite_tags:
1332
overwrite = ["tags"]
1111
1336
if directory is None:
1112
1337
directory = '.'
1113
1338
# Get the source branch
1114
1339
(tree, br_from,
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1340
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1116
1341
# Get the tip's revision_id
1117
1342
revision = _get_one_revision('push', revision)
1118
1343
if revision is not None:
1139
1364
# error by the feedback given to them. RBC 20080227.
1140
1365
stacked_on = parent_url
1141
1366
if not stacked_on:
1142
raise errors.BzrCommandError(
1143
"Could not determine branch to refer to.")
1367
raise errors.BzrCommandError(gettext(
1368
"Could not determine branch to refer to."))
1145
1370
# Get the destination location
1146
1371
if location is None:
1147
1372
stored_loc = br_from.get_push_location()
1148
1373
if stored_loc is None:
1149
raise errors.BzrCommandError(
1150
"No push location known or specified.")
1374
parent_loc = br_from.get_parent()
1376
raise errors.BzrCommandError(gettext(
1377
"No push location known or specified. To push to the "
1378
"parent branch (at %s), use 'brz push :parent'." %
1379
urlutils.unescape_for_display(parent_loc,
1380
self.outf.encoding)))
1382
raise errors.BzrCommandError(gettext(
1383
"No push location known or specified."))
1152
1385
display_url = urlutils.unescape_for_display(stored_loc,
1153
1386
self.outf.encoding)
1154
self.outf.write("Using saved push location: %s\n" % display_url)
1387
note(gettext("Using saved push location: %s") % display_url)
1155
1388
location = stored_loc
1157
1390
_show_push_branch(br_from, revision_id, location, self.outf,
1158
1391
verbose=verbose, overwrite=overwrite, remember=remember,
1159
1392
stacked_on=stacked_on, create_prefix=create_prefix,
1160
use_existing_dir=use_existing_dir)
1393
use_existing_dir=use_existing_dir, no_tree=no_tree,
1163
1397
class cmd_branch(Command):
1198
1434
help="Bind new branch to from location."),
1200
aliases = ['get', 'clone']
1202
1437
def run(self, from_location, to_location=None, revision=None,
1203
1438
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1206
from bzrlib.tag import _merge_tags_if_possible
1207
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1439
use_existing_dir=False, switch=False, bind=False,
1441
from breezy import switch as _mod_switch
1442
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1444
if not (hardlink or files_from):
1445
# accelerator_tree is usually slower because you have to read N
1446
# files (no readahead, lots of seeks, etc), but allow the user to
1447
# explicitly request it
1448
accelerator_tree = None
1449
if files_from is not None and files_from != from_location:
1450
accelerator_tree = WorkingTree.open(files_from)
1209
1451
revision = _get_one_revision('branch', revision)
1210
1452
self.add_cleanup(br_from.lock_read().unlock)
1211
1453
if revision is not None:
1217
1459
revision_id = br_from.last_revision()
1218
1460
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1461
to_location = getattr(br_from, "name", None)
1463
to_location = urlutils.derive_to_location(from_location)
1220
1464
to_transport = transport.get_transport(to_location)
1222
1466
to_transport.mkdir('.')
1223
1467
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1469
to_dir = controldir.ControlDir.open_from_transport(
1471
except errors.NotBranchError:
1472
if not use_existing_dir:
1473
raise errors.BzrCommandError(gettext('Target directory "%s" '
1474
'already exists.') % to_location)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1479
to_dir.open_branch()
1230
1480
except errors.NotBranchError:
1233
1483
raise errors.AlreadyBranchError(to_location)
1234
1484
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1485
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1491
# preserve whatever source format we have.
1492
to_dir = br_from.controldir.sprout(
1493
to_transport.base, revision_id,
1494
possible_transports=[to_transport],
1495
accelerator_tree=accelerator_tree, hardlink=hardlink,
1496
stacked=stacked, force_new_repo=standalone,
1497
create_tree_if_local=not no_tree, source_branch=br_from)
1498
branch = to_dir.open_branch(
1499
possible_transports=[
1500
br_from.controldir.root_transport, to_transport])
1501
except errors.NoSuchRevision:
1502
to_transport.delete_tree('.')
1503
msg = gettext("The branch {0} has no revision {1}.").format(
1504
from_location, revision)
1505
raise errors.BzrCommandError(msg)
1508
to_repo = to_dir.open_repository()
1509
except errors.NoRepositoryPresent:
1510
to_repo = to_dir.create_repository()
1511
to_repo.fetch(br_from.repository, revision_id=revision_id)
1512
branch = br_from.sprout(to_dir, revision_id=revision_id)
1513
br_from.tags.merge_to(branch.tags)
1253
1515
# If the source branch is stacked, the new branch may
1254
1516
# be stacked whether we asked for that explicitly or not.
1255
1517
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1519
note(gettext('Created new stacked branch referring to %s.') %
1258
1520
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1521
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1522
errors.UnstackableRepositoryFormat) as e:
1523
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1263
1525
# Bind to the parent
1264
1526
parent_branch = Branch.open(from_location)
1265
1527
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1528
note(gettext('New branch bound to %s') % from_location)
1268
1530
# Switch to the new branch
1269
1531
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1532
_mod_switch.switch(wt.controldir, branch)
1533
note(gettext('Switched to branch: %s'),
1272
1534
urlutils.unescape_for_display(branch.base, 'utf-8'))
1537
class cmd_branches(Command):
1538
__doc__ = """List the branches available at the current location.
1540
This command will print the names of all the branches at the current
1544
takes_args = ['location?']
1546
Option('recursive', short_name='R',
1547
help='Recursively scan for branches rather than '
1548
'just looking in the specified location.')]
1550
def run(self, location=".", recursive=False):
1552
t = transport.get_transport(location)
1553
if not t.listable():
1554
raise errors.BzrCommandError(
1555
"Can't scan this type of location.")
1556
for b in controldir.ControlDir.find_branches(t):
1557
self.outf.write("%s\n" % urlutils.unescape_for_display(
1558
urlutils.relative_url(t.base, b.base),
1559
self.outf.encoding).rstrip("/"))
1561
dir = controldir.ControlDir.open_containing(location)[0]
1563
active_branch = dir.open_branch(name="")
1564
except errors.NotBranchError:
1565
active_branch = None
1567
for name, branch in iter_sibling_branches(dir):
1570
active = (active_branch is not None and
1571
active_branch.user_url == branch.user_url)
1572
names[name] = active
1573
# Only mention the current branch explicitly if it's not
1574
# one of the colocated branches
1575
if not any(viewvalues(names)) and active_branch is not None:
1576
self.outf.write("* %s\n" % gettext("(default)"))
1577
for name in sorted(names):
1578
active = names[name]
1583
self.outf.write("%s %s\n" % (
1584
prefix, name.encode(self.outf.encoding)))
1275
1587
class cmd_checkout(Command):
1276
1588
__doc__ = """Create a new checkout of an existing branch.
1374
1689
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1377
This will perform a merge into the working tree, and may generate
1378
conflicts. If you have any local changes, you will still
1379
need to commit them after the update for the update to be complete.
1381
If you want to discard your local changes, you can just do a
1382
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1690
__doc__ = """Update a working tree to a new revision.
1692
This will perform a merge of the destination revision (the tip of the
1693
branch, or the specified revision) into the working tree, and then make
1694
that revision the basis revision for the working tree.
1696
You can use this to visit an older revision, or to update a working tree
1697
that is out of date from its branch.
1699
If there are any uncommitted changes in the tree, they will be carried
1700
across and remain as uncommitted changes after the update. To discard
1701
these changes, use 'brz revert'. The uncommitted changes may conflict
1702
with the changes brought in by the change in basis revision.
1704
If the tree's branch is bound to a master branch, brz will also update
1385
1705
the branch from the master.
1707
You cannot update just a single file or directory, because each Bazaar
1708
working tree has just a single basis revision. If you want to restore a
1709
file that has been removed locally, use 'brz revert' instead of 'brz
1710
update'. If you want to restore a file to its state in a previous
1711
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1712
out the old content of that file to a new location.
1714
The 'dir' argument, if given, must be the location of the root of a
1715
working tree to update. By default, the working tree that contains the
1716
current working directory is used.
1388
1719
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1720
takes_args = ['dir?']
1390
takes_options = ['revision']
1721
takes_options = ['revision',
1723
help="Show base revision text in conflicts."),
1391
1725
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1727
def run(self, dir=None, revision=None, show_base=None):
1394
1728
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1397
tree = WorkingTree.open_containing(dir)[0]
1729
raise errors.BzrCommandError(gettext(
1730
"brz update --revision takes exactly one revision"))
1732
tree = WorkingTree.open_containing('.')[0]
1734
tree, relpath = WorkingTree.open_containing(dir)
1737
raise errors.BzrCommandError(gettext(
1738
"brz update can only update a whole tree, "
1739
"not a file or subdirectory"))
1398
1740
branch = tree.branch
1399
1741
possible_transports = []
1400
1742
master = branch.get_master_branch(
1436
1778
change_reporter,
1437
1779
possible_transports=possible_transports,
1438
1780
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1782
show_base=show_base)
1783
except errors.NoSuchRevision as e:
1784
raise errors.BzrCommandError(gettext(
1442
1785
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1786
"brz update --revision only works"
1787
" for a revision in the branch history")
1445
1788
% (e.revision))
1446
1789
revno = tree.branch.revision_id_to_dotted_revno(
1447
1790
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1791
note(gettext('Updated to revision {0} of branch {1}').format(
1792
'.'.join(map(str, revno)), branch_location))
1450
1793
parent_ids = tree.get_parent_ids()
1451
1794
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1795
note(gettext('Your local commits will now show as pending merges with '
1796
"'brz status', and can be committed with 'brz commit'."))
1454
1797
if conflicts != 0:
1515
1859
RegistryOption.from_kwargs('file-deletion-strategy',
1516
1860
'The file deletion mode to be used.',
1517
1861
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
safe='Only delete files if they can be'
1519
' safely recovered (default).',
1520
keep='Delete from bzr but leave the working copy.',
1521
force='Delete all the specified files, even if they can not be '
1522
'recovered and even if they are non-empty directories.')]
1862
safe='Backup changed files (default).',
1863
keep='Delete from brz but leave the working copy.',
1864
no_backup='Don\'t backup changed files.'),
1523
1866
aliases = ['rm', 'del']
1524
1867
encoding_type = 'replace'
1526
1869
def run(self, file_list, verbose=False, new=False,
1527
1870
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1872
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1874
if file_list is not None:
1531
1875
file_list = [f for f in file_list]
1698
2056
'if it does not already exist.'),
1699
2057
RegistryOption('format',
1700
2058
help='Specify a format for this branch. '
1701
'See "help formats".',
1702
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1703
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2059
'See "help formats" for a full list.',
2060
lazy_registry=('breezy.controldir', 'format_registry'),
2061
converter=lambda name: controldir.format_registry.make_controldir(name),
1704
2062
value_switches=True,
1705
2063
title="Branch format",
1707
2065
Option('append-revisions-only',
1708
2066
help='Never change revnos or the existing log.'
1709
' Append revisions to it only.')
2067
' Append revisions to it only.'),
2069
'Create a branch without a working tree.')
1711
2071
def run(self, location=None, format=None, append_revisions_only=False,
1712
create_prefix=False):
2072
create_prefix=False, no_tree=False):
1713
2073
if format is None:
1714
format = bzrdir.format_registry.make_bzrdir('default')
2074
format = controldir.format_registry.make_controldir('default')
1715
2075
if location is None:
1716
2076
location = u'.'
1726
2086
to_transport.ensure_base()
1727
2087
except errors.NoSuchFile:
1728
2088
if not create_prefix:
1729
raise errors.BzrCommandError("Parent directory of %s"
2089
raise errors.BzrCommandError(gettext("Parent directory of %s"
1730
2090
" does not exist."
1731
2091
"\nYou may supply --create-prefix to create all"
1732
" leading parent directories."
2092
" leading parent directories.")
1734
2094
to_transport.create_prefix()
1737
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2097
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1738
2098
except errors.NotBranchError:
1739
2099
# really a NotBzrDir error...
1740
create_branch = bzrdir.BzrDir.create_branch_convenience
2100
create_branch = controldir.ControlDir.create_branch_convenience
2102
force_new_tree = False
2104
force_new_tree = None
1741
2105
branch = create_branch(to_transport.base, format=format,
1742
possible_transports=[to_transport])
1743
a_bzrdir = branch.bzrdir
2106
possible_transports=[to_transport],
2107
force_new_tree=force_new_tree)
2108
a_controldir = branch.controldir
1745
from bzrlib.transport.local import LocalTransport
1746
if a_bzrdir.has_branch():
2110
from .transport.local import LocalTransport
2111
if a_controldir.has_branch():
1747
2112
if (isinstance(to_transport, LocalTransport)
1748
and not a_bzrdir.has_workingtree()):
2113
and not a_controldir.has_workingtree()):
1749
2114
raise errors.BranchExistsWithoutWorkingTree(location)
1750
2115
raise errors.AlreadyBranchError(location)
1751
branch = a_bzrdir.create_branch()
1752
a_bzrdir.create_workingtree()
2116
branch = a_controldir.create_branch()
2117
if not no_tree and not a_controldir.has_workingtree():
2118
a_controldir.create_workingtree()
1753
2119
if append_revisions_only:
1755
2121
branch.set_append_revisions_only(True)
1756
2122
except errors.UpgradeRequired:
1757
raise errors.BzrCommandError('This branch format cannot be set'
1758
' to append-revisions-only. Try --default.')
2123
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2124
' to append-revisions-only. Try --default.'))
1759
2125
if not is_quiet():
1760
from bzrlib.info import describe_layout, describe_format
2126
from .info import describe_layout, describe_format
1762
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2128
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1763
2129
except (errors.NoWorkingTree, errors.NotLocalUrl):
1765
2131
repository = branch.repository
1766
2132
layout = describe_layout(repository, branch, tree).lower()
1767
format = describe_format(a_bzrdir, repository, branch, tree)
1768
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2133
format = describe_format(a_controldir, repository, branch, tree)
2134
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1769
2136
if repository.is_shared():
1770
2137
#XXX: maybe this can be refactored into transport.path_or_url()
1771
url = repository.bzrdir.root_transport.external_url()
2138
url = repository.controldir.root_transport.external_url()
1773
2140
url = urlutils.local_path_from_url(url)
1774
except errors.InvalidURL:
2141
except urlutils.InvalidURL:
1776
self.outf.write("Using shared repository: %s\n" % url)
2143
self.outf.write(gettext("Using shared repository: %s\n") % url)
1779
2146
class cmd_init_repository(Command):
1821
2188
def run(self, location, format=None, no_trees=False):
1822
2189
if format is None:
1823
format = bzrdir.format_registry.make_bzrdir('default')
2190
format = controldir.format_registry.make_controldir('default')
1825
2192
if location is None:
1828
2195
to_transport = transport.get_transport(location)
1829
to_transport.ensure_base()
1831
newdir = format.initialize_on_transport(to_transport)
1832
repo = newdir.create_repository(shared=True)
1833
repo.set_make_working_trees(not no_trees)
2197
if format.fixed_components:
2198
repo_format_name = None
2200
repo_format_name = format.repository_format.get_format_string()
2202
(repo, newdir, require_stacking, repository_policy) = (
2203
format.initialize_on_transport_ex(to_transport,
2204
create_prefix=True, make_working_trees=not no_trees,
2205
shared_repo=True, force_new_repo=True,
2206
use_existing_dir=True,
2207
repo_format_name=repo_format_name))
1834
2208
if not is_quiet():
1835
from bzrlib.info import show_bzrdir_info
1836
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2209
from .info import show_bzrdir_info
2210
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1839
2213
class cmd_diff(Command):
1859
2240
Shows the difference in the working tree versus the last commit::
1863
2244
Difference between the working tree and revision 1::
1867
2248
Difference between revision 3 and revision 1::
1871
2252
Difference between revision 3 and revision 1 for branch xxx::
1875
To see the changes introduced in revision X::
2256
The changes introduced by revision 2 (equivalent to -r1..2)::
2260
To see the changes introduced by revision X::
1879
2264
Note that in the case of a merge, the -c option shows the changes
1880
2265
compared to the left hand parent. To see the changes against
1881
2266
another parent, use::
1883
bzr diff -r<chosen_parent>..X
1885
The changes introduced by revision 2 (equivalent to -r1..2)::
2268
brz diff -r<chosen_parent>..X
2270
The changes between the current revision and the previous revision
2271
(equivalent to -c-1 and -r-2..-1)
1889
2275
Show just the differences for file NEWS::
1893
2279
Show the differences in working tree xxx for file NEWS::
1897
2283
Show the differences from branch xxx to this working tree:
1901
2287
Show the differences between two branches for file NEWS::
1903
bzr diff --old xxx --new yyy NEWS
1905
Same as 'bzr diff' but prefix paths with old/ and new/::
1907
bzr diff --prefix old/:new/
2289
brz diff --old xxx --new yyy NEWS
2291
Same as 'brz diff' but prefix paths with old/ and new/::
2293
brz diff --prefix old/:new/
2295
Show the differences using a custom diff program with options::
2297
brz diff --using /usr/bin/diff --diff-options -wu
1909
2299
_see_also = ['status']
1910
2300
takes_args = ['file*']
1911
2301
takes_options = [
1912
Option('diff-options', type=str,
2302
Option('diff-options', type=text_type,
1913
2303
help='Pass these options to the external diff program.'),
1914
Option('prefix', type=str,
2304
Option('prefix', type=text_type,
1915
2305
short_name='p',
1916
2306
help='Set prefixes added to old and new filenames, as '
1917
2307
'two values separated by a colon. (eg "old/:new/").'),
1919
2309
help='Branch/tree to compare from.',
1923
2313
help='Branch/tree to compare to.',
1928
2318
Option('using',
1929
2319
help='Use this command to compare files.',
1932
2322
RegistryOption('format',
1933
2324
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
2325
lazy_registry=('breezy.diff', 'format_registry'),
2326
title='Diff format'),
2328
help='How many lines of context to show.',
1937
2332
aliases = ['di', 'dif']
1938
2333
encoding_type = 'exact'
1940
2335
@display_command
1941
2336
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2337
prefix=None, old=None, new=None, using=None, format=None,
2339
from .diff import (get_trees_and_branches_to_diff_locked,
1944
2340
show_diff_trees)
1946
if (prefix is None) or (prefix == '0'):
1947
2343
# diff -p0 format
2346
elif prefix == u'1' or prefix is None:
1951
2347
old_label = 'old/'
1952
2348
new_label = 'new/'
1954
old_label, new_label = prefix.split(":")
2349
elif u':' in prefix:
2350
old_label, new_label = prefix.split(u":")
1956
raise errors.BzrCommandError(
2352
raise errors.BzrCommandError(gettext(
1957
2353
'--prefix expects two values separated by a colon'
1958
' (eg "old/:new/")')
2354
' (eg "old/:new/")'))
1960
2356
if revision and len(revision) > 2:
1961
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
' one or two revision specifiers')
2357
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2358
' one or two revision specifiers'))
1964
2360
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
2361
raise errors.BzrCommandError(gettext(
2362
'{0} and {1} are mutually exclusive').format(
2363
'--using', '--format'))
1968
2365
(old_tree, new_tree,
1969
2366
old_branch, new_branch,
1970
2367
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
2368
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1972
return show_diff_trees(old_tree, new_tree, sys.stdout,
2369
# GNU diff on Windows uses ANSI encoding for filenames
2370
path_encoding = osutils.get_diff_header_encoding()
2371
return show_diff_trees(old_tree, new_tree, self.outf,
1973
2372
specific_files=specific_files,
1974
2373
external_diff_options=diff_options,
1975
2374
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
2375
extra_trees=extra_trees,
2376
path_encoding=path_encoding,
2377
using=using, context=context,
1977
2378
format_cls=format)
2204
2597
:Other filtering:
2206
The --message option can be used for finding revisions that match a
2207
regular expression in a commit message.
2599
The --match option can be used for finding revisions that match a
2600
regular expression in a commit message, committer, author or bug.
2601
Specifying the option several times will match any of the supplied
2602
expressions. --match-author, --match-bugs, --match-committer and
2603
--match-message can be used to only match a specific field.
2209
2605
:Tips & tricks:
2211
2607
GUI tools and IDEs are often better at exploring history than command
2212
2608
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2609
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2610
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
2611
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2217
You may find it useful to add the aliases below to ``bazaar.conf``::
2613
You may find it useful to add the aliases below to ``breezy.conf``::
2221
2617
top = log -l10 --line
2222
2618
show = log -v -p
2224
``bzr tip`` will then show the latest revision while ``bzr top``
2620
``brz tip`` will then show the latest revision while ``brz top``
2225
2621
will show the last 10 mainline revisions. To see the details of a
2226
particular revision X, ``bzr show -rX``.
2622
particular revision X, ``brz show -rX``.
2228
2624
If you are interested in looking deeper into a particular merge X,
2229
use ``bzr log -n0 -rX``.
2625
use ``brz log -n0 -rX``.
2231
``bzr log -v`` on a branch with lots of history is currently
2627
``brz log -v`` on a branch with lots of history is currently
2232
2628
very slow. A fix for this issue is currently under development.
2233
2629
With or without that fix, it is recommended that a revision range
2234
2630
be given when using the -v option.
2236
bzr has a generic full-text matching plugin, bzr-search, that can be
2632
brz has a generic full-text matching plugin, brz-search, that can be
2237
2633
used to find revisions matching user names, commit messages, etc.
2238
2634
Among other features, this plugin can find all revisions containing
2239
2635
a list of words but not others.
2277
2678
Option('show-diff',
2278
2679
short_name='p',
2279
2680
help='Show changes made in each revision as a patch.'),
2280
Option('include-merges',
2681
Option('include-merged',
2281
2682
help='Show merged revisions like --levels 0 does.'),
2683
Option('include-merges', hidden=True,
2684
help='Historical alias for --include-merged.'),
2685
Option('omit-merges',
2686
help='Do not report commits with more than one parent.'),
2282
2687
Option('exclude-common-ancestry',
2283
2688
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2689
' of both ancestries (require -rX..Y).'
2691
Option('signatures',
2692
help='Show digital signature validity.'),
2695
help='Show revisions whose properties match this '
2698
ListOption('match-message',
2699
help='Show revisions whose message matches this '
2702
ListOption('match-committer',
2703
help='Show revisions whose committer matches this '
2706
ListOption('match-author',
2707
help='Show revisions whose authors match this '
2710
ListOption('match-bugs',
2711
help='Show revisions whose bugs match this '
2287
2715
encoding_type = 'replace'
2505
2965
help='Recurse into subdirectories.'),
2506
2966
Option('from-root',
2507
2967
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2968
Option('unknown', short_name='u',
2969
help='Print unknown files.'),
2509
2970
Option('versioned', help='Print versioned files.',
2510
2971
short_name='V'),
2511
Option('ignored', help='Print ignored files.'),
2513
help='Write an ascii NUL (\\0) separator '
2514
'between files rather than a newline.'),
2972
Option('ignored', short_name='i',
2973
help='Print ignored files.'),
2974
Option('kind', short_name='k',
2516
2975
help='List entries of a particular kind: file, directory, symlink.',
2520
2981
@display_command
2521
2982
def run(self, revision=None, verbose=False,
2522
2983
recursive=False, from_root=False,
2523
2984
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
2985
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
if kind and kind not in ('file', 'directory', 'symlink'):
2527
raise errors.BzrCommandError('invalid kind specified')
2987
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
2988
raise errors.BzrCommandError(gettext('invalid kind specified'))
2529
2990
if verbose and null:
2530
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2991
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2531
2992
all = not (unknown or versioned or ignored)
2533
2994
selection = {'I':ignored, '?':unknown, 'V':versioned}
2650
3112
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
3113
precedence over the '!' exception patterns.
2653
Note: ignore patterns containing shell wildcards must be quoted from
3117
* Ignore patterns containing shell wildcards must be quoted from
3120
* Ignore patterns starting with "#" act as comments in the ignore file.
3121
To ignore patterns that begin with that character, use the "RE:" prefix.
2657
3124
Ignore the top level Makefile::
2659
bzr ignore ./Makefile
3126
brz ignore ./Makefile
2661
3128
Ignore .class files in all directories...::
2663
bzr ignore "*.class"
3130
brz ignore "*.class"
2665
3132
...but do not ignore "special.class"::
2667
bzr ignore "!special.class"
2669
Ignore .o files under the lib directory::
2671
bzr ignore "lib/**/*.o"
2673
Ignore .o files under the lib directory::
2675
bzr ignore "RE:lib/.*\.o"
3134
brz ignore "!special.class"
3136
Ignore files whose name begins with the "#" character::
3140
Ignore .o files under the lib directory::
3142
brz ignore "lib/**/*.o"
3144
Ignore .o files under the lib directory::
3146
brz ignore "RE:lib/.*\\.o"
2677
3148
Ignore everything but the "debian" toplevel directory::
2679
bzr ignore "RE:(?!debian/).*"
3150
brz ignore "RE:(?!debian/).*"
2681
3152
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
3153
but always ignore autosave files ending in ~, even under local/::
2685
bzr ignore "!./local"
3156
brz ignore "!./local"
2689
3160
_see_also = ['status', 'ignored', 'patterns']
2690
3161
takes_args = ['name_pattern*']
3162
takes_options = ['directory',
2692
3163
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
3164
help='Display the default ignore rules that brz uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2697
from bzrlib import ignores
3167
def run(self, name_pattern_list=None, default_rules=None,
3169
from breezy import ignores
2698
3170
if default_rules is not None:
2699
3171
# dump the default rules and exit
2700
3172
for pattern in ignores.USER_DEFAULTS:
2701
3173
self.outf.write("%s\n" % pattern)
2703
3175
if not name_pattern_list:
2704
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
3176
raise errors.BzrCommandError(gettext("ignore requires at least one "
3177
"NAME_PATTERN or --default-rules."))
2706
3178
name_pattern_list = [globbing.normalize_pattern(p)
2707
3179
for p in name_pattern_list]
3181
bad_patterns_count = 0
3182
for p in name_pattern_list:
3183
if not globbing.Globster.is_pattern_valid(p):
3184
bad_patterns_count += 1
3185
bad_patterns += ('\n %s' % p)
3187
msg = (ngettext('Invalid ignore pattern found. %s',
3188
'Invalid ignore patterns found. %s',
3189
bad_patterns_count) % bad_patterns)
3190
ui.ui_factory.show_error(msg)
3191
raise lazy_regex.InvalidPattern('')
2708
3192
for name_pattern in name_pattern_list:
2709
3193
if (name_pattern[0] == '/' or
2710
3194
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
3195
raise errors.BzrCommandError(gettext(
3196
"NAME_PATTERN should not be an absolute path"))
3197
tree, relpath = WorkingTree.open_containing(directory)
2714
3198
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
3199
ignored = globbing.Globster(name_pattern_list)
3201
self.add_cleanup(tree.lock_read().unlock)
2718
3202
for entry in tree.list_files():
2720
3204
if id is not None:
2721
3205
filename = entry[0]
2722
3206
if ignored.match(filename):
2723
3207
matches.append(filename)
2725
3208
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
3209
self.outf.write(gettext("Warning: the following files are version "
3210
"controlled and match your ignore pattern:\n%s"
2728
3211
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3212
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2732
3215
class cmd_ignored(Command):
2804
3289
================= =========================
3292
encoding_type = 'exact'
2806
3293
takes_args = ['dest', 'branch_or_subdir?']
3294
takes_options = ['directory',
2808
3295
Option('format',
2809
3296
help="Type of file to export to.",
2812
3299
Option('filters', help='Apply content filters to export the '
2813
3300
'convenient form.'),
2816
3303
help="Name of the root directory inside the exported file."),
2817
3304
Option('per-file-timestamps',
2818
3305
help='Set modification time of files to that of the last '
2819
3306
'revision in which it was changed.'),
3307
Option('uncommitted',
3308
help='Export the working tree contents rather than that of the '
2821
3311
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2823
from bzrlib.export import export
3312
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3314
from .export import export
2825
3316
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
3317
branch_or_subdir = directory
3319
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3321
if tree is not None:
3322
self.add_cleanup(tree.lock_read().unlock)
3326
raise errors.BzrCommandError(
3327
gettext("--uncommitted requires a working tree"))
2830
b, subdir = Branch.open_containing(branch_or_subdir)
2833
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3330
export_tree = _get_one_revision_tree(
3331
'export', revision, branch=b,
3335
from breezy.filter_tree import ContentFilterTree
3336
export_tree = ContentFilterTree(
3337
export_tree, export_tree._content_filter_stack)
3339
# Try asking the tree first..
3340
if not per_file_timestamps:
3341
chunks = export_tree.archive(
3342
dest, format, root=root, subdir=subdir)
3345
self.outf.writelines(chunks)
3348
with tempfile.NamedTemporaryFile(delete=False) as temp:
3349
temp.writelines(chunks)
3350
os.rename(temp.name, dest)
3351
except errors.NoSuchExportFormat:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
3356
export(export_tree, dest, format, root, subdir,
2836
3357
per_file_timestamps=per_file_timestamps)
2837
except errors.NoSuchExportFormat, e:
2838
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3358
except errors.NoSuchExportFormat as e:
3359
raise errors.BzrCommandError(
3360
gettext('Unsupported export format: %s') % e.format)
2841
3363
class cmd_cat(Command):
2879
3401
old_file_id = rev_tree.path2id(relpath)
3403
# TODO: Split out this code to something that generically finds the
3404
# best id for a path across one or more trees; it's like
3405
# find_ids_across_trees but restricted to find just one. -- mbp
2881
3407
if name_from_revision:
2882
3408
# Try in revision if requested
2883
3409
if old_file_id is None:
2884
raise errors.BzrCommandError(
2885
"%r is not present in revision %s" % (
3410
raise errors.BzrCommandError(gettext(
3411
"{0!r} is not present in revision {1}").format(
2886
3412
filename, rev_tree.get_revision_id()))
2888
content = rev_tree.get_file_text(old_file_id)
3414
actual_file_id = old_file_id
2890
3416
cur_file_id = tree.path2id(relpath)
2892
if cur_file_id is not None:
2893
# Then try with the actual file id
2895
content = rev_tree.get_file_text(cur_file_id)
2897
except errors.NoSuchId:
2898
# The actual file id didn't exist at that time
2900
if not found and old_file_id is not None:
2901
# Finally try with the old file id
2902
content = rev_tree.get_file_text(old_file_id)
2905
# Can't be found anywhere
2906
raise errors.BzrCommandError(
2907
"%r is not present in revision %s" % (
3417
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3418
actual_file_id = cur_file_id
3419
elif old_file_id is not None:
3420
actual_file_id = old_file_id
3422
raise errors.BzrCommandError(gettext(
3423
"{0!r} is not present in revision {1}").format(
2908
3424
filename, rev_tree.get_revision_id()))
3425
relpath = rev_tree.id2path(actual_file_id)
2910
from bzrlib.filters import (
2911
ContentFilterContext,
2912
filtered_output_bytes,
2914
filters = rev_tree._content_filter_stack(relpath)
2915
chunks = content.splitlines(True)
2916
content = filtered_output_bytes(chunks, filters,
2917
ContentFilterContext(relpath, rev_tree))
2919
self.outf.writelines(content)
3427
from .filter_tree import ContentFilterTree
3428
filter_tree = ContentFilterTree(rev_tree,
3429
rev_tree._content_filter_stack)
3430
content = filter_tree.get_file_text(relpath, actual_file_id)
2922
self.outf.write(content)
3432
content = rev_tree.get_file_text(relpath, actual_file_id)
3434
self.outf.write(content)
2925
3437
class cmd_local_time_offset(Command):
2973
3485
A common mistake is to forget to add a new file or directory before
2974
3486
running the commit command. The --strict option checks for unknown
2975
3487
files and aborts the commit if any are found. More advanced pre-commit
2976
checks can be implemented by defining hooks. See ``bzr help hooks``
3488
checks can be implemented by defining hooks. See ``brz help hooks``
2979
3491
:Things to note:
2981
3493
If you accidentially commit the wrong changes or make a spelling
2982
3494
mistake in the commit message say, you can use the uncommit command
2983
to undo it. See ``bzr help uncommit`` for details.
3495
to undo it. See ``brz help uncommit`` for details.
2985
3497
Hooks can also be configured to run after a commit. This allows you
2986
3498
to trigger updates to external systems like bug trackers. The --fixes
2987
3499
option can be used to record the association between a revision and
2988
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3500
one or more bugs. See ``brz help bugs`` for details.
3007
# TODO: Run hooks on tree to-be-committed, and after commit.
3009
# TODO: Strict commit that fails if there are deleted files.
3010
# (what does "deleted files" mean ??)
3012
# TODO: Give better message for -s, --summary, used by tla people
3014
# XXX: verbose currently does nothing
3016
3503
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3017
3504
takes_args = ['selected*']
3018
3505
takes_options = [
3019
ListOption('exclude', type=str, short_name='x',
3506
ListOption('exclude', type=text_type, short_name='x',
3020
3507
help="Do not consider changes made to a given path."),
3021
Option('message', type=unicode,
3508
Option('message', type=text_type,
3022
3509
short_name='m',
3023
3510
help="Description of the new revision."),
3025
3512
Option('unchanged',
3026
3513
help='Commit even if nothing has changed.'),
3027
Option('file', type=str,
3514
Option('file', type=text_type,
3028
3515
short_name='F',
3029
3516
argname='msgfile',
3030
3517
help='Take commit message from this file.'),
3031
3518
Option('strict',
3032
3519
help="Refuse to commit if there are unknown "
3033
3520
"files in the working tree."),
3034
Option('commit-time', type=str,
3521
Option('commit-time', type=text_type,
3035
3522
help="Manually set a commit time using commit date "
3036
3523
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3037
ListOption('fixes', type=str,
3524
ListOption('fixes', type=text_type,
3038
3525
help="Mark a bug as being fixed by this revision "
3039
"(see \"bzr help bugs\")."),
3040
ListOption('author', type=unicode,
3526
"(see \"brz help bugs\")."),
3527
ListOption('author', type=text_type,
3041
3528
help="Set the author's name, if it's different "
3042
3529
"from the committer."),
3043
3530
Option('local',
3049
3536
Option('show-diff', short_name='p',
3050
3537
help='When no message is supplied, show the diff along'
3051
3538
' with the status summary in the message editor.'),
3540
help='When committing to a foreign version control '
3541
'system do not push data that can not be natively '
3053
3544
aliases = ['ci', 'checkin']
3055
3546
def _iter_bug_fix_urls(self, fixes, branch):
3547
default_bugtracker = None
3056
3548
# Configure the properties for bug fixing attributes.
3057
3549
for fixed_bug in fixes:
3058
3550
tokens = fixed_bug.split(':')
3059
if len(tokens) != 2:
3060
raise errors.BzrCommandError(
3551
if len(tokens) == 1:
3552
if default_bugtracker is None:
3553
branch_config = branch.get_config_stack()
3554
default_bugtracker = branch_config.get(
3556
if default_bugtracker is None:
3557
raise errors.BzrCommandError(gettext(
3558
"No tracker specified for bug %s. Use the form "
3559
"'tracker:id' or specify a default bug tracker "
3560
"using the `bugtracker` option.\nSee "
3561
"\"brz help bugs\" for more information on this "
3562
"feature. Commit refused.") % fixed_bug)
3563
tag = default_bugtracker
3565
elif len(tokens) != 2:
3566
raise errors.BzrCommandError(gettext(
3061
3567
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3062
"See \"bzr help bugs\" for more information on this "
3063
"feature.\nCommit refused." % fixed_bug)
3064
tag, bug_id = tokens
3568
"See \"brz help bugs\" for more information on this "
3569
"feature.\nCommit refused.") % fixed_bug)
3571
tag, bug_id = tokens
3066
3573
yield bugtracker.get_bug_url(tag, branch, bug_id)
3067
except errors.UnknownBugTrackerAbbreviation:
3068
raise errors.BzrCommandError(
3069
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3070
except errors.MalformedBugIdentifier, e:
3071
raise errors.BzrCommandError(
3072
"%s\nCommit refused." % (str(e),))
3574
except bugtracker.UnknownBugTrackerAbbreviation:
3575
raise errors.BzrCommandError(gettext(
3576
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3577
except bugtracker.MalformedBugIdentifier as e:
3578
raise errors.BzrCommandError(gettext(
3579
u"%s\nCommit refused.") % (e,))
3074
3581
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
3582
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
3077
from bzrlib.errors import (
3583
author=None, show_diff=False, exclude=None, commit_time=None,
3585
from .commit import (
3078
3586
PointlessCommit,
3588
from .errors import (
3079
3589
ConflictsInTree,
3080
3590
StrictCommitFailed
3082
from bzrlib.msgeditor import (
3592
from .msgeditor import (
3083
3593
edit_commit_message_encoded,
3084
3594
generate_commit_message_template,
3085
make_commit_message_template_encoded
3595
make_commit_message_template_encoded,
3088
3599
commit_stamp = offset = None
3089
3600
if commit_time is not None:
3091
3602
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3092
except ValueError, e:
3093
raise errors.BzrCommandError(
3094
"Could not parse --commit-time: " + str(e))
3096
# TODO: Need a blackbox test for invoking the external editor; may be
3097
# slightly problematic to run this cross-platform.
3099
# TODO: do more checks that the commit will succeed before
3100
# spending the user's valuable time typing a commit message.
3603
except ValueError as e:
3604
raise errors.BzrCommandError(gettext(
3605
"Could not parse --commit-time: " + str(e)))
3102
3607
properties = {}
3104
tree, selected_list = tree_files(selected_list)
3609
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3105
3610
if selected_list == ['']:
3106
3611
# workaround - commit of root of tree should be exactly the same
3107
3612
# as just default commit in that tree, and succeed even though
3178
3688
reporter=None, verbose=verbose, revprops=properties,
3179
3689
authors=author, timestamp=commit_stamp,
3180
3690
timezone=offset,
3181
exclude=safe_relpath_files(tree, exclude))
3691
exclude=tree.safe_relpath_files(exclude),
3182
3693
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
3694
raise errors.BzrCommandError(gettext("No changes to commit."
3695
" Please 'brz add' the files you want to commit, or use"
3696
" --unchanged to force an empty commit."))
3185
3697
except ConflictsInTree:
3186
raise errors.BzrCommandError('Conflicts detected in working '
3187
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3698
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3699
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3189
3701
except StrictCommitFailed:
3190
raise errors.BzrCommandError("Commit refused because there are"
3191
" unknown files in the working tree.")
3192
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3702
raise errors.BzrCommandError(gettext("Commit refused because there are"
3703
" unknown files in the working tree."))
3704
except errors.BoundBranchOutOfDate as e:
3705
e.extra_help = (gettext("\n"
3194
3706
'To commit to master branch, run update and then commit.\n'
3195
3707
'You can also pass --local to commit to continue working '
3270
3782
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3273
The check command or bzr developers may sometimes advise you to run
3274
this command. When the default format has changed you may also be warned
3275
during other operations to upgrade.
3783
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3785
When the default format has changed after a major new release of
3786
Bazaar, you may be informed during certain operations that you
3787
should upgrade. Upgrading to a newer format may improve performance
3788
or make new features available. It may however limit interoperability
3789
with older repositories or with older versions of Bazaar.
3791
If you wish to upgrade to a particular format rather than the
3792
current default, that can be specified using the --format option.
3793
As a consequence, you can use the upgrade command this way to
3794
"downgrade" to an earlier format, though some conversions are
3795
a one way process (e.g. changing from the 1.x default to the
3796
2.x default) so downgrading is not always possible.
3798
A backup.bzr.~#~ directory is created at the start of the conversion
3799
process (where # is a number). By default, this is left there on
3800
completion. If the conversion fails, delete the new .bzr directory
3801
and rename this one back in its place. Use the --clean option to ask
3802
for the backup.bzr directory to be removed on successful conversion.
3803
Alternatively, you can delete it by hand if everything looks good
3806
If the location given is a shared repository, dependent branches
3807
are also converted provided the repository converts successfully.
3808
If the conversion of a branch fails, remaining branches are still
3811
For more information on upgrades, see the Bazaar Upgrade Guide,
3812
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3278
_see_also = ['check']
3815
_see_also = ['check', 'reconcile', 'formats']
3279
3816
takes_args = ['url?']
3280
3817
takes_options = [
3281
RegistryOption('format',
3282
help='Upgrade to a specific format. See "bzr help'
3283
' formats" for details.',
3284
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3285
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3286
value_switches=True, title='Branch format'),
3818
RegistryOption('format',
3819
help='Upgrade to a specific format. See "brz help'
3820
' formats" for details.',
3821
lazy_registry=('breezy.controldir', 'format_registry'),
3822
converter=lambda name: controldir.format_registry.make_controldir(name),
3823
value_switches=True, title='Branch format'),
3825
help='Remove the backup.bzr directory if successful.'),
3827
help="Show what would be done, but don't actually do anything."),
3289
def run(self, url='.', format=None):
3290
from bzrlib.upgrade import upgrade
3291
upgrade(url, format)
3830
def run(self, url='.', format=None, clean=False, dry_run=False):
3831
from .upgrade import upgrade
3832
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3834
if len(exceptions) == 1:
3835
# Compatibility with historical behavior
3294
3841
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3842
__doc__ = """Show or set brz user id.
3298
3845
Show the email of the current user::
3302
3849
Set the current user::
3304
bzr whoami "Frank Chu <fchu@example.com>"
3851
brz whoami "Frank Chu <fchu@example.com>"
3306
takes_options = [ Option('email',
3853
takes_options = [ 'directory',
3307
3855
help='Display email address only.'),
3308
3856
Option('branch',
3309
3857
help='Set identity for the current branch instead of '
3313
3861
encoding_type = 'replace'
3315
3863
@display_command
3316
def run(self, email=False, branch=False, name=None):
3864
def run(self, email=False, branch=False, name=None, directory=None):
3317
3865
if name is None:
3318
# use branch if we're inside one; otherwise global config
3320
c = Branch.open_containing('.')[0].get_config()
3321
except errors.NotBranchError:
3322
c = config.GlobalConfig()
3866
if directory is None:
3867
# use branch if we're inside one; otherwise global config
3869
c = Branch.open_containing(u'.')[0].get_config_stack()
3870
except errors.NotBranchError:
3871
c = _mod_config.GlobalStack()
3873
c = Branch.open(directory).get_config_stack()
3874
identity = c.get('email')
3324
self.outf.write(c.user_email() + '\n')
3876
self.outf.write(_mod_config.extract_email_address(identity)
3326
self.outf.write(c.username() + '\n')
3879
self.outf.write(identity + '\n')
3883
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3329
3886
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3332
except errors.NoEmailInUsername, e:
3888
_mod_config.extract_email_address(name)
3889
except _mod_config.NoEmailInUsername as e:
3333
3890
warning('"%s" does not seem to contain an email address. '
3334
3891
'This is allowed, but not recommended.', name)
3336
3893
# use global config unless --branch given
3338
c = Branch.open_containing('.')[0].get_config()
3895
if directory is None:
3896
c = Branch.open_containing(u'.')[0].get_config_stack()
3898
b = Branch.open(directory)
3899
self.add_cleanup(b.lock_write().unlock)
3900
c = b.get_config_stack()
3340
c = config.GlobalConfig()
3341
c.set_user_option('email', name)
3902
c = _mod_config.GlobalStack()
3903
c.set('email', name)
3344
3906
class cmd_nick(Command):
3345
3907
__doc__ = """Print or set the branch nickname.
3347
If unset, the tree root directory name is used as the nickname.
3348
To print the current nickname, execute with no argument.
3909
If unset, the colocated branch name is used for colocated branches, and
3910
the branch directory name is used for other branches. To print the
3911
current nickname, execute with no argument.
3350
3913
Bound branches use the nickname of its master branch unless it is set
3406
3970
def remove_alias(self, alias_name):
3407
3971
if alias_name is None:
3408
raise errors.BzrCommandError(
3409
'bzr alias --remove expects an alias to remove.')
3972
raise errors.BzrCommandError(gettext(
3973
'brz alias --remove expects an alias to remove.'))
3410
3974
# If alias is not found, print something like:
3411
3975
# unalias: foo: not found
3412
c = config.GlobalConfig()
3976
c = _mod_config.GlobalConfig()
3413
3977
c.unset_alias(alias_name)
3415
3979
@display_command
3416
3980
def print_aliases(self):
3417
3981
"""Print out the defined aliases in a similar format to bash."""
3418
aliases = config.GlobalConfig().get_aliases()
3419
for key, value in sorted(aliases.iteritems()):
3420
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3982
aliases = _mod_config.GlobalConfig().get_aliases()
3983
for key, value in sorted(viewitems(aliases)):
3984
self.outf.write('brz alias %s="%s"\n' % (key, value))
3422
3986
@display_command
3423
3987
def print_alias(self, alias_name):
3424
from bzrlib.commands import get_alias
3988
from .commands import get_alias
3425
3989
alias = get_alias(alias_name)
3426
3990
if alias is None:
3427
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3991
self.outf.write("brz alias: %s: not found\n" % alias_name)
3429
3993
self.outf.write(
3430
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3994
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3432
3996
def set_alias(self, alias_name, alias_command):
3433
3997
"""Save the alias in the global config."""
3434
c = config.GlobalConfig()
3998
c = _mod_config.GlobalConfig()
3435
3999
c.set_alias(alias_name, alias_command)
3469
4033
Tests that need working space on disk use a common temporary directory,
3470
4034
typically inside $TMPDIR or /tmp.
3472
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4036
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3473
4037
into a pdb postmortem session.
4039
The --coverage=DIRNAME global option produces a report with covered code
3476
4043
Run only tests relating to 'ignore'::
3480
4047
Disable plugins and list tests as they're run::
3482
bzr --no-plugins selftest -v
4049
brz --no-plugins selftest -v
3484
4051
# NB: this is used from the class without creating an instance, which is
3485
4052
# why it does not have a self parameter.
3486
4053
def get_transport_type(typestring):
3487
4054
"""Parse and return a transport specifier."""
3488
4055
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
4056
from .tests import stub_sftp
3490
4057
return stub_sftp.SFTPAbsoluteServer
3491
if typestring == "memory":
3492
from bzrlib.tests import test_server
4058
elif typestring == "memory":
4059
from .tests import test_server
3493
4060
return memory.MemoryServer
3494
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
4061
elif typestring == "fakenfs":
4062
from .tests import test_server
3496
4063
return test_server.FakeNFSServer
3497
4064
msg = "No known transport type %s. Supported types are: sftp\n" %\
3527
4092
help='List the tests instead of running them.'),
3528
4093
RegistryOption('parallel',
3529
4094
help="Run the test suite in parallel.",
3530
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4095
lazy_registry=('breezy.tests', 'parallel_registry'),
3531
4096
value_switches=False,
3533
Option('randomize', type=str, argname="SEED",
4098
Option('randomize', type=text_type, argname="SEED",
3534
4099
help='Randomize the order of tests using the given'
3535
4100
' seed or "now" for the current time.'),
3536
Option('exclude', type=str, argname="PATTERN",
3538
help='Exclude tests that match this regular'
3541
help='Output test progress via subunit.'),
4101
ListOption('exclude', type=text_type, argname="PATTERN",
4103
help='Exclude tests that match this regular'
4106
help='Output test progress via subunit v1.'),
4108
help='Output test progress via subunit v2.'),
3542
4109
Option('strict', help='Fail on missing dependencies or '
3543
4110
'known failures.'),
3544
Option('load-list', type=str, argname='TESTLISTFILE',
4111
Option('load-list', type=text_type, argname='TESTLISTFILE',
3545
4112
help='Load a test id list from a text file.'),
3546
ListOption('debugflag', type=str, short_name='E',
4113
ListOption('debugflag', type=text_type, short_name='E',
3547
4114
help='Turn on a selftest debug flag.'),
3548
ListOption('starting-with', type=str, argname='TESTID',
4115
ListOption('starting-with', type=text_type, argname='TESTID',
3549
4116
param_name='starting_with', short_name='s',
3551
4118
'Load only the tests starting with TESTID.'),
4120
help="By default we disable fsync and fdatasync"
4121
" while running the test suite.")
3553
4123
encoding_type = 'replace'
3559
4129
def run(self, testspecs_list=None, verbose=False, one=False,
3560
4130
transport=None, benchmark=None,
3561
lsprof_timed=None, cache_dir=None,
3562
4132
first=False, list_only=False,
3563
4133
randomize=None, exclude=None, strict=False,
3564
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
parallel=None, lsprof_tests=False):
3566
from bzrlib.tests import selftest
3567
import bzrlib.benchmarks as benchmarks
3568
from bzrlib.benchmarks import tree_creator
3570
# Make deprecation warnings visible, unless -Werror is set
3571
symbol_versioning.activate_deprecation_warnings(override=False)
3573
if cache_dir is not None:
3574
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4134
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4135
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4137
# During selftest, disallow proxying, as it can cause severe
4138
# performance penalties and is only needed for thread
4139
# safety. The selftest command is assumed to not use threads
4140
# too heavily. The call should be as early as possible, as
4141
# error reporting for past duplicate imports won't have useful
4143
if sys.version_info[0] < 3:
4144
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4145
# disallowing it currently leads to failures in many places.
4146
lazy_import.disallow_proxying()
4151
raise errors.BzrCommandError("tests not available. Install the "
4152
"breezy tests to run the breezy testsuite.")
3575
4154
if testspecs_list is not None:
3576
4155
pattern = '|'.join(testspecs_list)
3581
from bzrlib.tests import SubUnitBzrRunner
4160
from .tests import SubUnitBzrRunnerv1
3582
4161
except ImportError:
3583
raise errors.BzrCommandError("subunit not available. subunit "
3584
"needs to be installed to use --subunit.")
3585
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4162
raise errors.BzrCommandError(gettext(
4163
"subunit not available. subunit needs to be installed "
4164
"to use --subunit."))
4165
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3586
4166
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
4167
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4168
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4169
# following code can be deleted when it's sufficiently deployed
4170
# -- vila/mgz 20100514
4171
if (sys.platform == "win32"
4172
and getattr(sys.stdout, 'fileno', None) is not None):
3590
4174
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4177
from .tests import SubUnitBzrRunnerv2
4179
raise errors.BzrCommandError(gettext(
4180
"subunit not available. subunit "
4181
"needs to be installed to use --subunit2."))
4182
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3592
4185
self.additional_selftest_args.setdefault(
3593
4186
'suite_decorators', []).append(parallel)
3595
test_suite_factory = benchmarks.test_suite
3596
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
verbose = not is_quiet()
3598
# TODO: should possibly lock the history file...
3599
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
4188
raise errors.BzrCommandError(gettext(
4189
"--benchmark is no longer supported from brz 2.2; "
4190
"use bzr-usertest instead"))
4191
test_suite_factory = None
4193
exclude_pattern = None
3602
test_suite_factory = None
4195
exclude_pattern = '(' + '|'.join(exclude) + ')'
4197
self._disable_fsync()
3604
4198
selftest_kwargs = {"verbose": verbose,
3605
4199
"pattern": pattern,
3606
4200
"stop_on_failure": one,
3608
4202
"test_suite_factory": test_suite_factory,
3609
4203
"lsprof_timed": lsprof_timed,
3610
4204
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
4205
"matching_tests_first": first,
3613
4206
"list_only": list_only,
3614
4207
"random_seed": randomize,
3615
"exclude_pattern": exclude,
4208
"exclude_pattern": exclude_pattern,
3616
4209
"strict": strict,
3617
4210
"load_list": load_list,
3618
4211
"debug_flags": debugflag,
3619
4212
"starting_with": starting_with
3621
4214
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
4216
# Make deprecation warnings visible, unless -Werror is set
4217
cleanup = symbol_versioning.activate_deprecation_warnings(
4220
result = tests.selftest(**selftest_kwargs)
3623
4223
return int(not result)
4225
def _disable_fsync(self):
4226
"""Change the 'os' functionality to not synchronize."""
4227
self._orig_fsync = getattr(os, 'fsync', None)
4228
if self._orig_fsync is not None:
4229
os.fsync = lambda filedes: None
4230
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4231
if self._orig_fdatasync is not None:
4232
os.fdatasync = lambda filedes: None
3626
4235
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
4236
__doc__ = """Show version of brz."""
3629
4238
encoding_type = 'replace'
3630
4239
takes_options = [
3680
4289
The source of the merge can be specified either in the form of a branch,
3681
4290
or in the form of a path to a file containing a merge directive generated
3682
with bzr send. If neither is specified, the default is the upstream branch
3683
or the branch most recently merged using --remember.
3685
When merging a branch, by default the tip will be merged. To pick a different
3686
revision, pass --revision. If you specify two values, the first will be used as
3687
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3688
available revisions, like this is commonly referred to as "cherrypicking".
3690
Revision numbers are always relative to the branch being merged.
3692
By default, bzr will try to merge in all new work from the other
3693
branch, automatically determining an appropriate base. If this
3694
fails, you may need to give an explicit base.
4291
with brz send. If neither is specified, the default is the upstream branch
4292
or the branch most recently merged using --remember. The source of the
4293
merge may also be specified in the form of a path to a file in another
4294
branch: in this case, only the modifications to that file are merged into
4295
the current working tree.
4297
When merging from a branch, by default brz will try to merge in all new
4298
work from the other branch, automatically determining an appropriate base
4299
revision. If this fails, you may need to give an explicit base.
4301
To pick a different ending revision, pass "--revision OTHER". brz will
4302
try to merge in all new work up to and including revision OTHER.
4304
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4305
through OTHER, excluding BASE but including OTHER, will be merged. If this
4306
causes some revisions to be skipped, i.e. if the destination branch does
4307
not already contain revision BASE, such a merge is commonly referred to as
4308
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4309
cherrypicks. The changes look like a normal commit, and the history of the
4310
changes from the other branch is not stored in the commit.
4312
Revision numbers are always relative to the source branch.
3696
4314
Merge will do its best to combine the changes in two branches, but there
3697
4315
are some kinds of problems only a human can fix. When it encounters those,
3698
4316
it will mark a conflict. A conflict means that you need to fix something,
3699
before you should commit.
3701
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3703
If there is no default branch set, the first merge will set it. After
3704
that, you can omit the branch to use the default. To change the
3705
default, use --remember. The value will only be saved if the remote
3706
location can be accessed.
4317
before you can commit.
4319
Use brz resolve when you have fixed a problem. See also brz conflicts.
4321
If there is no default branch set, the first merge will set it (use
4322
--no-remember to avoid setting it). After that, you can omit the branch
4323
to use the default. To change the default, use --remember. The value will
4324
only be saved if the remote location can be accessed.
3708
4326
The results of the merge are placed into the destination working
3709
directory, where they can be reviewed (with bzr diff), tested, and then
4327
directory, where they can be reviewed (with brz diff), tested, and then
3710
4328
committed to record the result of the merge.
3712
4330
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
4331
--force is given. If --force is given, then the changes from the source
4332
will be merged with the current working tree, including any uncommitted
4333
changes in the tree. The --force option can also be used to create a
3714
4334
merge revision which has more than two parents.
3716
4336
If one would like to merge changes from the working tree of the other
3843
4464
self.sanity_check_merger(merger)
3844
4465
if (merger.base_rev_id == merger.other_rev_id and
3845
4466
merger.other_rev_id is not None):
3846
note('Nothing to do.')
4467
# check if location is a nonexistent file (and not a branch) to
4468
# disambiguate the 'Nothing to do'
4469
if merger.interesting_files:
4470
if not merger.other_tree.has_filename(
4471
merger.interesting_files[0]):
4472
note(gettext("merger: ") + str(merger))
4473
raise errors.PathsDoNotExist([location])
4474
note(gettext('Nothing to do.'))
4476
if pull and not preview:
3849
4477
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
4478
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3851
4479
if (merger.base_rev_id == tree.last_revision()):
3852
4480
result = tree.pull(merger.other_branch, False,
3853
4481
merger.other_rev_id)
3854
4482
result.report(self.outf)
3856
4484
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
4485
raise errors.BzrCommandError(gettext(
3858
4486
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
4487
" (perhaps you would prefer 'brz pull')"))
3861
4489
return self._do_preview(merger)
3862
4490
elif interactive:
3920
4550
# Use reprocess if the merger supports it
3921
4551
merger.reprocess = merger.merge_type.supports_reprocess
3922
4552
if merger.reprocess and not merger.merge_type.supports_reprocess:
3923
raise errors.BzrCommandError("Conflict reduction is not supported"
3924
" for merge type %s." %
4553
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4554
" for merge type %s.") %
3925
4555
merger.merge_type)
3926
4556
if merger.reprocess and merger.show_base:
3927
raise errors.BzrCommandError("Cannot do conflict reduction and"
4557
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4560
if (merger.merge_type.requires_file_merge_plan and
4561
(not getattr(merger.this_tree, 'plan_file_merge', None) or
4562
not getattr(merger.other_tree, 'plan_file_merge', None) or
4563
(merger.base_tree is not None and
4564
not getattr(merger.base_tree, 'plan_file_merge', None)))):
4565
raise errors.BzrCommandError(
4566
gettext('Plan file merge unsupported: '
4567
'Merge type incompatible with tree formats.'))
3930
4569
def _get_merger_from_branch(self, tree, location, revision, remember,
3931
4570
possible_transports, pb):
3932
4571
"""Produce a merger from a location, assuming it refers to a branch."""
3933
from bzrlib.tag import _merge_tags_if_possible
3934
4572
# find the branch locations
3935
4573
other_loc, user_location = self._select_branch_location(tree, location,
3958
4596
if other_revision_id is None:
3959
4597
other_revision_id = _mod_revision.ensure_null(
3960
4598
other_branch.last_revision())
3961
# Remember where we merge from
3962
if ((remember or tree.branch.get_submit_branch() is None) and
3963
user_location is not None):
4599
# Remember where we merge from. We need to remember if:
4600
# - user specify a location (and we don't merge from the parent
4602
# - user ask to remember or there is no previous location set to merge
4603
# from and user didn't ask to *not* remember
4604
if (user_location is not None
4606
or (remember is None
4607
and tree.branch.get_submit_branch() is None)))):
3964
4608
tree.branch.set_submit_branch(other_branch.base)
3965
_merge_tags_if_possible(other_branch, tree.branch)
3966
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4609
# Merge tags (but don't set them in the master branch yet, the user
4610
# might revert this merge). Commit will propagate them.
4611
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4612
merger = _mod_merge.Merger.from_revision_ids(tree,
3967
4613
other_revision_id, base_revision_id, other_branch, base_branch)
3968
4614
if other_path != '':
3969
4615
allow_pending = False
4067
4713
def run(self, file_list=None, merge_type=None, show_base=False,
4068
4714
reprocess=False):
4069
from bzrlib.conflicts import restore
4715
from .conflicts import restore
4070
4716
if merge_type is None:
4071
4717
merge_type = _mod_merge.Merge3Merger
4072
tree, file_list = tree_files(file_list)
4718
tree, file_list = WorkingTree.open_containing_paths(file_list)
4073
4719
self.add_cleanup(tree.lock_write().unlock)
4074
4720
parents = tree.get_parent_ids()
4075
4721
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4722
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4077
4723
" merges. Not cherrypicking or"
4079
4725
repository = tree.branch.repository
4080
interesting_ids = None
4726
interesting_files = None
4081
4727
new_conflicts = []
4082
4728
conflicts = tree.conflicts()
4083
4729
if file_list is not None:
4084
interesting_ids = set()
4730
interesting_files = set()
4085
4731
for filename in file_list:
4086
file_id = tree.path2id(filename)
4732
if not tree.is_versioned(filename):
4088
4733
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4734
interesting_files.add(filename)
4735
if tree.kind(filename) != "directory":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4738
for path, ie in tree.iter_entries_by_dir(specific_files=[filename]):
4739
interesting_files.add(path)
4095
4740
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
4742
# Remerge only supports resolving contents conflicts
4098
4743
allowed_conflicts = ('text conflict', 'contents conflict')
4099
4744
restore_files = [c.path for c in conflicts
4100
4745
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4746
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4102
4747
tree.set_conflicts(ConflictList(new_conflicts))
4103
4748
if file_list is not None:
4104
4749
restore_files = file_list
4131
4776
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4778
Set files in the working tree back to the contents of a previous revision.
4134
4780
Giving a list of files will revert only those files. Otherwise, all files
4135
4781
will be reverted. If the revision is not specified with '--revision', the
4136
last committed revision is used.
4782
working tree basis revision is used. A revert operation affects only the
4783
working tree, not any revision history like the branch and repository or
4784
the working tree basis revision.
4138
4786
To remove only some changes, without reverting to a prior version, use
4139
merge instead. For example, "merge . --revision -2..-3" will remove the
4140
changes introduced by -2, without affecting the changes introduced by -1.
4141
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4787
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4788
will remove the changes introduced by the second last commit (-2), without
4789
affecting the changes introduced by the last commit (-1). To remove
4790
certain changes on a hunk-by-hunk basis, see the shelve command.
4791
To update the branch to a specific revision or the latest revision and
4792
update the working tree accordingly while preserving local changes, see the
4143
By default, any files that have been manually changed will be backed up
4144
first. (Files changed only by merge are not backed up.) Backup files have
4145
'.~#~' appended to their name, where # is a number.
4795
Uncommitted changes to files that are reverted will be discarded.
4796
Howver, by default, any files that have been manually changed will be
4797
backed up first. (Files changed only by merge are not backed up.) Backup
4798
files have '.~#~' appended to their name, where # is a number.
4147
4800
When you provide files, you can use their current pathname or the pathname
4148
4801
from the target revision. So you can use revert to "undelete" a file by
4385
5050
if remote_extra and not mine_only:
4386
5051
if printed_local is True:
4387
5052
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
5053
message(ngettext("You are missing %d revision:\n",
5054
"You are missing %d revisions:\n",
5055
len(remote_extra)) %
4389
5056
len(remote_extra))
5057
if remote_branch.supports_tags():
5058
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4390
5059
for revision in iter_log_revisions(remote_extra,
4391
5060
remote_branch.repository,
4393
5063
lf.log_revision(revision)
4394
5064
status_code = 1
4396
5066
if mine_only and not local_extra:
4397
5067
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
5068
message(gettext('This branch has no new revisions.\n'))
4399
5069
elif theirs_only and not remote_extra:
4400
5070
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
5071
message(gettext('Other branch has no new revisions.\n'))
4402
5072
elif not (mine_only or theirs_only or local_extra or
4404
5074
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
5076
message(gettext("Branches are up to date.\n"))
4407
5077
self.cleanup_now()
4408
5078
if not status_code and parent is None and other_branch is not None:
4409
5079
self.add_cleanup(local_branch.lock_write().unlock)
4542
5197
Option('long', help='Show commit date in annotations.'),
4546
5202
encoding_type = 'exact'
4548
5204
@display_command
4549
5205
def run(self, filename, all=False, long=False, revision=None,
4551
from bzrlib.annotate import annotate_file, annotate_file_tree
5206
show_ids=False, directory=None):
5207
from .annotate import (
4552
5210
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5211
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
5212
if wt is not None:
4555
5213
self.add_cleanup(wt.lock_read().unlock)
4557
5215
self.add_cleanup(branch.lock_read().unlock)
4558
5216
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
5217
self.add_cleanup(tree.lock_read().unlock)
5218
if wt is not None and revision is None:
4561
5219
file_id = wt.path2id(relpath)
4563
5221
file_id = tree.path2id(relpath)
4564
5222
if file_id is None:
4565
5223
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
5224
if wt is not None and revision is None:
4568
5225
# If there is a tree and we're not annotating historical
4569
5226
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
5227
annotate_file_tree(wt, relpath, self.outf, long, all,
5228
show_ids=show_ids, file_id=file_id)
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
5230
annotate_file_tree(tree, relpath, self.outf, long, all,
5231
show_ids=show_ids, branch=branch, file_id=file_id)
4577
5234
class cmd_re_sign(Command):
4581
5238
hidden = True # is this right ?
4582
5239
takes_args = ['revision_id*']
4583
takes_options = ['revision']
5240
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
5242
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
5243
if revision_id_list is not None and revision is not None:
4587
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5244
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4588
5245
if revision_id_list is None and revision is None:
4589
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
5246
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5247
b = WorkingTree.open_containing(directory)[0].branch
4591
5248
self.add_cleanup(b.lock_write().unlock)
4592
5249
return self._run(b, revision_id_list, revision)
4594
5251
def _run(self, b, revision_id_list, revision):
4595
import bzrlib.gpg as gpg
4596
gpg_strategy = gpg.GPGStrategy(b.get_config())
5252
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4597
5253
if revision_id_list is not None:
4598
5254
b.repository.start_write_group()
4600
5256
for revision_id in revision_id_list:
5257
revision_id = cache_utf8.encode(revision_id)
4601
5258
b.repository.sign_revision(revision_id, gpg_strategy)
4603
5260
b.repository.abort_write_group()
4654
5311
_see_also = ['checkouts', 'unbind']
4655
5312
takes_args = ['location?']
5313
takes_options = ['directory']
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
5315
def run(self, location=None, directory=u'.'):
5316
b, relpath = Branch.open_containing(directory)
4660
5317
if location is None:
4662
5319
location = b.get_old_bound_location()
4663
5320
except errors.UpgradeRequired:
4664
raise errors.BzrCommandError('No location supplied. '
4665
'This format does not remember old locations.')
5321
raise errors.BzrCommandError(gettext('No location supplied. '
5322
'This format does not remember old locations.'))
4667
5324
if location is None:
4668
5325
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
5326
raise errors.BzrCommandError(
5327
gettext('Branch is already bound'))
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
5329
raise errors.BzrCommandError(
5330
gettext('No location supplied'
5331
' and no previous location known'))
4673
5332
b_other = Branch.open(location)
4675
5334
b.bind(b_other)
4676
5335
except errors.DivergedBranches:
4677
raise errors.BzrCommandError('These branches have diverged.'
4678
' Try merging, and then bind again.')
5336
raise errors.BzrCommandError(gettext('These branches have diverged.'
5337
' Try merging, and then bind again.'))
4679
5338
if b.get_config().has_explicit_nickname():
4680
5339
b.nick = b_other.nick
4747
5407
self.add_cleanup(tree.lock_write().unlock)
4749
5409
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5410
return self._run(b, tree, dry_run, verbose, revision, force,
4752
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
from bzrlib.log import log_formatter, show_log
4754
from bzrlib.uncommit import uncommit
5413
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5415
from .log import log_formatter, show_log
5416
from .uncommit import uncommit
4756
5418
last_revno, last_rev_id = b.last_revision_info()
4785
5447
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
5450
self.outf.write(gettext('Dry-run, pretending to remove'
5451
' the above revisions.\n'))
4791
self.outf.write('The above revision(s) will be removed.\n')
5453
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
5456
if not ui.ui_factory.confirm_action(
5457
gettext(u'Uncommit these revisions'),
5458
'breezy.builtins.uncommit',
5460
self.outf.write(gettext('Canceled\n'))
4798
5463
mutter('Uncommitting from {%s} to {%s}',
4799
5464
last_rev_id, rev_id)
4800
5465
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
5466
revno=revno, local=local, keep_tags=keep_tags)
5467
self.outf.write(gettext('You can restore the old tip by running:\n'
5468
' brz pull . -r revid:%s\n') % last_rev_id)
4806
5471
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
5472
__doc__ = """Break a dead lock.
5474
This command breaks a lock on a repository, branch, working directory or
4809
5477
CAUTION: Locks should only be broken when you are sure that the process
4810
5478
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
5480
You can get information on what locks are open via the 'brz info
4813
5481
[location]' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
5485
brz break-lock brz+ssh://example.com/brz/foo
5486
brz break-lock --conf ~/.bazaar
4819
5489
takes_args = ['location?']
5492
help='LOCATION is the directory where the config lock is.'),
5494
help='Do not ask for confirmation before breaking the lock.'),
4821
def run(self, location=None, show=False):
5497
def run(self, location=None, config=False, force=False):
4822
5498
if location is None:
4823
5499
location = u'.'
4824
control, relpath = bzrdir.BzrDir.open_containing(location)
4826
control.break_lock()
4827
except NotImplementedError:
5501
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5503
{'breezy.lockdir.break': True})
5505
conf = _mod_config.LockableConfig(file_name=location)
5508
control, relpath = controldir.ControlDir.open_containing(location)
5510
control.break_lock()
5511
except NotImplementedError:
4831
5515
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5516
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4834
5518
This just prints a line to signal when it is ready, then blocks on stdin.
4852
5536
help='Serve on stdin/out for use from inetd or sshd.'),
4853
5537
RegistryOption('protocol',
4854
5538
help="Protocol to serve.",
4855
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5539
lazy_registry=('breezy.transport', 'transport_server_registry'),
4856
5540
value_switches=True),
5542
help='Listen for connections on nominated address.', type=text_type),
4858
help='Listen for connections on nominated port of the form '
4859
'[hostname:]portnumber. Passing 0 as the port number will '
4860
'result in a dynamically allocated port. The default port '
4861
'depends on the protocol.',
4864
help='Serve contents of this directory.',
5544
help='Listen for connections on nominated port. Passing 0 as '
5545
'the port number will result in a dynamically allocated '
5546
'port. The default port depends on the protocol.',
5548
custom_help('directory',
5549
help='Serve contents of this directory.'),
4866
5550
Option('allow-writes',
4867
5551
help='By default the server is a readonly server. Supplying '
4868
5552
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
5553
'the served directory and below. Note that ``brz serve`` '
4870
5554
'does not perform authentication, so unless some form of '
4871
5555
'external authentication is arranged supplying this '
4872
5556
'option leads to global uncontrolled write access to your '
5559
Option('client-timeout', type=float,
5560
help='Override the default idle client timeout (5min).'),
4877
def get_host_and_port(self, port):
4878
"""Return the host and port to run the smart server on.
4880
If 'port' is None, None will be returned for the host and port.
4882
If 'port' has a colon in it, the string before the colon will be
4883
interpreted as the host.
4885
:param port: A string of the port to run the server on.
4886
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
and port is an integer TCP/IP port.
4890
if port is not None:
4892
host, port = port.split(':')
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4898
from bzrlib.transport import get_transport, transport_server_registry
5563
def run(self, listen=None, port=None, inet=False, directory=None,
5564
allow_writes=False, protocol=None, client_timeout=None):
5565
from . import transport
4899
5566
if directory is None:
4900
directory = os.getcwd()
5567
directory = osutils.getcwd()
4901
5568
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
url = urlutils.local_path_to_url(directory)
5569
protocol = transport.transport_server_registry.get()
5570
url = transport.location_to_url(directory)
4905
5571
if not allow_writes:
4906
5572
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
5573
t = transport.get_transport_from_url(url)
5574
protocol(t, listen, port, inet, client_timeout)
4911
5577
class cmd_join(Command):
4931
5597
def run(self, tree, reference=False):
5598
from breezy.mutabletree import BadReferenceTarget
4932
5599
sub_tree = WorkingTree.open(tree)
4933
5600
parent_dir = osutils.dirname(sub_tree.basedir)
4934
5601
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4935
5602
repo = containing_tree.branch.repository
4936
5603
if not repo.supports_rich_root():
4937
raise errors.BzrCommandError(
5604
raise errors.BzrCommandError(gettext(
4938
5605
"Can't join trees because %s doesn't support rich root data.\n"
4939
"You can use bzr upgrade on the repository."
5606
"You can use brz upgrade on the repository.")
4943
5610
containing_tree.add_reference(sub_tree)
4944
except errors.BadReferenceTarget, e:
5611
except BadReferenceTarget as e:
4945
5612
# XXX: Would be better to just raise a nicely printable
4946
5613
# exception from the real origin. Also below. mbp 20070306
4947
raise errors.BzrCommandError("Cannot join %s. %s" %
5614
raise errors.BzrCommandError(
5615
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4951
5618
containing_tree.subsume(sub_tree)
4952
except errors.BadSubsumeSource, e:
4953
raise errors.BzrCommandError("Cannot join %s. %s" %
5619
except errors.BadSubsumeSource as e:
5620
raise errors.BzrCommandError(
5621
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4957
5624
class cmd_split(Command):
5013
5681
diff='Normal unified diff.',
5014
5682
plain='No patch, just directive.'),
5015
5683
Option('sign', help='GPG-sign the directive.'), 'revision',
5016
Option('mail-to', type=str,
5684
Option('mail-to', type=text_type,
5017
5685
help='Instead of printing the directive, email to this address.'),
5018
Option('message', type=str, short_name='m',
5686
Option('message', type=text_type, short_name='m',
5019
5687
help='Message to use when committing this merge.')
5022
5690
encoding_type = 'exact'
5024
5692
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5025
sign=False, revision=None, mail_to=None, message=None):
5026
from bzrlib.revision import ensure_null, NULL_REVISION
5693
sign=False, revision=None, mail_to=None, message=None,
5695
from .revision import ensure_null, NULL_REVISION
5027
5696
include_patch, include_bundle = {
5028
5697
'plain': (False, False),
5029
5698
'diff': (True, False),
5030
5699
'bundle': (True, True),
5032
branch = Branch.open('.')
5701
branch = Branch.open(directory)
5033
5702
stored_submit_branch = branch.get_submit_branch()
5034
5703
if submit_branch is None:
5035
5704
submit_branch = stored_submit_branch
5166
5842
help='Branch to generate the submission from, '
5167
5843
'rather than the one containing the working directory.',
5168
5844
short_name='f',
5170
5846
Option('output', short_name='o',
5171
5847
help='Write merge directive to this file or directory; '
5172
5848
'use - for stdout.',
5174
5850
Option('strict',
5175
5851
help='Refuse to send if there are uncommitted changes in'
5176
5852
' the working tree, --no-strict disables the check.'),
5177
5853
Option('mail-to', help='Mail the request to this address.',
5181
Option('body', help='Body for the email.', type=unicode),
5857
Option('body', help='Body for the email.', type=text_type),
5182
5858
RegistryOption('format',
5183
5859
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
5860
lazy_registry=('breezy.send', 'format_registry')),
5187
5863
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
no_patch=False, revision=None, remember=False, output=None,
5864
no_patch=False, revision=None, remember=None, output=None,
5189
5865
format=None, mail_to=None, message=None, body=None,
5190
5866
strict=None, **kwargs):
5191
from bzrlib.send import send
5867
from .send import send
5192
5868
return send(submit_branch, revision, public_branch, remember,
5193
5869
format, no_bundle, no_patch, output,
5194
5870
kwargs.get('from', '.'), mail_to, message, body,
5318
5991
self.add_cleanup(branch.lock_write().unlock)
5320
5993
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5994
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5322
5995
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5996
note(gettext('Deleted tag %s.') % tag_name)
5326
5999
if len(revision) != 1:
5327
raise errors.BzrCommandError(
6000
raise errors.BzrCommandError(gettext(
5328
6001
"Tags can only be placed on a single revision, "
5330
6003
revision_id = revision[0].as_revision_id(branch)
5332
6005
revision_id = branch.last_revision()
5333
6006
if tag_name is None:
5334
6007
tag_name = branch.automatic_tag_name(revision_id)
5335
6008
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
6009
raise errors.BzrCommandError(gettext(
6010
"Please specify a tag name."))
6012
existing_target = branch.tags.lookup_tag(tag_name)
6013
except errors.NoSuchTag:
6014
existing_target = None
6015
if not force and existing_target not in (None, revision_id):
5339
6016
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
6017
if existing_target == revision_id:
6018
note(gettext('Tag %s already exists for that revision.') % tag_name)
6020
branch.tags.set_tag(tag_name, revision_id)
6021
if existing_target is None:
6022
note(gettext('Created tag %s.') % tag_name)
6024
note(gettext('Updated tag %s.') % tag_name)
5344
6027
class cmd_tags(Command):
5350
6033
_see_also = ['tag']
5351
6034
takes_options = [
5353
help='Branch whose tags should be displayed.',
5357
RegistryOption.from_kwargs('sort',
6035
custom_help('directory',
6036
help='Branch whose tags should be displayed.'),
6037
RegistryOption('sort',
5358
6038
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
6039
lazy_registry=('breezy.tag', 'tag_sort_methods')
5366
6045
@display_command
6046
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6047
from .tag import tag_sort_methods
5373
6048
branch, relpath = Branch.open_containing(directory)
5375
tags = branch.tags.get_tag_dict().items()
6050
tags = list(viewitems(branch.tags.get_tag_dict()))
5379
6054
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
6056
# Restrict to the specified range
6057
tags = self._tags_for_range(branch, revision)
6059
sort = tag_sort_methods.get()
5400
6061
if not show_ids:
5401
6062
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
6063
for index, (tag, revid) in enumerate(tags):
5413
6076
for tag, revspec in tags:
5414
6077
self.outf.write('%-20s %s\n' % (tag, revspec))
6079
def _tags_for_range(self, branch, revision):
6081
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6082
revid1, revid2 = rev1.rev_id, rev2.rev_id
6083
# _get_revision_range will always set revid2 if it's not specified.
6084
# If revid1 is None, it means we want to start from the branch
6085
# origin which is always a valid ancestor. If revid1 == revid2, the
6086
# ancestry check is useless.
6087
if revid1 and revid1 != revid2:
6088
# FIXME: We really want to use the same graph than
6089
# branch.iter_merge_sorted_revisions below, but this is not
6090
# easily available -- vila 2011-09-23
6091
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6092
# We don't want to output anything in this case...
6094
# only show revisions between revid1 and revid2 (inclusive)
6095
tagged_revids = branch.tags.get_reverse_tag_dict()
6097
for r in branch.iter_merge_sorted_revisions(
6098
start_revision_id=revid2, stop_revision_id=revid1,
6099
stop_rule='include'):
6100
revid_tags = tagged_revids.get(r[0], None)
6102
found.extend([(tag, r[0]) for tag in revid_tags])
5417
6106
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
6107
__doc__ = """Reconfigure the type of a brz directory.
5420
6109
A target configuration must be specified.
5432
6121
takes_args = ['location?']
5433
6122
takes_options = [
5434
6123
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
6126
help='The relation between branch and tree.',
5438
6127
value_switches=True, enum_switch=False,
5439
6128
branch='Reconfigure to be an unbound branch with no working tree.',
5440
6129
tree='Reconfigure to be an unbound branch with a working tree.',
5441
6130
checkout='Reconfigure to be a bound branch with a working tree.',
5442
6131
lightweight_checkout='Reconfigure to be a lightweight'
5443
6132
' checkout (with no local history).',
6134
RegistryOption.from_kwargs(
6136
title='Repository type',
6137
help='Location fo the repository.',
6138
value_switches=True, enum_switch=False,
5444
6139
standalone='Reconfigure to be a standalone branch '
5445
6140
'(i.e. stop using shared repository).',
5446
6141
use_shared='Reconfigure to use a shared repository.',
6143
RegistryOption.from_kwargs(
6145
title='Trees in Repository',
6146
help='Whether new branches in the repository have trees.',
6147
value_switches=True, enum_switch=False,
5447
6148
with_trees='Reconfigure repository to create '
5448
6149
'working trees on branches by default.',
5449
6150
with_no_trees='Reconfigure repository to not create '
5450
6151
'working trees on branches by default.'
5452
Option('bind-to', help='Branch to bind checkout to.', type=str),
6153
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5453
6154
Option('force',
5454
6155
help='Perform reconfiguration even if local changes'
5455
6156
' will be lost.'),
5456
6157
Option('stacked-on',
5457
6158
help='Reconfigure a branch to be stacked on another branch.',
5460
6161
Option('unstacked',
5461
6162
help='Reconfigure a branch to be unstacked. This '
5476
6177
# At the moment you can use --stacked-on and a different
5477
6178
# reconfiguration shape at the same time; there seems no good reason
5479
if target_type is None:
6180
if (tree_type is None and
6181
repository_type is None and
6182
repository_trees is None):
5480
6183
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5485
elif target_type == 'branch':
6186
raise errors.BzrCommandError(gettext('No target configuration '
6188
reconfiguration = None
6189
if tree_type == 'branch':
5486
6190
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
elif target_type == 'tree':
6191
elif tree_type == 'tree':
5488
6192
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
elif target_type == 'checkout':
6193
elif tree_type == 'checkout':
5490
6194
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
6195
directory, bind_to)
5492
elif target_type == 'lightweight-checkout':
6196
elif tree_type == 'lightweight-checkout':
5493
6197
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
6198
directory, bind_to)
5495
elif target_type == 'use-shared':
6200
reconfiguration.apply(force)
6201
reconfiguration = None
6202
if repository_type == 'use-shared':
5496
6203
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
elif target_type == 'standalone':
6204
elif repository_type == 'standalone':
5498
6205
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
6207
reconfiguration.apply(force)
6208
reconfiguration = None
6209
if repository_trees == 'with-trees':
5500
6210
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
6211
directory, True)
5502
elif target_type == 'with-no-trees':
6212
elif repository_trees == 'with-no-trees':
5503
6213
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
6214
directory, False)
5505
reconfiguration.apply(force)
6216
reconfiguration.apply(force)
6217
reconfiguration = None
5508
6220
class cmd_switch(Command):
5531
6243
takes_args = ['to_location?']
5532
takes_options = [Option('force',
6244
takes_options = ['directory',
5533
6246
help='Switch even if local commits will be lost.'),
5535
6248
Option('create-branch', short_name='b',
5536
6249
help='Create the target branch from this one before'
5537
6250
' switching to it.'),
6252
help='Store and restore uncommitted changes in the'
5540
6256
def run(self, to_location=None, force=False, create_branch=False,
5542
from bzrlib import switch
6257
revision=None, directory=u'.', store=False):
6258
from . import switch
6259
tree_location = directory
5544
6260
revision = _get_one_revision('switch', revision)
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6261
possible_transports = []
6262
control_dir = controldir.ControlDir.open_containing(tree_location,
6263
possible_transports=possible_transports)[0]
5546
6264
if to_location is None:
5547
6265
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
6266
raise errors.BzrCommandError(gettext('You must supply either a'
6267
' revision or a location'))
6268
to_location = tree_location
5552
branch = control_dir.open_branch()
6270
branch = control_dir.open_branch(
6271
possible_transports=possible_transports)
5553
6272
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
6273
except errors.NotBranchError:
5556
6275
had_explicit_nick = False
5557
6276
if create_branch:
5558
6277
if branch is None:
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
6278
raise errors.BzrCommandError(
6279
gettext('cannot create branch without source branch'))
6280
to_location = lookup_new_sibling_branch(control_dir, to_location,
6281
possible_transports=possible_transports)
6282
to_branch = branch.controldir.sprout(to_location,
6283
possible_transports=possible_transports,
6284
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
6287
to_branch = Branch.open(to_location,
6288
possible_transports=possible_transports)
5573
6289
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
6290
to_branch = open_sibling_branch(control_dir, to_location,
6291
possible_transports=possible_transports)
5577
6292
if revision is not None:
5578
6293
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
6295
switch.switch(control_dir, to_branch, force, revision_id=revision,
6296
store_uncommitted=store)
6297
except controldir.BranchReferenceLoop:
6298
raise errors.BzrCommandError(
6299
gettext('switching would create a branch reference loop. '
6300
'Use the "bzr up" command to switch to a '
6301
'different revision.'))
5580
6302
if had_explicit_nick:
5581
6303
branch = control_dir.open_branch() #get the new branch!
5582
6304
branch.nick = to_branch.nick
5583
note('Switched to branch: %s',
6305
note(gettext('Switched to branch: %s'),
5584
6306
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
5604
6310
class cmd_view(Command):
5691
tree, file_list = tree_files(file_list, apply_view=False)
6397
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
6399
current_view, view_dict = tree.views.get_view_info()
5693
6400
if name is None:
5694
6401
name = current_view
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
6404
raise errors.BzrCommandError(gettext(
6405
"Both --delete and a file list specified"))
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
6407
raise errors.BzrCommandError(gettext(
6408
"Both --delete and --switch specified"))
5703
6410
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
6411
self.outf.write(gettext("Deleted all views.\n"))
5705
6412
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
6413
raise errors.BzrCommandError(gettext("No current view to delete"))
5708
6415
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
6416
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
6419
raise errors.BzrCommandError(gettext(
6420
"Both --switch and a file list specified"))
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
6422
raise errors.BzrCommandError(gettext(
6423
"Both --switch and --all specified"))
5717
6424
elif switch == 'off':
5718
6425
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
6426
raise errors.BzrCommandError(gettext("No current view to disable"))
5720
6427
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
6428
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5723
6430
tree.views.set_view_info(switch, view_dict)
5724
6431
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5728
self.outf.write('Views defined:\n')
6435
self.outf.write(gettext('Views defined:\n'))
5729
6436
for view in sorted(view_dict):
5730
6437
if view == current_view:
5734
6441
view_str = views.view_display_str(view_dict[view])
5735
6442
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5737
self.outf.write('No views defined.\n')
6444
self.outf.write(gettext('No views defined.\n'))
5738
6445
elif file_list:
5739
6446
if name is None:
5740
6447
# No name given and no current view set
5742
6449
elif name == 'off':
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
6450
raise errors.BzrCommandError(gettext(
6451
"Cannot change the 'off' pseudo view"))
5745
6452
tree.views.set_view(name, sorted(file_list))
5746
6453
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6454
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5749
6456
# list the files
5750
6457
if name is None:
5751
6458
# No name given and no current view set
5752
self.outf.write('No current view.\n')
6459
self.outf.write(gettext('No current view.\n'))
5754
6461
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6462
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5758
6465
class cmd_hooks(Command):
5786
6493
Remove the branch at repo/trunk::
5788
bzr remove-branch repo/trunk
6495
brz remove-branch repo/trunk
5792
6499
takes_args = ["location?"]
6501
takes_options = ['directory',
6502
Option('force', help='Remove branch even if it is the active branch.')]
5794
6504
aliases = ["rmbranch"]
5796
def run(self, location=None):
5797
if location is None:
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
6506
def run(self, directory=None, location=None, force=False):
6507
br = open_nearby_branch(near=directory, location=location)
6508
if not force and br.controldir.has_workingtree():
6510
active_branch = br.controldir.open_branch(name="")
6511
except errors.NotBranchError:
6512
active_branch = None
6513
if (active_branch is not None and
6514
br.control_url == active_branch.control_url):
6515
raise errors.BzrCommandError(
6516
gettext("Branch is active. Use --force to remove it."))
6517
br.controldir.destroy_branch(br.name)
5803
6520
class cmd_shelve(Command):
5804
6521
__doc__ = """Temporarily set aside some changes from the current tree.
5824
6541
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6542
restore the most recently shelved changes.
6544
For complicated changes, it is possible to edit the changes in a separate
6545
editor program to decide what the file remaining in the working copy
6546
should look like. To do this, add the configuration option
6548
change_editor = PROGRAM @new_path @old_path
6550
where @new_path is replaced with the path of the new version of the
6551
file and @old_path is replaced with the path of the old version of
6552
the file. The PROGRAM should save the new file with the desired
6553
contents of the file in the working tree.
5828
6557
takes_args = ['file*']
5830
6559
takes_options = [
5832
6562
Option('all', help='Shelve all changes.'),
5834
6564
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
6565
breezy.option.diff_writer_registry,
5836
6566
value_switches=True, enum_switch=False),
5838
6568
Option('list', help='List shelved changes.'),
5839
6569
Option('destroy',
5840
6570
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6572
_see_also = ['unshelve', 'configuration']
5844
6574
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6575
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
6577
return self.run_for_list(directory=directory)
6578
from .shelf_ui import Shelver
5849
6579
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
6580
writer = breezy.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6582
shelver = Shelver.from_args(writer(self.outf), revision, all,
6583
file_list, message, destroy=destroy, directory=directory)
5922
6655
To check what clean-tree will do, use --dry-run.
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
Option('detritus', help='Delete conflict files, merge'
6657
takes_options = ['directory',
6658
Option('ignored', help='Delete all ignored files.'),
6659
Option('detritus', help='Delete conflict files, merge and revert'
5926
6660
' backups, and failed selftest dirs.'),
5927
6661
Option('unknown',
5928
help='Delete files unknown to bzr (default).'),
6662
help='Delete files unknown to brz (default).'),
5929
6663
Option('dry-run', help='Show files to delete instead of'
5930
6664
' deleting them.'),
5931
6665
Option('force', help='Do not prompt before deleting.')]
5932
6666
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
from bzrlib.clean_tree import clean_tree
6667
force=False, directory=u'.'):
6668
from .clean_tree import clean_tree
5935
6669
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
6673
clean_tree(directory, unknown=unknown, ignored=ignored,
6674
detritus=detritus, dry_run=dry_run, no_prompt=force)
5943
6677
class cmd_reference(Command):
5957
6691
if path is not None:
5958
6692
branchdir = path
5959
6693
tree, branch, relpath =(
5960
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6694
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
5961
6695
if path is not None:
5963
6697
if tree is None:
5964
6698
tree = branch.basis_tree()
5965
6699
if path is None:
5966
info = branch._get_all_reference_info().iteritems()
6700
info = viewitems(branch._get_all_reference_info())
5967
6701
self._display_reference_info(tree, branch, info)
5969
file_id = tree.path2id(path)
6703
if not tree.is_versioned(path):
5971
6704
raise errors.NotVersionedError(path)
5972
6705
if location is None:
5973
info = [(file_id, branch.get_reference_info(file_id))]
6706
info = [(path, branch.get_reference_info(path))]
5974
6707
self._display_reference_info(tree, branch, info)
5976
branch.set_reference_info(file_id, path, location)
6709
branch.set_reference_info(
6710
path, location, file_id=tree.path2id(path))
5978
6712
def _display_reference_info(self, tree, branch, info):
5980
for file_id, (path, location) in info:
5982
path = tree.id2path(file_id)
5983
except errors.NoSuchId:
6714
for path, (location, file_id) in info:
5985
6715
ref_list.append((path, location))
5986
6716
for path, location in sorted(ref_list):
5987
6717
self.outf.write('%s %s\n' % (path, location))
6720
class cmd_export_pot(Command):
6721
__doc__ = """Export command helps and error messages in po format."""
6724
takes_options = [Option('plugin',
6725
help='Export help text from named command '\
6726
'(defaults to all built in commands).',
6728
Option('include-duplicates',
6729
help='Output multiple copies of the same msgid '
6730
'string if it appears more than once.'),
6733
def run(self, plugin=None, include_duplicates=False):
6734
from .export_pot import export_pot
6735
export_pot(self.outf, plugin, include_duplicates)
6738
class cmd_import(Command):
6739
__doc__ = """Import sources from a directory, tarball or zip file
6741
This command will import a directory, tarball or zip file into a bzr
6742
tree, replacing any versioned files already present. If a directory is
6743
specified, it is used as the target. If the directory does not exist, or
6744
is not versioned, it is created.
6746
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6748
If the tarball or zip has a single root directory, that directory is
6749
stripped when extracting the tarball. This is not done for directories.
6752
takes_args = ['source', 'tree?']
6754
def run(self, source, tree=None):
6755
from .upstream_import import do_import
6756
do_import(source, tree)
6759
class cmd_link_tree(Command):
6760
__doc__ = """Hardlink matching files to another tree.
6762
Only files with identical content and execute bit will be linked.
6765
takes_args = ['location']
6767
def run(self, location):
6768
from .transform import link_tree
6769
target_tree = WorkingTree.open_containing(".")[0]
6770
source_tree = WorkingTree.open(location)
6771
target_tree.lock_write()
6773
source_tree.lock_read()
6775
link_tree(target_tree, source_tree)
6777
source_tree.unlock()
6779
target_tree.unlock()
6782
class cmd_fetch_ghosts(Command):
6783
__doc__ = """Attempt to retrieve ghosts from another branch.
6785
If the other branch is not supplied, the last-pulled branch is used.
6789
aliases = ['fetch-missing']
6790
takes_args = ['branch?']
6791
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6793
def run(self, branch=None, no_fix=False):
6794
from .fetch_ghosts import GhostFetcher
6795
installed, failed = GhostFetcher.from_cmdline(branch).run()
6796
if len(installed) > 0:
6797
self.outf.write("Installed:\n")
6798
for rev in installed:
6799
self.outf.write(rev + "\n")
6801
self.outf.write("Still missing:\n")
6803
self.outf.write(rev + "\n")
6804
if not no_fix and len(installed) > 0:
6805
cmd_reconcile().run(".")
5990
6808
def _register_lazy_builtins():
5991
6809
# register lazy builtins from other modules; called at startup and should
5992
6810
# be only called once.
5993
6811
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6812
('cmd_bisect', [], 'breezy.bisect'),
6813
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6814
('cmd_config', [], 'breezy.config'),
6815
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
6816
('cmd_version_info', [], 'breezy.cmd_version_info'),
6817
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6818
('cmd_conflicts', [], 'breezy.conflicts'),
6819
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6820
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6821
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6822
('cmd_test_script', [], 'breezy.cmd_test_script'),
6001
6824
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
