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