55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
61
from breezy.branch import Branch
62
from breezy.conflicts import ConflictList
63
from breezy.transport import memory
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
69
from .commands import (
65
71
builtin_command_registry,
68
from bzrlib.option import (
73
79
_parse_revision_str,
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
81
from .revisionspec import (
91
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
94
def _get_branch_location(control_dir, possible_transports=None):
95
"""Return location of branch for this control dir."""
97
target = control_dir.get_branch_reference()
98
except errors.NotBranchError:
99
return control_dir.root_transport.base
100
if target is not None:
102
this_branch = control_dir.open_branch(
103
possible_transports=possible_transports)
104
# This may be a heavy checkout, where we want the master branch
105
master_location = this_branch.get_bound_location()
106
if master_location is not None:
107
return master_location
108
# If not, use a local sibling
109
return this_branch.base
112
def _is_colocated(control_dir, possible_transports=None):
113
"""Check if the branch in control_dir is colocated.
115
:param control_dir: Control directory
116
:return: Tuple with boolean indicating whether the branch is colocated
117
and the full URL to the actual branch
119
# This path is meant to be relative to the existing branch
120
this_url = _get_branch_location(
121
control_dir, possible_transports=possible_transports)
122
# Perhaps the target control dir supports colocated branches?
124
root = controldir.ControlDir.open(
125
this_url, possible_transports=possible_transports)
126
except errors.NotBranchError:
127
return (False, this_url)
130
control_dir.open_workingtree()
131
except (errors.NoWorkingTree, errors.NotLocalUrl):
132
return (False, this_url)
135
root._format.colocated_branches and
136
control_dir.control_url == root.control_url,
140
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
141
"""Lookup the location for a new sibling branch.
143
:param control_dir: Control directory to find sibling branches from
144
:param location: Name of the new branch
145
:return: Full location to the new branch
147
location = directory_service.directories.dereference(location)
148
if '/' not in location and '\\' not in location:
149
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
152
return urlutils.join_segment_parameters(
153
this_url, {"branch": urlutils.escape(location)})
155
return urlutils.join(this_url, '..', urlutils.escape(location))
159
def open_sibling_branch(control_dir, location, possible_transports=None):
160
"""Open a branch, possibly a sibling of another.
162
:param control_dir: Control directory relative to which to lookup the
164
:param location: Location to look up
165
:return: branch to open
168
# Perhaps it's a colocated branch?
169
return control_dir.open_branch(
170
location, possible_transports=possible_transports)
171
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
172
this_url = _get_branch_location(control_dir)
175
this_url, '..', urlutils.escape(location)))
178
def open_nearby_branch(near=None, location=None, possible_transports=None):
179
"""Open a nearby branch.
181
:param near: Optional location of container from which to open branch
182
:param location: Location of the branch
183
:return: Branch instance
190
location, possible_transports=possible_transports)
191
except errors.NotBranchError:
193
cdir = controldir.ControlDir.open(
194
near, possible_transports=possible_transports)
195
return open_sibling_branch(
196
cdir, location, possible_transports=possible_transports)
199
def iter_sibling_branches(control_dir, possible_transports=None):
200
"""Iterate over the siblings of a branch.
202
:param control_dir: Control directory for which to look up the siblings
203
:return: Iterator over tuples with branch name and branch object
206
reference = control_dir.get_branch_reference()
207
except errors.NotBranchError:
208
# There is no active branch, just return the colocated branches.
209
for name, branch in viewitems(control_dir.get_branches()):
212
if reference is not None:
213
ref_branch = Branch.open(
214
reference, possible_transports=possible_transports)
217
if ref_branch is None or ref_branch.name:
218
if ref_branch is not None:
219
control_dir = ref_branch.controldir
220
for name, branch in viewitems(control_dir.get_branches()):
223
repo = ref_branch.controldir.find_repository()
224
for branch in repo.find_branches(using=True):
225
name = urlutils.relative_url(
226
repo.user_url, branch.user_url).rstrip("/")
88
230
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
223
296
def _get_view_info_for_change_reporter(tree):
224
297
"""Get the view information from a tree for change reporting."""
342
432
takes_args = ['revision_id?']
343
takes_options = ['revision']
433
takes_options = ['directory', 'revision']
344
434
# cat-revision is more for frontends so should be exact
345
435
encoding = 'strict'
347
437
def print_revision(self, revisions, revid):
348
438
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
439
record = next(stream)
350
440
if record.storage_kind == 'absent':
351
441
raise errors.NoSuchRevision(revisions, revid)
352
442
revtext = record.get_bytes_as('fulltext')
353
443
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
446
def run(self, revision_id=None, revision=None, directory=u'.'):
357
447
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
448
raise errors.BzrCommandError(gettext('You can only supply one of'
449
' revision_id or --revision'))
360
450
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
451
raise errors.BzrCommandError(
452
gettext('You must supply either --revision or a revision_id'))
454
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
456
revisions = b.repository.revisions
366
457
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
458
raise errors.BzrCommandError(
459
gettext('Repository %r does not support '
460
'access to raw revision texts'))
370
b.repository.lock_read()
462
with b.repository.lock_read():
372
463
# TODO: jam 20060112 should cat-revision always output utf-8?
373
464
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
465
revision_id = cache_utf8.encode(revision_id)
376
467
self.print_revision(revisions, revision_id)
377
468
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
470
"The repository {0} contains no revision {1}.").format(
471
b.repository.base, revision_id.decode('utf-8'))
380
472
raise errors.BzrCommandError(msg)
381
473
elif revision is not None:
382
474
for rev in revision:
384
476
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
477
gettext('You cannot specify a NULL revision.'))
386
478
rev_id = rev.as_revision_id(b)
387
479
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
395
PATH is a btree index file, it can be any URL. This includes things like
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
398
By default, the tuples stored in the index file will be displayed. With
399
--raw, we will uncompress the pages, but otherwise display the raw bytes
403
# TODO: Do we want to dump the internal nodes as well?
404
# TODO: It would be nice to be able to dump the un-parsed information,
405
# rather than only going through iter_all_entries. However, this is
406
# good enough for a start
408
encoding_type = 'exact'
409
takes_args = ['path']
410
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
411
' rather than the parsed tuples.'),
414
def run(self, path, raw=False):
415
dirname, basename = osutils.split(path)
416
t = transport.get_transport(dirname)
418
self._dump_raw_bytes(t, basename)
420
self._dump_entries(t, basename)
422
def _get_index_and_bytes(self, trans, basename):
423
"""Create a BTreeGraphIndex and raw bytes."""
424
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
427
bt._size = len(bytes)
430
def _dump_raw_bytes(self, trans, basename):
433
# We need to parse at least the root node.
434
# This is because the first page of every row starts with an
435
# uncompressed header.
436
bt, bytes = self._get_index_and_bytes(trans, basename)
437
for page_idx, page_start in enumerate(xrange(0, len(bytes),
438
btree_index._PAGE_SIZE)):
439
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
440
page_bytes = bytes[page_start:page_end]
442
self.outf.write('Root node:\n')
443
header_end, data = bt._parse_header_from_bytes(page_bytes)
444
self.outf.write(page_bytes[:header_end])
446
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
451
def _dump_entries(self, trans, basename):
453
st = trans.stat(basename)
454
except errors.TransportNotPossible:
455
# We can't stat, so we'll fake it because we have to do the 'get()'
457
bt, _ = self._get_index_and_bytes(trans, basename)
459
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
460
for node in bt.iter_all_entries():
461
# Node is made up of:
462
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
473
482
class cmd_remove_tree(Command):
476
485
Since a lightweight checkout is little more than a working tree
477
486
this will refuse to run against one.
479
To re-create the working tree, use "bzr checkout".
488
To re-create the working tree, use "brz checkout".
481
490
_see_also = ['checkout', 'working-trees']
482
491
takes_args = ['location*']
483
492
takes_options = [
485
494
help='Remove the working tree even if it has '
486
'uncommitted changes.'),
495
'uncommitted or shelved changes.'),
489
498
def run(self, location_list, force=False):
490
499
if not location_list:
500
location_list = ['.']
493
502
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
503
d = controldir.ControlDir.open(location)
497
506
working = d.open_workingtree()
498
507
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
508
raise errors.BzrCommandError(
509
gettext("No working tree to remove"))
500
510
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
511
raise errors.BzrCommandError(
512
gettext("You cannot remove the working tree"
513
" of a remote path"))
504
515
if (working.has_changes()):
505
516
raise errors.UncommittedChanges(working)
517
if working.get_shelf_manager().last_shelf() is not None:
518
raise errors.ShelvedChanges(working)
507
520
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
521
raise errors.BzrCommandError(
522
gettext("You cannot remove the working tree"
523
" from a lightweight checkout"))
511
525
d.destroy_workingtree()
528
class cmd_repair_workingtree(Command):
529
__doc__ = """Reset the working tree state file.
531
This is not meant to be used normally, but more as a way to recover from
532
filesystem corruption, etc. This rebuilds the working inventory back to a
533
'known good' state. Any new modifications (adding a file, renaming, etc)
534
will be lost, though modified files will still be detected as such.
536
Most users will want something more like "brz revert" or "brz update"
537
unless the state file has become corrupted.
539
By default this attempts to recover the current state by looking at the
540
headers of the state file. If the state file is too corrupted to even do
541
that, you can supply --revision to force the state of the tree.
545
'revision', 'directory',
547
help='Reset the tree even if it doesn\'t appear to be'
552
def run(self, revision=None, directory='.', force=False):
553
tree, _ = WorkingTree.open_containing(directory)
554
self.add_cleanup(tree.lock_tree_write().unlock)
558
except errors.BzrError:
559
pass # There seems to be a real error here, so we'll reset
562
raise errors.BzrCommandError(gettext(
563
'The tree does not appear to be corrupt. You probably'
564
' want "brz revert" instead. Use "--force" if you are'
565
' sure you want to reset the working tree.'))
569
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
571
tree.reset_state(revision_ids)
572
except errors.BzrError:
573
if revision_ids is None:
574
extra = gettext(', the header appears corrupt, try passing '
575
'-r -1 to set the state to the last commit')
578
raise errors.BzrCommandError(
579
gettext('failed to reset the tree state{0}').format(extra))
514
582
class cmd_revno(Command):
515
583
__doc__ = """Show current revision number.
520
588
_see_also = ['info']
521
589
takes_args = ['location?']
522
590
takes_options = [
523
Option('tree', help='Show revno of working tree'),
591
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
596
def run(self, tree=False, location=u'.', revision=None):
597
if revision is not None and tree:
598
raise errors.BzrCommandError(
599
gettext("--tree and --revision can not be used together"))
530
603
wt = WorkingTree.open_containing(location)[0]
604
self.add_cleanup(wt.lock_read().unlock)
532
605
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
606
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
608
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
610
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
611
self.add_cleanup(b.lock_read().unlock)
613
if len(revision) != 1:
614
raise errors.BzrCommandError(gettext(
615
"Revision numbers only make sense for single "
616
"revisions, not ranges"))
617
revid = revision[0].as_revision_id(b)
619
revid = b.last_revision()
621
revno_t = b.revision_id_to_dotted_revno(revid)
622
except (errors.NoSuchRevision, errors.GhostRevisionsHaveNoRevno):
624
revno = ".".join(str(n) for n in revno_t)
546
625
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
626
self.outf.write(revno + '\n')
550
629
class cmd_revision_info(Command):
663
746
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
664
747
file_ids_from=None):
668
751
if file_ids_from is not None:
670
753
base_tree, base_path = WorkingTree.open_containing(
672
755
except errors.NoWorkingTree:
673
756
base_branch, base_path = Branch.open_containing(
675
758
base_tree = base_branch.basis_tree()
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
678
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
760
action = breezy.add.AddFromBaseAction(
761
base_tree, base_path, to_file=self.outf,
681
762
should_print=(not is_quiet()))
764
action = breezy.add.AddWithSkipLargeAction(
765
to_file=self.outf, should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
768
self.add_cleanup(base_tree.lock_read().unlock)
686
769
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
770
added, ignored = tree.smart_add(
771
file_list, not no_recurse, action=action, save=not dry_run)
689
772
self.cleanup_now()
690
773
if len(ignored) > 0:
692
for glob in sorted(ignored.keys()):
775
for glob in sorted(ignored):
693
776
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
778
gettext("ignored {0} matching \"{1}\"\n").format(
698
782
class cmd_mkdir(Command):
751
help='List entries of a particular kind: file, directory, symlink.',
860
help='List entries of a particular kind: file, directory, '
754
864
takes_args = ['file*']
757
867
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
868
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
869
raise errors.BzrCommandError(
870
gettext('invalid kind %r specified') % (kind,))
761
872
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
873
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
874
self.add_cleanup(work_tree.lock_read().unlock)
765
875
if revision is not None:
766
876
tree = revision.as_tree(work_tree.branch)
768
878
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
879
self.add_cleanup(tree.lock_read().unlock)
884
self.add_cleanup(tree.lock_read().unlock)
775
885
if file_list is not None:
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
886
paths = tree.find_related_paths_across_trees(
887
file_list, extra_trees, require_versioned=True)
778
888
# find_ids_across_trees may include some paths that don't
779
889
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
890
entries = tree.iter_entries_by_dir(specific_files=paths)
783
entries = tree.inventory.entries()
892
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
894
for path, entry in sorted(entries):
787
895
if kind and kind != entry.kind:
790
self.outf.write('%-50s %s\n' % (path, entry.file_id))
900
self.outf.write('%-50s %s\n' % (
901
path, entry.file_id.decode('utf-8')))
792
903
self.outf.write(path)
793
904
self.outf.write('\n')
907
class cmd_cp(Command):
908
__doc__ = """Copy a file.
911
brz cp OLDNAME NEWNAME
913
brz cp SOURCE... DESTINATION
915
If the last argument is a versioned directory, all the other names
916
are copied into it. Otherwise, there must be exactly two arguments
917
and the file is copied to a new name.
919
Files cannot be copied between branches. Only files can be copied
923
takes_args = ['names*']
926
encoding_type = 'replace'
928
def run(self, names_list):
929
if names_list is None:
931
if len(names_list) < 2:
932
raise errors.BzrCommandError(gettext("missing file argument"))
933
tree, rel_names = WorkingTree.open_containing_paths(
934
names_list, canonicalize=False)
935
for file_name in rel_names[0:-1]:
937
raise errors.BzrCommandError(
938
gettext("can not copy root of branch"))
939
self.add_cleanup(tree.lock_tree_write().unlock)
940
into_existing = osutils.isdir(names_list[-1])
941
if not into_existing:
943
(src, dst) = rel_names
945
raise errors.BzrCommandError(
946
gettext('to copy multiple files the'
947
' destination must be a versioned'
952
(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
953
for n in rel_names[:-1]]
955
for src, dst in pairs:
957
src_kind = tree.stored_kind(src)
958
except errors.NoSuchFile:
959
raise errors.BzrCommandError(
960
gettext('Could not copy %s => %s: %s is not versioned.')
963
raise errors.BzrCommandError(
964
gettext('Could not copy %s => %s . %s is not versioned\\.'
966
if src_kind == 'directory':
967
raise errors.BzrCommandError(
968
gettext('Could not copy %s => %s . %s is a directory.'
970
dst_parent = osutils.split(dst)[0]
973
dst_parent_kind = tree.stored_kind(dst_parent)
974
except errors.NoSuchFile:
975
raise errors.BzrCommandError(
976
gettext('Could not copy %s => %s: %s is not versioned.')
977
% (src, dst, dst_parent))
978
if dst_parent_kind != 'directory':
979
raise errors.BzrCommandError(
980
gettext('Could not copy to %s: %s is not a directory.')
981
% (dst_parent, dst_parent))
983
tree.copy_one(src, dst)
796
986
class cmd_mv(Command):
797
987
__doc__ = """Move or rename a file.
800
bzr mv OLDNAME NEWNAME
990
brz mv OLDNAME NEWNAME
802
bzr mv SOURCE... DESTINATION
992
brz mv SOURCE... DESTINATION
804
994
If the last argument is a versioned directory, all the other names
805
995
are moved into it. Otherwise, there must be exactly two arguments
828
1019
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1021
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1022
if names_list is None:
833
1024
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1025
raise errors.BzrCommandError(gettext("missing file argument"))
1026
tree, rel_names = WorkingTree.open_containing_paths(
1027
names_list, canonicalize=False)
1028
for file_name in rel_names[0:-1]:
1030
raise errors.BzrCommandError(
1031
gettext("can not move root of branch"))
1032
self.add_cleanup(tree.lock_tree_write().unlock)
838
1033
self._run(tree, names_list, rel_names, after)
840
1035
def run_auto(self, names_list, after, dry_run):
841
1036
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1037
raise errors.BzrCommandError(
1038
gettext('Only one path may be specified to --auto.'))
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)
1040
raise errors.BzrCommandError(
1041
gettext('--after cannot be specified with --auto.'))
1042
work_tree, file_list = WorkingTree.open_containing_paths(
1043
names_list, default_directory='.')
1044
self.add_cleanup(work_tree.lock_tree_write().unlock)
1045
rename_map.RenameMap.guess_renames(
1046
work_tree.basis_tree(), work_tree, dry_run)
852
1048
def _run(self, tree, names_list, rel_names, after):
853
1049
into_existing = osutils.isdir(names_list[-1])
858
1054
# a directory, but now doesn't exist in the working tree
859
1055
# and the target is an existing directory, just rename it)
860
1056
if (not tree.case_sensitive
861
and rel_names[0].lower() == rel_names[1].lower()):
1057
and rel_names[0].lower() == rel_names[1].lower()):
862
1058
into_existing = False
865
1060
# 'fix' the case of a potential 'from'
866
from_id = tree.path2id(
867
tree.get_canonical_inventory_path(rel_names[0]))
1061
from_path = tree.get_canonical_path(rel_names[0])
868
1062
if (not osutils.lexists(names_list[0]) and
869
from_id and inv.get_file_kind(from_id) == "directory"):
1063
tree.is_versioned(from_path) and
1064
tree.stored_kind(from_path) == "directory"):
870
1065
into_existing = False
872
1067
if into_existing:
873
1068
# move into existing directory
874
1069
# All entries reference existing inventory items, so fix them up
875
1070
# for cicp file-systems.
876
rel_names = tree.get_canonical_inventory_paths(rel_names)
1071
rel_names = list(tree.get_canonical_paths(rel_names))
877
1072
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
878
1073
if not is_quiet():
879
1074
self.outf.write("%s => %s\n" % (src, dest))
881
1076
if len(names_list) != 2:
882
raise errors.BzrCommandError('to mv multiple files the'
883
' destination must be a versioned'
1077
raise errors.BzrCommandError(gettext('to mv multiple files the'
1078
' destination must be a versioned'
886
1081
# for cicp file-systems: the src references an existing inventory
888
src = tree.get_canonical_inventory_path(rel_names[0])
1083
src = tree.get_canonical_path(rel_names[0])
889
1084
# Find the canonical version of the destination: In all cases, the
890
1085
# parent of the target must be in the inventory, so we fetch the
891
1086
# canonical version from there (we do not always *use* the
892
1087
# canonicalized tail portion - we may be attempting to rename the
893
1088
# case of the tail)
894
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
1089
canon_dest = tree.get_canonical_path(rel_names[1])
895
1090
dest_parent = osutils.dirname(canon_dest)
896
1091
spec_tail = osutils.basename(rel_names[1])
897
1092
# For a CICP file-system, we need to avoid creating 2 inventory
946
1142
match the remote one, use pull --overwrite. This will work even if the two
947
1143
branches have diverged.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
1145
If there is no default location set, the first pull will set it (use
1146
--no-remember to avoid setting it). After that, you can omit the
1147
location to use the default. To change the default, use --remember. The
1148
value will only be saved if the remote location can be accessed.
1150
The --verbose option will display the revisions pulled using the log_format
1151
configuration option. You can use a different format by overriding it with
1152
-Olog_format=<other_format>.
954
1154
Note: The location can be specified either in the form of a branch,
955
1155
or in the form of a path to a file containing a merge directive generated
959
1159
_see_also = ['push', 'update', 'status-flags', 'send']
960
1160
takes_options = ['remember', 'overwrite', 'revision',
961
custom_help('verbose',
962
help='Show logs of pulled revisions.'),
964
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
970
help="Perform a local pull in a bound "
971
"branch. Local pulls are not applied to "
1161
custom_help('verbose',
1162
help='Show logs of pulled revisions.'),
1163
custom_help('directory',
1164
help='Branch to pull into, '
1165
'rather than the one containing the working directory.'),
1167
help="Perform a local pull in a bound "
1168
"branch. Local pulls are not applied to "
1169
"the master branch."
1172
help="Show base revision text in conflicts."),
1173
Option('overwrite-tags',
1174
help="Overwrite tags only."),
975
1176
takes_args = ['location?']
976
1177
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1179
def run(self, location=None, remember=None, overwrite=False,
979
1180
revision=None, verbose=False,
980
directory=None, local=False):
1181
directory=None, local=False,
1182
show_base=False, overwrite_tags=False):
1185
overwrite = ["history", "tags"]
1186
elif overwrite_tags:
1187
overwrite = ["tags"]
981
1190
# FIXME: too much stuff is in the command class
982
1191
revision_id = None
983
1192
mergeable = None
1001
1210
if location is not None:
1003
1212
mergeable = bundle.read_mergeable_from_url(location,
1004
possible_transports=possible_transports)
1213
possible_transports=possible_transports)
1005
1214
except errors.NotABundle:
1006
1215
mergeable = None
1008
1217
stored_loc = branch_to.get_parent()
1009
1218
if location is None:
1010
1219
if stored_loc is None:
1011
raise errors.BzrCommandError("No pull location known or"
1220
raise errors.BzrCommandError(gettext("No pull location known or"
1014
1223
display_url = urlutils.unescape_for_display(stored_loc,
1016
1225
if not is_quiet():
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1227
gettext("Using saved parent location: %s\n") % display_url)
1018
1228
location = stored_loc
1020
1230
revision = _get_one_revision('pull', revision)
1021
1231
if mergeable is not None:
1022
1232
if revision is not None:
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1233
raise errors.BzrCommandError(gettext(
1234
'Cannot use -r with merge directives or bundles'))
1025
1235
mergeable.install_revisions(branch_to.repository)
1026
1236
base_revision_id, revision_id, verified = \
1027
1237
mergeable.get_merge_request(branch_to.repository)
1028
1238
branch_from = branch_to
1030
1240
branch_from = Branch.open(location,
1031
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1035
if branch_to.get_parent() is None or remember:
1241
possible_transports=possible_transports)
1242
self.add_cleanup(branch_from.lock_read().unlock)
1243
# Remembers if asked explicitly or no previous location is set
1245
or (remember is None and branch_to.get_parent() is None)):
1246
# FIXME: This shouldn't be done before the pull
1247
# succeeds... -- vila 2012-01-02
1036
1248
branch_to.set_parent(branch_from.base)
1038
1250
if revision is not None:
1070
1286
considered diverged if the destination branch's most recent commit is one
1071
1287
that has not been merged (directly or indirectly) by the source branch.
1073
If branches have diverged, you can use 'bzr push --overwrite' to replace
1289
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1290
the other branch completely, discarding its unmerged changes.
1076
1292
If you want to ensure you have the different changes in the other branch,
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1293
do a merge (see brz help merge) from the other branch, and commit that.
1078
1294
After that you will be able to do a push without '--overwrite'.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1296
If there is no default push location set, the first push will set it (use
1297
--no-remember to avoid setting it). After that, you can omit the
1298
location to use the default. To change the default, use --remember. The
1299
value will only be saved if the remote location can be accessed.
1301
The --verbose option will display the revisions pushed using the log_format
1302
configuration option. You can use a different format by overriding it with
1303
-Olog_format=<other_format>.
1086
1306
_see_also = ['pull', 'update', 'working-trees']
1087
1307
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
1088
Option('create-prefix',
1089
help='Create the path leading up to the branch '
1090
'if it does not already exist.'),
1092
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1097
Option('use-existing-dir',
1098
help='By default push will fail if the target'
1099
' directory exists, but does not already'
1100
' have a control directory. This flag will'
1101
' allow push to proceed.'),
1103
help='Create a stacked branch that references the public location '
1104
'of the parent branch.'),
1105
Option('stacked-on',
1106
help='Create a stacked branch that refers to another branch '
1107
'for the commit history. Only the work not present in the '
1108
'referenced branch is included in the branch created.',
1111
help='Refuse to push if there are uncommitted changes in'
1112
' the working tree, --no-strict disables the check.'),
1308
Option('create-prefix',
1309
help='Create the path leading up to the branch '
1310
'if it does not already exist.'),
1311
custom_help('directory',
1312
help='Branch to push from, '
1313
'rather than the one containing the working directory.'),
1314
Option('use-existing-dir',
1315
help='By default push will fail if the target'
1316
' directory exists, but does not already'
1317
' have a control directory. This flag will'
1318
' allow push to proceed.'),
1320
help='Create a stacked branch that references the public location '
1321
'of the parent branch.'),
1322
Option('stacked-on',
1323
help='Create a stacked branch that refers to another branch '
1324
'for the commit history. Only the work not present in the '
1325
'referenced branch is included in the branch created.',
1328
help='Refuse to push if there are uncommitted changes in'
1329
' the working tree, --no-strict disables the check.'),
1331
help="Don't populate the working tree, even for protocols"
1332
" that support it."),
1333
Option('overwrite-tags',
1334
help="Overwrite tags only."),
1335
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1336
"that can't be represented in the target.")
1114
1338
takes_args = ['location?']
1115
1339
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1118
create_prefix=False, verbose=False, revision=None,
1119
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1341
def run(self, location=None, remember=None, overwrite=False,
1342
create_prefix=False, verbose=False, revision=None,
1343
use_existing_dir=False, directory=None, stacked_on=None,
1344
stacked=False, strict=None, no_tree=False,
1345
overwrite_tags=False, lossy=False):
1346
from .push import _show_push_branch
1349
overwrite = ["history", "tags"]
1350
elif overwrite_tags:
1351
overwrite = ["tags"]
1123
1355
if directory is None:
1124
1356
directory = '.'
1125
1357
# Get the source branch
1126
1358
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1359
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1360
# Get the tip's revision_id
1129
1361
revision = _get_one_revision('push', revision)
1130
1362
if revision is not None:
1151
1383
# error by the feedback given to them. RBC 20080227.
1152
1384
stacked_on = parent_url
1153
1385
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1386
raise errors.BzrCommandError(gettext(
1387
"Could not determine branch to refer to."))
1157
1389
# Get the destination location
1158
1390
if location is None:
1159
1391
stored_loc = br_from.get_push_location()
1160
1392
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1393
parent_loc = br_from.get_parent()
1395
raise errors.BzrCommandError(gettext(
1396
"No push location known or specified. To push to the "
1397
"parent branch (at %s), use 'brz push :parent'." %
1398
urlutils.unescape_for_display(parent_loc,
1399
self.outf.encoding)))
1401
raise errors.BzrCommandError(gettext(
1402
"No push location known or specified."))
1164
1404
display_url = urlutils.unescape_for_display(stored_loc,
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1406
note(gettext("Using saved push location: %s") % display_url)
1167
1407
location = stored_loc
1169
1409
_show_push_branch(br_from, revision_id, location, self.outf,
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1410
verbose=verbose, overwrite=overwrite, remember=remember,
1411
stacked_on=stacked_on, create_prefix=create_prefix,
1412
use_existing_dir=use_existing_dir, no_tree=no_tree,
1175
1416
class cmd_branch(Command):
1189
1430
_see_also = ['checkout']
1190
1431
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1194
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1199
help='Create a stacked branch referring to the source branch. '
1200
'The new branch will depend on the availability of the source '
1201
'branch for all operations.'),
1202
Option('standalone',
1203
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
aliases = ['get', 'clone']
1432
takes_options = ['revision',
1434
'hardlink', help='Hard-link working tree files where possible.'),
1435
Option('files-from', type=text_type,
1436
help="Get file contents from this tree."),
1438
help="Create a branch without a working-tree."),
1440
help="Switch the checkout in the current directory "
1441
"to the new branch."),
1443
help='Create a stacked branch referring to the source branch. '
1444
'The new branch will depend on the availability of the source '
1445
'branch for all operations.'),
1446
Option('standalone',
1447
help='Do not use a shared repository, even if available.'),
1448
Option('use-existing-dir',
1449
help='By default branch will fail if the target'
1450
' directory exists, but does not already'
1451
' have a control directory. This flag will'
1452
' allow branch to proceed.'),
1454
help="Bind new branch to from location."),
1214
1457
def run(self, from_location, to_location=None, revision=None,
1215
1458
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1218
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1459
use_existing_dir=False, switch=False, bind=False,
1461
from breezy import switch as _mod_switch
1462
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1464
if not (hardlink or files_from):
1465
# accelerator_tree is usually slower because you have to read N
1466
# files (no readahead, lots of seeks, etc), but allow the user to
1467
# explicitly request it
1468
accelerator_tree = None
1469
if files_from is not None and files_from != from_location:
1470
accelerator_tree = WorkingTree.open(files_from)
1221
1471
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1472
self.add_cleanup(br_from.lock_read().unlock)
1224
1473
if revision is not None:
1225
1474
revision_id = revision.as_revision_id(br_from)
1235
1484
to_transport.mkdir('.')
1236
1485
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1487
to_dir = controldir.ControlDir.open_from_transport(
1489
except errors.NotBranchError:
1490
if not use_existing_dir:
1491
raise errors.BzrCommandError(gettext('Target directory "%s" '
1492
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1497
to_dir.open_branch()
1243
1498
except errors.NotBranchError:
1246
1501
raise errors.AlreadyBranchError(to_location)
1247
1502
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1503
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1509
# preserve whatever source format we have.
1510
to_dir = br_from.controldir.sprout(
1511
to_transport.base, revision_id,
1512
possible_transports=[to_transport],
1513
accelerator_tree=accelerator_tree, hardlink=hardlink,
1514
stacked=stacked, force_new_repo=standalone,
1515
create_tree_if_local=not no_tree, source_branch=br_from)
1516
branch = to_dir.open_branch(
1517
possible_transports=[
1518
br_from.controldir.root_transport, to_transport])
1519
except errors.NoSuchRevision:
1520
to_transport.delete_tree('.')
1521
msg = gettext("The branch {0} has no revision {1}.").format(
1522
from_location, revision)
1523
raise errors.BzrCommandError(msg)
1526
to_repo = to_dir.open_repository()
1527
except errors.NoRepositoryPresent:
1528
to_repo = to_dir.create_repository()
1529
to_repo.fetch(br_from.repository, revision_id=revision_id)
1530
branch = br_from.sprout(to_dir, revision_id=revision_id)
1531
br_from.tags.merge_to(branch.tags)
1266
1533
# If the source branch is stacked, the new branch may
1267
1534
# be stacked whether we asked for that explicitly or not.
1268
1535
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1537
note(gettext('Created new stacked branch referring to %s.') %
1538
branch.get_stacked_on_url())
1539
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1540
errors.UnstackableRepositoryFormat) as e:
1541
revno = branch.revno()
1542
if revno is not None:
1543
note(ngettext('Branched %d revision.',
1544
'Branched %d revisions.',
1545
branch.revno()) % revno)
1547
note(gettext('Created new branch.'))
1276
1549
# Bind to the parent
1277
1550
parent_branch = Branch.open(from_location)
1278
1551
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1552
note(gettext('New branch bound to %s') % from_location)
1281
1554
# Switch to the new branch
1282
1555
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1556
_mod_switch.switch(wt.controldir, branch)
1557
note(gettext('Switched to branch: %s'),
1558
urlutils.unescape_for_display(branch.base, 'utf-8'))
1561
class cmd_branches(Command):
1562
__doc__ = """List the branches available at the current location.
1564
This command will print the names of all the branches at the current
1568
takes_args = ['location?']
1570
Option('recursive', short_name='R',
1571
help='Recursively scan for branches rather than '
1572
'just looking in the specified location.')]
1574
def run(self, location=".", recursive=False):
1576
t = transport.get_transport(location)
1577
if not t.listable():
1578
raise errors.BzrCommandError(
1579
"Can't scan this type of location.")
1580
for b in controldir.ControlDir.find_branches(t):
1581
self.outf.write("%s\n" % urlutils.unescape_for_display(
1582
urlutils.relative_url(t.base, b.base),
1583
self.outf.encoding).rstrip("/"))
1585
dir = controldir.ControlDir.open_containing(location)[0]
1587
active_branch = dir.open_branch(name="")
1588
except errors.NotBranchError:
1589
active_branch = None
1591
for name, branch in iter_sibling_branches(dir):
1594
active = (active_branch is not None and
1595
active_branch.user_url == branch.user_url)
1596
names[name] = active
1597
# Only mention the current branch explicitly if it's not
1598
# one of the colocated branches
1599
if not any(viewvalues(names)) and active_branch is not None:
1600
self.outf.write("* %s\n" % gettext("(default)"))
1601
for name in sorted(names):
1602
active = names[name]
1607
self.outf.write("%s %s\n" % (
1608
prefix, (name if PY3 else name.encode(self.outf.encoding))))
1288
1611
class cmd_checkout(Command):
1289
1612
__doc__ = """Create a new checkout of an existing branch.
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
the branch found in '.'. This is useful if you have removed the working tree
1293
or if it was never created - i.e. if you pushed the branch to its current
1294
location using SFTP.
1614
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree
1615
for the branch found in '.'. This is useful if you have removed the working
1616
tree or if it was never created - i.e. if you pushed the branch to its
1617
current location using SFTP.
1296
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1297
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1298
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1299
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
1300
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
1619
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION
1620
will be used. In other words, "checkout ../foo/bar" will attempt to create
1621
./bar. If the BRANCH_LOCATION has no / or path separator embedded, the
1622
TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading
1623
scheme or drive identifier, if any. For example, "checkout lp:foo-bar" will
1624
attempt to create ./foo-bar.
1303
1626
To retrieve the branch as of a particular revision, supply the --revision
1304
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
1305
out of date [so you cannot commit] but it may be useful (i.e. to examine old
1627
parameter, as in "checkout foo/bar -r 5". Note that this will be
1628
immediately out of date [so you cannot commit] but it may be useful (i.e.
1629
to examine old code.)
1309
_see_also = ['checkouts', 'branch']
1632
_see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1310
1633
takes_args = ['branch_location?', 'to_location?']
1311
1634
takes_options = ['revision',
1312
1635
Option('lightweight',
1389
1712
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1713
__doc__ = """Update a working tree to a new revision.
1715
This will perform a merge of the destination revision (the tip of the
1716
branch, or the specified revision) into the working tree, and then make
1717
that revision the basis revision for the working tree.
1719
You can use this to visit an older revision, or to update a working tree
1720
that is out of date from its branch.
1722
If there are any uncommitted changes in the tree, they will be carried
1723
across and remain as uncommitted changes after the update. To discard
1724
these changes, use 'brz revert'. The uncommitted changes may conflict
1725
with the changes brought in by the change in basis revision.
1727
If the tree's branch is bound to a master branch, brz will also update
1400
1728
the branch from the master.
1730
You cannot update just a single file or directory, because each Bazaar
1731
working tree has just a single basis revision. If you want to restore a
1732
file that has been removed locally, use 'brz revert' instead of 'brz
1733
update'. If you want to restore a file to its state in a previous
1734
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1735
out the old content of that file to a new location.
1737
The 'dir' argument, if given, must be the location of the root of a
1738
working tree to update. By default, the working tree that contains the
1739
current working directory is used.
1403
1742
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1743
takes_args = ['dir?']
1405
takes_options = ['revision']
1744
takes_options = ['revision',
1746
help="Show base revision text in conflicts."),
1406
1748
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1750
def run(self, dir=None, revision=None, show_base=None):
1409
1751
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1752
raise errors.BzrCommandError(gettext(
1753
"brz update --revision takes exactly one revision"))
1755
tree = WorkingTree.open_containing('.')[0]
1757
tree, relpath = WorkingTree.open_containing(dir)
1760
raise errors.BzrCommandError(gettext(
1761
"brz update can only update a whole tree, "
1762
"not a file or subdirectory"))
1413
1763
branch = tree.branch
1414
1764
possible_transports = []
1415
1765
master = branch.get_master_branch(
1416
1766
possible_transports=possible_transports)
1417
1767
if master is not None:
1419
1768
branch_location = master.base
1771
branch_location = tree.branch.base
1421
1772
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1773
self.add_cleanup(tree.unlock)
1424
1774
# get rid of the final '/' and be ready for display
1425
1775
branch_location = urlutils.unescape_for_display(
1511
1862
noise_level = get_verbosity_level()
1513
1864
noise_level = 0
1514
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1865
from .info import show_bzrdir_info
1866
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1516
1867
verbose=noise_level, outfile=self.outf)
1519
1870
class cmd_remove(Command):
1520
1871
__doc__ = """Remove files or directories.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1873
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1874
delete them if they can easily be recovered using revert otherwise they
1875
will be backed up (adding an extension of the form .~#~). If no options or
1876
parameters are given Bazaar will scan for files that are being tracked by
1877
Bazaar but missing in your tree and stop tracking them for you.
1527
1879
takes_args = ['file*']
1528
1880
takes_options = ['verbose',
1529
Option('new', help='Only remove files that have never been committed.'),
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1531
'The file deletion mode to be used.',
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1535
keep='Delete from bzr but leave the working copy.',
1536
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1882
'new', help='Only remove files that have never been committed.'),
1883
RegistryOption.from_kwargs('file-deletion-strategy',
1884
'The file deletion mode to be used.',
1885
title='Deletion Strategy', value_switches=True, enum_switch=False,
1886
safe='Backup changed files (default).',
1887
keep='Delete from brz but leave the working copy.',
1888
no_backup='Don\'t backup changed files.'),
1538
1890
aliases = ['rm', 'del']
1539
1891
encoding_type = 'replace'
1541
1893
def run(self, file_list, verbose=False, new=False,
1542
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1894
file_deletion_strategy='safe'):
1896
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1898
if file_list is not None:
1546
1899
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1901
self.add_cleanup(tree.lock_write().unlock)
1550
1902
# Heuristics should probably all move into tree.remove_smart or
1553
1905
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1906
specific_files=file_list).added
1555
1907
file_list = sorted([f[0] for f in added], reverse=True)
1556
1908
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1909
raise errors.BzrCommandError(gettext('No matching files.'))
1558
1910
elif file_list is None:
1559
1911
# missing files show up in iter_changes(basis) as
1560
1912
# versioned-with-no-kind.
1742
2112
to_transport.ensure_base()
1743
2113
except errors.NoSuchFile:
1744
2114
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1747
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2115
raise errors.BzrCommandError(gettext("Parent directory of %s"
2117
"\nYou may supply --create-prefix to create all"
2118
" leading parent directories.")
1750
2120
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2123
a_controldir = controldir.ControlDir.open_from_transport(
1754
2125
except errors.NotBranchError:
1755
2126
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2127
create_branch = controldir.ControlDir.create_branch_convenience
2129
force_new_tree = False
2131
force_new_tree = None
1757
2132
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2133
possible_transports=[to_transport],
2134
force_new_tree=force_new_tree)
2135
a_controldir = branch.controldir
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2137
from .transport.local import LocalTransport
2138
if a_controldir.has_branch():
1763
2139
if (isinstance(to_transport, LocalTransport)
1764
and not a_bzrdir.has_workingtree()):
1765
raise errors.BranchExistsWithoutWorkingTree(location)
2140
and not a_controldir.has_workingtree()):
2141
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2142
raise errors.AlreadyBranchError(location)
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2143
branch = a_controldir.create_branch()
2144
if not no_tree and not a_controldir.has_workingtree():
2145
a_controldir.create_workingtree()
1769
2146
if append_revisions_only:
1771
2148
branch.set_append_revisions_only(True)
1772
2149
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2150
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2151
' to append-revisions-only. Try --default.'))
1775
2152
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2153
from .info import describe_layout, describe_format
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2155
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1779
2156
except (errors.NoWorkingTree, errors.NotLocalUrl):
1781
2158
repository = branch.repository
1782
2159
layout = describe_layout(repository, branch, tree).lower()
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2160
format = describe_format(a_controldir, repository, branch, tree)
2161
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
2163
if repository.is_shared():
1786
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
2164
# XXX: maybe this can be refactored into transport.path_or_url()
2165
url = repository.controldir.root_transport.external_url()
1789
2167
url = urlutils.local_path_from_url(url)
1790
except errors.InvalidURL:
2168
except urlutils.InvalidURL:
1792
self.outf.write("Using shared repository: %s\n" % url)
2170
self.outf.write(gettext("Using shared repository: %s\n") % url)
1795
2173
class cmd_init_repository(Command):
1823
2201
_see_also = ['init', 'branch', 'checkout', 'repositories']
1824
2202
takes_args = ["location"]
1825
2203
takes_options = [RegistryOption('format',
1826
help='Specify a format for this repository. See'
1827
' "bzr help formats" for details.',
1828
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1829
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1830
value_switches=True, title='Repository format'),
2204
help='Specify a format for this repository. See'
2205
' "brz help formats" for details.',
2207
'breezy.controldir', 'format_registry'),
2208
converter=lambda name: controldir.format_registry.make_controldir(
2210
value_switches=True, title='Repository format'),
1831
2211
Option('no-trees',
1832
help='Branches in the repository will default to'
1833
' not having a working tree.'),
2212
help='Branches in the repository will default to'
2213
' not having a working tree.'),
1835
2215
aliases = ["init-repo"]
1837
2217
def run(self, location, format=None, no_trees=False):
1838
2218
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2219
format = controldir.format_registry.make_controldir('default')
1841
2221
if location is None:
1844
2224
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2226
if format.fixed_components:
2227
repo_format_name = None
2229
repo_format_name = format.repository_format.get_format_string()
2231
(repo, newdir, require_stacking, repository_policy) = (
2232
format.initialize_on_transport_ex(to_transport,
2233
create_prefix=True, make_working_trees=not no_trees,
2234
shared_repo=True, force_new_repo=True,
2235
use_existing_dir=True,
2236
repo_format_name=repo_format_name))
1850
2237
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2238
from .info import show_bzrdir_info
2239
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2242
class cmd_diff(Command):
1875
2269
Shows the difference in the working tree versus the last commit::
1879
2273
Difference between the working tree and revision 1::
1883
2277
Difference between revision 3 and revision 1::
1887
2281
Difference between revision 3 and revision 1 for branch xxx::
1891
To see the changes introduced in revision X::
2285
The changes introduced by revision 2 (equivalent to -r1..2)::
2289
To see the changes introduced by revision X::
1895
2293
Note that in the case of a merge, the -c option shows the changes
1896
2294
compared to the left hand parent. To see the changes against
1897
2295
another parent, use::
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2297
brz diff -r<chosen_parent>..X
2299
The changes between the current revision and the previous revision
2300
(equivalent to -c-1 and -r-2..-1)
1905
2304
Show just the differences for file NEWS::
1909
2308
Show the differences in working tree xxx for file NEWS::
1913
2312
Show the differences from branch xxx to this working tree:
1917
2316
Show the differences between two branches for file NEWS::
1919
bzr diff --old xxx --new yyy NEWS
1921
Same as 'bzr diff' but prefix paths with old/ and new/::
1923
bzr diff --prefix old/:new/
2318
brz diff --old xxx --new yyy NEWS
2320
Same as 'brz diff' but prefix paths with old/ and new/::
2322
brz diff --prefix old/:new/
2324
Show the differences using a custom diff program with options::
2326
brz diff --using /usr/bin/diff --diff-options -wu
1925
2328
_see_also = ['status']
1926
2329
takes_args = ['file*']
1927
2330
takes_options = [
1928
Option('diff-options', type=str,
2331
Option('diff-options', type=text_type,
1929
2332
help='Pass these options to the external diff program.'),
1930
Option('prefix', type=str,
2333
Option('prefix', type=text_type,
1931
2334
short_name='p',
1932
2335
help='Set prefixes added to old and new filenames, as '
1933
2336
'two values separated by a colon. (eg "old/:new/").'),
1935
help='Branch/tree to compare from.',
2338
help='Branch/tree to compare from.',
1939
help='Branch/tree to compare to.',
2342
help='Branch/tree to compare to.',
1944
2347
Option('using',
1945
help='Use this command to compare files.',
2348
help='Use this command to compare files.',
1948
2351
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2353
help='Diff format to use.',
2354
lazy_registry=('breezy.diff', 'format_registry'),
2355
title='Diff format'),
2357
help='How many lines of context to show.',
1953
2361
aliases = ['di', 'dif']
1954
2362
encoding_type = 'exact'
1956
2364
@display_command
1957
2365
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2366
prefix=None, old=None, new=None, using=None, format=None,
2368
from .diff import (get_trees_and_branches_to_diff_locked,
1962
if (prefix is None) or (prefix == '0'):
1963
2372
# diff -p0 format
2375
elif prefix == u'1' or prefix is None:
1967
2376
old_label = 'old/'
1968
2377
new_label = 'new/'
1970
old_label, new_label = prefix.split(":")
2378
elif u':' in prefix:
2379
old_label, new_label = prefix.split(u":")
1972
raise errors.BzrCommandError(
2381
raise errors.BzrCommandError(gettext(
1973
2382
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2383
' (eg "old/:new/")'))
1976
2385
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2386
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2387
' one or two revision specifiers'))
1980
2389
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2390
raise errors.BzrCommandError(gettext(
2391
'{0} and {1} are mutually exclusive').format(
2392
'--using', '--format'))
1984
2394
(old_tree, new_tree,
1985
2395
old_branch, new_branch,
1986
2396
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2397
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2398
# GNU diff on Windows uses ANSI encoding for filenames
2399
path_encoding = osutils.get_diff_header_encoding()
2400
return show_diff_trees(old_tree, new_tree, self.outf,
1989
2401
specific_files=specific_files,
1990
2402
external_diff_options=diff_options,
1991
2403
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2404
extra_trees=extra_trees,
2405
path_encoding=path_encoding,
2406
using=using, context=context,
1993
2407
format_cls=format)
2224
2626
:Other filtering:
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2628
The --match option can be used for finding revisions that match a
2629
regular expression in a commit message, committer, author or bug.
2630
Specifying the option several times will match any of the supplied
2631
expressions. --match-author, --match-bugs, --match-committer and
2632
--match-message can be used to only match a specific field.
2229
2634
:Tips & tricks:
2231
2636
GUI tools and IDEs are often better at exploring history than command
2232
2637
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2638
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2639
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2640
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2642
You may find it useful to add the aliases below to ``breezy.conf``::
2241
2646
top = log -l10 --line
2242
2647
show = log -v -p
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2649
``brz tip`` will then show the latest revision while ``brz top``
2245
2650
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2651
particular revision X, ``brz show -rX``.
2248
2653
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2654
use ``brz log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2656
``brz log -v`` on a branch with lots of history is currently
2252
2657
very slow. A fix for this issue is currently under development.
2253
2658
With or without that fix, it is recommended that a revision range
2254
2659
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2661
brz has a generic full-text matching plugin, brz-search, that can be
2257
2662
used to find revisions matching user names, commit messages, etc.
2258
2663
Among other features, this plugin can find all revisions containing
2259
2664
a list of words but not others.
2266
2671
takes_args = ['file*']
2267
2672
_see_also = ['log-formats', 'revisionspec']
2268
2673
takes_options = [
2270
help='Show from oldest to newest.'),
2272
custom_help('verbose',
2273
help='Show files changed in each revision.'),
2277
type=bzrlib.option._parse_revision_str,
2279
help='Show just the specified revision.'
2280
' See also "help revisionspec".'),
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2286
type=_parse_levels),
2675
help='Show from oldest to newest.'),
2677
custom_help('verbose',
2678
help='Show files changed in each revision.'),
2682
type=breezy.option._parse_revision_str,
2684
help='Show just the specified revision.'
2685
' See also "help revisionspec".'),
2687
RegistryOption('authors',
2688
'What names to list as authors - first, all or committer.',
2691
'breezy.log', 'author_list_registry'),
2695
help='Number of levels to display - 0 for all, 1 for flat.',
2697
type=_parse_levels),
2699
help='Show revisions whose message matches this '
2700
'regular expression.',
2705
help='Limit the output to the first N revisions.',
2710
help='Show changes made in each revision as a patch.'),
2711
Option('include-merged',
2712
help='Show merged revisions like --levels 0 does.'),
2713
Option('include-merges', hidden=True,
2714
help='Historical alias for --include-merged.'),
2715
Option('omit-merges',
2716
help='Do not report commits with more than one parent.'),
2717
Option('exclude-common-ancestry',
2718
help='Display only the revisions that are not part'
2719
' of both ancestries (require -rX..Y).'
2721
Option('signatures',
2722
help='Show digital signature validity.'),
2288
2724
short_name='m',
2725
help='Show revisions whose properties match this '
2728
ListOption('match-message',
2289
2729
help='Show revisions whose message matches this '
2290
'regular expression.',
2294
help='Limit the output to the first N revisions.',
2299
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2301
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2732
ListOption('match-committer',
2733
help='Show revisions whose committer matches this '
2736
ListOption('match-author',
2737
help='Show revisions whose authors match this '
2740
ListOption('match-bugs',
2741
help='Show revisions whose bugs match this '
2307
2745
encoding_type = 'replace'
2309
2747
@display_command
2522
2991
_see_also = ['status', 'cat']
2523
2992
takes_args = ['path?']
2524
2993
takes_options = [
2527
Option('recursive', short_name='R',
2528
help='Recurse into subdirectories.'),
2530
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2532
Option('versioned', help='Print versioned files.',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2539
help='List entries of a particular kind: file, directory, symlink.',
2996
Option('recursive', short_name='R',
2997
help='Recurse into subdirectories.'),
2999
help='Print paths relative to the root of the branch.'),
3000
Option('unknown', short_name='u',
3001
help='Print unknown files.'),
3002
Option('versioned', help='Print versioned files.',
3004
Option('ignored', short_name='i',
3005
help='Print ignored files.'),
3006
Option('kind', short_name='k',
3007
help=('List entries of a particular kind: file, '
3008
'directory, symlink, tree-reference.'),
2543
3015
@display_command
2544
3016
def run(self, revision=None, verbose=False,
2545
3017
recursive=False, from_root=False,
2546
3018
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
3019
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
3021
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
3022
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
3024
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3025
raise errors.BzrCommandError(
3026
gettext('Cannot set both --verbose and --null'))
2554
3027
all = not (unknown or versioned or ignored)
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
3029
selection = {'I': ignored, '?': unknown, 'V': versioned}
2558
3031
if path is None:
2562
raise errors.BzrCommandError('cannot specify both --from-root'
3035
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
3038
tree, branch, relpath = \
3039
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2568
3041
# Calculate the prefix to use
2670
3143
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
3144
precedence over regular ignores. Such exceptions are used to specify
2672
3145
files that should be versioned which would otherwise be ignored.
2674
3147
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3148
precedence over the '!' exception patterns.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3152
* Ignore patterns containing shell wildcards must be quoted from
3155
* Ignore patterns starting with "#" act as comments in the ignore file.
3156
To ignore patterns that begin with that character, use the "RE:" prefix.
2681
3159
Ignore the top level Makefile::
2683
bzr ignore ./Makefile
3161
brz ignore ./Makefile
2685
3163
Ignore .class files in all directories...::
2687
bzr ignore "*.class"
3165
brz ignore "*.class"
2689
3167
...but do not ignore "special.class"::
2691
bzr ignore "!special.class"
2693
Ignore .o files under the lib directory::
2695
bzr ignore "lib/**/*.o"
2697
Ignore .o files under the lib directory::
2699
bzr ignore "RE:lib/.*\.o"
3169
brz ignore "!special.class"
3171
Ignore files whose name begins with the "#" character::
3175
Ignore .o files under the lib directory::
3177
brz ignore "lib/**/*.o"
3179
Ignore .o files under the lib directory::
3181
brz ignore "RE:lib/.*\\.o"
2701
3183
Ignore everything but the "debian" toplevel directory::
2703
bzr ignore "RE:(?!debian/).*"
3185
brz ignore "RE:(?!debian/).*"
2705
3187
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
3188
but always ignore autosave files ending in ~, even under local/::
3191
brz ignore "!./local"
2713
3195
_see_also = ['status', 'ignored', 'patterns']
2714
3196
takes_args = ['name_pattern*']
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3197
takes_options = ['directory',
3198
Option('default-rules',
3199
help='Display the default ignore rules that brz uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
3202
def run(self, name_pattern_list=None, default_rules=None,
3204
from breezy import ignores
2722
3205
if default_rules is not None:
2723
3206
# dump the default rules and exit
2724
3207
for pattern in ignores.USER_DEFAULTS:
2725
3208
self.outf.write("%s\n" % pattern)
2727
3210
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3211
raise errors.BzrCommandError(gettext("ignore requires at least one "
3212
"NAME_PATTERN or --default-rules."))
2730
3213
name_pattern_list = [globbing.normalize_pattern(p)
2731
3214
for p in name_pattern_list]
3216
bad_patterns_count = 0
3217
for p in name_pattern_list:
3218
if not globbing.Globster.is_pattern_valid(p):
3219
bad_patterns_count += 1
3220
bad_patterns += ('\n %s' % p)
3222
msg = (ngettext('Invalid ignore pattern found. %s',
3223
'Invalid ignore patterns found. %s',
3224
bad_patterns_count) % bad_patterns)
3225
ui.ui_factory.show_error(msg)
3226
raise lazy_regex.InvalidPattern('')
2732
3227
for name_pattern in name_pattern_list:
2733
3228
if (name_pattern[0] == '/' or
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3229
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3230
raise errors.BzrCommandError(gettext(
3231
"NAME_PATTERN should not be an absolute path"))
3232
tree, relpath = WorkingTree.open_containing(directory)
2738
3233
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3234
ignored = globbing.Globster(name_pattern_list)
3236
self.add_cleanup(tree.lock_read().unlock)
2742
3237
for entry in tree.list_files():
2744
3239
if id is not None:
2745
3240
filename = entry[0]
2746
3241
if ignored.match(filename):
2747
3242
matches.append(filename)
2749
3243
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3244
self.outf.write(gettext("Warning: the following files are version "
3245
"controlled and match your ignore pattern:\n%s"
3246
"\nThese files will continue to be version controlled"
3247
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2756
3250
class cmd_ignored(Command):
2829
3325
================= =========================
3328
encoding_type = 'exact'
2831
3329
takes_args = ['dest', 'branch_or_subdir?']
2834
help="Type of file to export to.",
2837
Option('filters', help='Apply content filters to export the '
2838
'convenient form.'),
2841
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
3330
takes_options = ['directory',
3332
help="Type of file to export to.",
3335
Option('filters', help='Apply content filters to export the '
3336
'convenient form.'),
3339
help="Name of the root directory inside the exported file."),
3340
Option('per-file-timestamps',
3341
help='Set modification time of files to that of the last '
3342
'revision in which it was changed.'),
3343
Option('uncommitted',
3344
help='Export the working tree contents rather than that of the '
2846
3348
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2848
from bzrlib.export import export
3349
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3351
from .export import export, guess_format, get_root_name
2850
3353
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3354
branch_or_subdir = directory
3356
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3358
if tree is not None:
3359
self.add_cleanup(tree.lock_read().unlock)
3363
raise errors.BzrCommandError(
3364
gettext("--uncommitted requires a working tree"))
3367
export_tree = _get_one_revision_tree(
3368
'export', revision, branch=b,
3372
format = guess_format(dest)
3375
root = get_root_name(dest)
3377
if not per_file_timestamps:
3378
force_mtime = time.time()
3383
from breezy.filter_tree import ContentFilterTree
3384
export_tree = ContentFilterTree(
3385
export_tree, export_tree._content_filter_stack)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3388
export(export_tree, dest, format, root, subdir,
2861
3389
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3390
except errors.NoSuchExportFormat as e:
3391
raise errors.BzrCommandError(
3392
gettext('Unsupported export format: %s') % e.format)
2866
3395
class cmd_cat(Command):
2875
3404
_see_also = ['ls']
2877
Option('name-from-revision', help='The path name in the old tree.'),
2878
Option('filters', help='Apply content filters to display the '
2879
'convenience form.'),
3405
takes_options = ['directory',
3406
Option('name-from-revision',
3407
help='The path name in the old tree.'),
3408
Option('filters', help='Apply content filters to display the '
3409
'convenience form.'),
2882
3412
takes_args = ['filename']
2883
3413
encoding_type = 'exact'
2885
3415
@display_command
2886
3416
def run(self, filename, revision=None, name_from_revision=False,
3417
filters=False, directory=None):
2888
3418
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3419
raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"
3420
" one revision specifier"))
2891
3421
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3422
_open_directory_or_containing_tree_or_branch(filename, directory)
3423
self.add_cleanup(branch.lock_read().unlock)
2895
3424
return self._run(tree, branch, relpath, filename, revision,
2896
3425
name_from_revision, filters)
2898
3427
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2900
3430
if tree is None:
2901
3431
tree = b.basis_tree()
2902
3432
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3433
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3435
old_file_id = rev_tree.path2id(relpath)
3437
# TODO: Split out this code to something that generically finds the
3438
# best id for a path across one or more trees; it's like
3439
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3441
if name_from_revision:
2909
3442
# Try in revision if requested
2910
3443
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3444
raise errors.BzrCommandError(gettext(
3445
"{0!r} is not present in revision {1}").format(
2913
3446
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3448
actual_file_id = old_file_id
2917
3450
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3451
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3452
actual_file_id = cur_file_id
3453
elif old_file_id is not None:
3454
actual_file_id = old_file_id
3456
raise errors.BzrCommandError(gettext(
3457
"{0!r} is not present in revision {1}").format(
2935
3458
filename, rev_tree.get_revision_id()))
3459
relpath = rev_tree.id2path(actual_file_id)
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3461
from .filter_tree import ContentFilterTree
3462
filter_tree = ContentFilterTree(
3463
rev_tree, rev_tree._content_filter_stack)
3464
fileobj = filter_tree.get_file(relpath)
2949
self.outf.write(content)
3466
fileobj = rev_tree.get_file(relpath)
3467
shutil.copyfileobj(fileobj, self.outf)
2952
3471
class cmd_local_time_offset(Command):
2953
3472
__doc__ = """Show the offset in seconds from GMT to local time."""
2955
3475
@display_command
2957
3477
self.outf.write("%s\n" % osutils.local_time_offset())
2961
3480
class cmd_commit(Command):
2962
3481
__doc__ = """Commit changes into a new revision.
2994
3513
"John Doe <jdoe@example.com>". If there is more than one author of
2995
3514
the change you can specify the option multiple times, once for each
3000
3519
A common mistake is to forget to add a new file or directory before
3001
3520
running the commit command. The --strict option checks for unknown
3002
3521
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3522
checks can be implemented by defining hooks. See ``brz help hooks``
3006
3525
:Things to note:
3008
3527
If you accidentially commit the wrong changes or make a spelling
3009
3528
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3529
to undo it. See ``brz help uncommit`` for details.
3012
3531
Hooks can also be configured to run after a commit. This allows you
3013
3532
to trigger updates to external systems like bug trackers. The --fixes
3014
3533
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3534
one or more bugs. See ``brz help bugs`` for details.
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3537
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3538
takes_args = ['selected*']
3045
3539
takes_options = [
3046
ListOption('exclude', type=str, short_name='x',
3540
ListOption('exclude', type=text_type, short_name='x',
3047
3541
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3542
Option('message', type=text_type,
3049
3543
short_name='m',
3050
3544
help="Description of the new revision."),
3052
3546
Option('unchanged',
3053
3547
help='Commit even if nothing has changed.'),
3054
Option('file', type=str,
3548
Option('file', type=text_type,
3055
3549
short_name='F',
3056
3550
argname='msgfile',
3057
3551
help='Take commit message from this file.'),
3058
3552
Option('strict',
3059
3553
help="Refuse to commit if there are unknown "
3060
3554
"files in the working tree."),
3061
Option('commit-time', type=str,
3555
Option('commit-time', type=text_type,
3062
3556
help="Manually set a commit time using commit date "
3063
3557
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
ListOption('fixes', type=str,
3558
ListOption('bugs', type=text_type,
3559
help="Link to a related bug. (see \"brz help bugs\")."),
3560
ListOption('fixes', type=text_type,
3065
3561
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3562
"(see \"brz help bugs\")."),
3563
ListOption('author', type=text_type,
3068
3564
help="Set the author's name, if it's different "
3069
3565
"from the committer."),
3070
3566
Option('local',
3076
3572
Option('show-diff', short_name='p',
3077
3573
help='When no message is supplied, show the diff along'
3078
3574
' with the status summary in the message editor.'),
3576
help='When committing to a foreign version control '
3577
'system do not push data that can not be natively '
3080
3580
aliases = ['ci', 'checkin']
3082
def _iter_bug_fix_urls(self, fixes, branch):
3582
def _iter_bug_urls(self, bugs, branch, status):
3583
default_bugtracker = None
3083
3584
# Configure the properties for bug fixing attributes.
3084
for fixed_bug in fixes:
3085
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3586
tokens = bug.split(':')
3587
if len(tokens) == 1:
3588
if default_bugtracker is None:
3589
branch_config = branch.get_config_stack()
3590
default_bugtracker = branch_config.get(
3592
if default_bugtracker is None:
3593
raise errors.BzrCommandError(gettext(
3594
"No tracker specified for bug %s. Use the form "
3595
"'tracker:id' or specify a default bug tracker "
3596
"using the `bugtracker` option.\nSee "
3597
"\"brz help bugs\" for more information on this "
3598
"feature. Commit refused.") % bug)
3599
tag = default_bugtracker
3601
elif len(tokens) != 2:
3602
raise errors.BzrCommandError(gettext(
3088
3603
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3604
"See \"brz help bugs\" for more information on this "
3605
"feature.\nCommit refused.") % bug)
3607
tag, bug_id = tokens
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3609
yield bugtracker.get_bug_url(tag, branch, bug_id), status
3610
except bugtracker.UnknownBugTrackerAbbreviation:
3611
raise errors.BzrCommandError(gettext(
3612
'Unrecognized bug %s. Commit refused.') % bug)
3613
except bugtracker.MalformedBugIdentifier as e:
3614
raise errors.BzrCommandError(gettext(
3615
u"%s\nCommit refused.") % (e,))
3101
3617
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3618
unchanged=False, strict=False, local=False, fixes=None, bugs=None,
3619
author=None, show_diff=False, exclude=None, commit_time=None,
3622
from .commit import (
3105
3623
PointlessCommit,
3625
from .errors import (
3106
3626
ConflictsInTree,
3107
3627
StrictCommitFailed
3109
from bzrlib.msgeditor import (
3629
from .msgeditor import (
3110
3630
edit_commit_message_encoded,
3111
3631
generate_commit_message_template,
3112
make_commit_message_template_encoded
3632
make_commit_message_template_encoded,
3115
3636
commit_stamp = offset = None
3116
3637
if commit_time is not None:
3118
3639
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3640
except ValueError as e:
3641
raise errors.BzrCommandError(gettext(
3642
"Could not parse --commit-time: " + str(e)))
3129
3644
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3646
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3647
if selected_list == ['']:
3133
3648
# workaround - commit of root of tree should be exactly the same
3134
3649
# as just default commit in that tree, and succeed even though
3157
3676
warning_msg = (
3158
3677
'The commit message is a file name: "%(f)s".\n'
3159
3678
'(use --file "%(f)s" to take commit message from that file)'
3161
3680
ui.ui_factory.show_warning(warning_msg)
3162
3681
if '\r' in message:
3163
3682
message = message.replace('\r\n', '\n')
3164
3683
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3685
raise errors.BzrCommandError(gettext(
3686
"please specify either --message or --file"))
3169
3688
def get_message(commit_obj):
3170
3689
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3691
with open(file, 'rb') as f:
3692
my_message = f.read().decode(osutils.get_user_encoding())
3174
3693
elif message is not None:
3175
3694
my_message = message
3177
3696
# No message supplied: make one up.
3178
3697
# text is the status of the tree
3179
3698
text = make_commit_message_template_encoded(tree,
3180
selected_list, diff=show_diff,
3181
output_encoding=osutils.get_user_encoding())
3699
selected_list, diff=show_diff,
3700
output_encoding=osutils.get_user_encoding())
3182
3701
# start_message is the template generated from hooks
3183
3702
# XXX: Warning - looks like hooks return unicode,
3184
3703
# make_commit_message_template_encoded returns user encoding.
3185
3704
# We probably want to be using edit_commit_message instead to
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")
3706
my_message = set_commit_message(commit_obj)
3707
if my_message is None:
3708
start_message = generate_commit_message_template(
3710
if start_message is not None:
3711
start_message = start_message.encode(
3712
osutils.get_user_encoding())
3713
my_message = edit_commit_message_encoded(text,
3714
start_message=start_message)
3715
if my_message is None:
3716
raise errors.BzrCommandError(gettext("please specify a commit"
3717
" message with either --message or --file"))
3718
if my_message == "":
3719
raise errors.BzrCommandError(gettext("Empty commit message specified."
3720
" Please specify a commit message with either"
3721
" --message or --file or leave a blank message"
3722
" with --message \"\"."))
3195
3723
return my_message
3197
3725
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3733
reporter=None, verbose=verbose, revprops=properties,
3206
3734
authors=author, timestamp=commit_stamp,
3207
3735
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3736
exclude=tree.safe_relpath_files(exclude),
3209
3738
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3739
raise errors.BzrCommandError(gettext("No changes to commit."
3740
" Please 'brz add' the files you want to commit, or use"
3741
" --unchanged to force an empty commit."))
3212
3742
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3743
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3744
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3216
3746
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3219
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
3747
raise errors.BzrCommandError(gettext("Commit refused because there are"
3748
" unknown files in the working tree."))
3749
except errors.BoundBranchOutOfDate as e:
3750
e.extra_help = (gettext("\n"
3751
'To commit to master branch, run update and then commit.\n'
3752
'You can also pass --local to commit to continue working '
3297
3827
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3828
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3830
When the default format has changed after a major new release of
3831
Bazaar, you may be informed during certain operations that you
3832
should upgrade. Upgrading to a newer format may improve performance
3833
or make new features available. It may however limit interoperability
3834
with older repositories or with older versions of Bazaar.
3836
If you wish to upgrade to a particular format rather than the
3837
current default, that can be specified using the --format option.
3838
As a consequence, you can use the upgrade command this way to
3839
"downgrade" to an earlier format, though some conversions are
3840
a one way process (e.g. changing from the 1.x default to the
3841
2.x default) so downgrading is not always possible.
3843
A backup.bzr.~#~ directory is created at the start of the conversion
3844
process (where # is a number). By default, this is left there on
3845
completion. If the conversion fails, delete the new .bzr directory
3846
and rename this one back in its place. Use the --clean option to ask
3847
for the backup.bzr directory to be removed on successful conversion.
3848
Alternatively, you can delete it by hand if everything looks good
3851
If the location given is a shared repository, dependent branches
3852
are also converted provided the repository converts successfully.
3853
If the conversion of a branch fails, remaining branches are still
3856
For more information on upgrades, see the Bazaar Upgrade Guide,
3857
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3860
_see_also = ['check', 'reconcile', 'formats']
3306
3861
takes_args = ['url?']
3307
3862
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3863
RegistryOption('format',
3864
help='Upgrade to a specific format. See "brz help'
3865
' formats" for details.',
3866
lazy_registry=('breezy.controldir', 'format_registry'),
3867
converter=lambda name: controldir.format_registry.make_controldir(
3869
value_switches=True, title='Branch format'),
3871
help='Remove the backup.bzr directory if successful.'),
3873
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3317
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3876
def run(self, url='.', format=None, clean=False, dry_run=False):
3877
from .upgrade import upgrade
3878
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3880
if len(exceptions) == 1:
3881
# Compatibility with historical behavior
3321
3887
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3888
__doc__ = """Show or set brz user id.
3325
3891
Show the email of the current user::
3329
3895
Set the current user::
3331
bzr whoami "Frank Chu <fchu@example.com>"
3897
brz whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3334
help='Display email address only.'),
3336
help='Set identity for the current branch instead of '
3899
takes_options = ['directory',
3901
help='Display email address only.'),
3903
help='Set identity for the current branch instead of '
3339
3906
takes_args = ['name?']
3340
3907
encoding_type = 'replace'
3342
3909
@display_command
3343
def run(self, email=False, branch=False, name=None):
3910
def run(self, email=False, branch=False, name=None, directory=None):
3344
3911
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3912
if directory is None:
3913
# use branch if we're inside one; otherwise global config
3915
c = Branch.open_containing(u'.')[0].get_config_stack()
3916
except errors.NotBranchError:
3917
c = _mod_config.GlobalStack()
3919
c = Branch.open(directory).get_config_stack()
3920
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3922
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3925
self.outf.write(identity + '\n')
3929
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3932
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3359
except errors.NoEmailInUsername, e:
3934
_mod_config.extract_email_address(name)
3935
except _mod_config.NoEmailInUsername:
3360
3936
warning('"%s" does not seem to contain an email address. '
3361
3937
'This is allowed, but not recommended.', name)
3363
3939
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3941
if directory is None:
3942
c = Branch.open_containing(u'.')[0].get_config_stack()
3944
b = Branch.open(directory)
3945
self.add_cleanup(b.lock_write().unlock)
3946
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3948
c = _mod_config.GlobalStack()
3949
c.set('email', name)
3371
3952
class cmd_nick(Command):
3372
3953
__doc__ = """Print or set the branch nickname.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3955
If unset, the colocated branch name is used for colocated branches, and
3956
the branch directory name is used for other branches. To print the
3957
current nickname, execute with no argument.
3377
3959
Bound branches use the nickname of its master branch unless it is set
3428
4012
if equal_pos == -1:
3429
4013
self.print_alias(name)
3431
self.set_alias(name[:equal_pos], name[equal_pos+1:])
4015
self.set_alias(name[:equal_pos], name[equal_pos + 1:])
3433
4017
def remove_alias(self, alias_name):
3434
4018
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
4019
raise errors.BzrCommandError(gettext(
4020
'brz alias --remove expects an alias to remove.'))
3437
4021
# If alias is not found, print something like:
3438
4022
# unalias: foo: not found
3439
c = config.GlobalConfig()
4023
c = _mod_config.GlobalConfig()
3440
4024
c.unset_alias(alias_name)
3442
4026
@display_command
3443
4027
def print_aliases(self):
3444
4028
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3446
for key, value in sorted(aliases.iteritems()):
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
4029
aliases = _mod_config.GlobalConfig().get_aliases()
4030
for key, value in sorted(viewitems(aliases)):
4031
self.outf.write('brz alias %s="%s"\n' % (key, value))
3449
4033
@display_command
3450
4034
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
4035
from .commands import get_alias
3452
4036
alias = get_alias(alias_name)
3453
4037
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
4038
self.outf.write("brz alias: %s: not found\n" % alias_name)
3456
4040
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
4041
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3459
4043
def set_alias(self, alias_name, alias_command):
3460
4044
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
4045
c = _mod_config.GlobalConfig()
3462
4046
c.set_alias(alias_name, alias_command)
3496
4080
Tests that need working space on disk use a common temporary directory,
3497
4081
typically inside $TMPDIR or /tmp.
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4083
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4084
into a pdb postmortem session.
4086
The --coverage=DIRNAME global option produces a report with covered code
3503
4090
Run only tests relating to 'ignore'::
3507
4094
Disable plugins and list tests as they're run::
3509
bzr --no-plugins selftest -v
4096
brz --no-plugins selftest -v
3511
4098
# NB: this is used from the class without creating an instance, which is
3512
4099
# why it does not have a self parameter.
3513
4101
def get_transport_type(typestring):
3514
4102
"""Parse and return a transport specifier."""
3515
4103
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4104
from .tests import stub_sftp
3517
4105
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4106
elif typestring == "memory":
4107
from .tests import test_server
3520
4108
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4109
elif typestring == "fakenfs":
4110
from .tests import test_server
3523
4111
return test_server.FakeNFSServer
3524
4112
msg = "No known transport type %s. Supported types are: sftp\n" %\
3553
4139
Option('list-only',
3554
4140
help='List the tests instead of running them.'),
3555
4141
RegistryOption('parallel',
3556
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
3558
value_switches=False,
3560
Option('randomize', type=str, argname="SEED",
4142
help="Run the test suite in parallel.",
4144
'breezy.tests', 'parallel_registry'),
4145
value_switches=False,
4147
Option('randomize', type=text_type, argname="SEED",
3561
4148
help='Randomize the order of tests using the given'
3562
4149
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3568
help='Output test progress via subunit.'),
4150
ListOption('exclude', type=text_type, argname="PATTERN",
4152
help='Exclude tests that match this regular'
4155
help='Output test progress via subunit v1.'),
4157
help='Output test progress via subunit v2.'),
3569
4158
Option('strict', help='Fail on missing dependencies or '
3570
4159
'known failures.'),
3571
Option('load-list', type=str, argname='TESTLISTFILE',
4160
Option('load-list', type=text_type, argname='TESTLISTFILE',
3572
4161
help='Load a test id list from a text file.'),
3573
ListOption('debugflag', type=str, short_name='E',
4162
ListOption('debugflag', type=text_type, short_name='E',
3574
4163
help='Turn on a selftest debug flag.'),
3575
ListOption('starting-with', type=str, argname='TESTID',
4164
ListOption('starting-with', type=text_type, argname='TESTID',
3576
4165
param_name='starting_with', short_name='s',
3578
'Load only the tests starting with TESTID.'),
4166
help='Load only the tests starting with TESTID.'),
4168
help="By default we disable fsync and fdatasync"
4169
" while running the test suite.")
3580
4171
encoding_type = 'replace'
3586
4177
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4178
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4180
first=False, list_only=False,
3590
4181
randomize=None, exclude=None, strict=False,
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4182
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4183
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4185
# During selftest, disallow proxying, as it can cause severe
4186
# performance penalties and is only needed for thread
4187
# safety. The selftest command is assumed to not use threads
4188
# too heavily. The call should be as early as possible, as
4189
# error reporting for past duplicate imports won't have useful
4191
if sys.version_info[0] < 3:
4192
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4193
# disallowing it currently leads to failures in many places.
4194
lazy_import.disallow_proxying()
4199
raise errors.BzrCommandError("tests not available. Install the "
4200
"breezy tests to run the breezy testsuite.")
3602
4202
if testspecs_list is not None:
3603
4203
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
4208
from .tests import SubUnitBzrRunnerv1
3609
4209
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4210
raise errors.BzrCommandError(gettext(
4211
"subunit not available. subunit needs to be installed "
4212
"to use --subunit."))
4213
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3613
4214
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4215
# stdout, which would corrupt the subunit stream.
4216
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4217
# following code can be deleted when it's sufficiently deployed
4218
# -- vila/mgz 20100514
4219
if (sys.platform == "win32"
4220
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4222
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4225
from .tests import SubUnitBzrRunnerv2
4227
raise errors.BzrCommandError(gettext(
4228
"subunit not available. subunit "
4229
"needs to be installed to use --subunit2."))
4230
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3619
4233
self.additional_selftest_args.setdefault(
3620
4234
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4236
raise errors.BzrCommandError(gettext(
4237
"--benchmark is no longer supported from brz 2.2; "
4238
"use bzr-usertest instead"))
4239
test_suite_factory = None
4241
exclude_pattern = None
3629
test_suite_factory = None
4243
exclude_pattern = '(' + '|'.join(exclude) + ')'
4245
self._disable_fsync()
3631
4246
selftest_kwargs = {"verbose": verbose,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
4248
"stop_on_failure": one,
4249
"transport": transport,
4250
"test_suite_factory": test_suite_factory,
4251
"lsprof_timed": lsprof_timed,
4252
"lsprof_tests": lsprof_tests,
4253
"matching_tests_first": first,
4254
"list_only": list_only,
4255
"random_seed": randomize,
4256
"exclude_pattern": exclude_pattern,
4258
"load_list": load_list,
4259
"debug_flags": debugflag,
4260
"starting_with": starting_with
3648
4262
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4264
# Make deprecation warnings visible, unless -Werror is set
4265
cleanup = symbol_versioning.activate_deprecation_warnings(
4268
result = tests.selftest(**selftest_kwargs)
3650
4271
return int(not result)
4273
def _disable_fsync(self):
4274
"""Change the 'os' functionality to not synchronize."""
4275
self._orig_fsync = getattr(os, 'fsync', None)
4276
if self._orig_fsync is not None:
4277
os.fsync = lambda filedes: None
4278
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4279
if self._orig_fdatasync is not None:
4280
os.fdatasync = lambda filedes: None
3653
4283
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4284
__doc__ = """Show version of brz."""
3656
4286
encoding_type = 'replace'
3657
4287
takes_options = [
3709
4338
The source of the merge can be specified either in the form of a branch,
3710
4339
or in the form of a path to a file containing a merge directive generated
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4340
with brz send. If neither is specified, the default is the upstream branch
4341
or the branch most recently merged using --remember. The source of the
4342
merge may also be specified in the form of a path to a file in another
4343
branch: in this case, only the modifications to that file are merged into
4344
the current working tree.
4346
When merging from a branch, by default brz will try to merge in all new
4347
work from the other branch, automatically determining an appropriate base
4348
revision. If this fails, you may need to give an explicit base.
4350
To pick a different ending revision, pass "--revision OTHER". brz will
4351
try to merge in all new work up to and including revision OTHER.
4353
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4354
through OTHER, excluding BASE but including OTHER, will be merged. If this
4355
causes some revisions to be skipped, i.e. if the destination branch does
4356
not already contain revision BASE, such a merge is commonly referred to as
4357
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4358
cherrypicks. The changes look like a normal commit, and the history of the
4359
changes from the other branch is not stored in the commit.
4361
Revision numbers are always relative to the source branch.
3725
4363
Merge will do its best to combine the changes in two branches, but there
3726
4364
are some kinds of problems only a human can fix. When it encounters those,
3727
4365
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4366
before you can commit.
4368
Use brz resolve when you have fixed a problem. See also brz conflicts.
4370
If there is no default branch set, the first merge will set it (use
4371
--no-remember to avoid setting it). After that, you can omit the branch
4372
to use the default. To change the default, use --remember. The value will
4373
only be saved if the remote location can be accessed.
3737
4375
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4376
directory, where they can be reviewed (with brz diff), tested, and then
3739
4377
committed to record the result of the merge.
3741
4379
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4380
--force is given. If --force is given, then the changes from the source
4381
will be merged with the current working tree, including any uncommitted
4382
changes in the tree. The --force option can also be used to create a
3743
4383
merge revision which has more than two parents.
3745
4385
If one would like to merge changes from the working tree of the other
3790
4430
Option('uncommitted', help='Apply uncommitted changes'
3791
4431
' from a working copy, instead of branch changes.'),
3792
4432
Option('pull', help='If the destination is already'
3793
' completely merged into the source, pull from the'
3794
' source rather than merging. When this happens,'
3795
' you do not need to commit the result.'),
3797
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
4433
' completely merged into the source, pull from the'
4434
' source rather than merging. When this happens,'
4435
' you do not need to commit the result.'),
4436
custom_help('directory',
4437
help='Branch to merge into, '
4438
'rather than the one containing the working directory.'),
3802
4439
Option('preview', help='Instead of merging, show a diff of the'
3804
4441
Option('interactive', help='Select changes interactively.',
3808
4445
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
4446
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
4447
uncommitted=False, pull=False,
3811
4448
directory=None,
3837
4474
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
4475
pb = ui.ui_factory.nested_progress_bar()
3839
4476
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
4477
self.add_cleanup(tree.lock_write().unlock)
3842
4478
if location is not None:
3844
4480
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
4481
possible_transports=possible_transports)
3846
4482
except errors.NotABundle:
3847
4483
mergeable = None
3849
4485
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4486
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4487
' with bundles or merge directives.'))
3853
4489
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4490
raise errors.BzrCommandError(gettext(
4491
'Cannot use -r with merge directives or bundles'))
3856
4492
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
4495
if merger is None and uncommitted:
3860
4496
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4497
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4498
' --revision at the same time.'))
3863
4499
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4500
allow_pending = False
3866
4502
if merger is None:
3867
4503
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
4504
location, revision, remember, possible_transports, None)
3870
4506
merger.merge_type = merge_type
3871
4507
merger.reprocess = reprocess
3872
4508
merger.show_base = show_base
3873
4509
self.sanity_check_merger(merger)
3874
4510
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4511
merger.other_rev_id is not None):
4512
# check if location is a nonexistent file (and not a branch) to
4513
# disambiguate the 'Nothing to do'
4514
if merger.interesting_files:
4515
if not merger.other_tree.has_filename(
4516
merger.interesting_files[0]):
4517
note(gettext("merger: ") + str(merger))
4518
raise errors.PathsDoNotExist([location])
4519
note(gettext('Nothing to do.'))
4521
if pull and not preview:
3879
4522
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4523
raise errors.BzrCommandError(
4524
gettext('Cannot pull individual files'))
3881
4525
if (merger.base_rev_id == tree.last_revision()):
3882
4526
result = tree.pull(merger.other_branch, False,
3883
4527
merger.other_rev_id)
3884
4528
result.report(self.outf)
3886
4530
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4531
raise errors.BzrCommandError(gettext(
3888
4532
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4533
" (perhaps you would prefer 'brz pull')"))
3891
4535
return self._do_preview(merger)
3892
4536
elif interactive:
3950
4596
# Use reprocess if the merger supports it
3951
4597
merger.reprocess = merger.merge_type.supports_reprocess
3952
4598
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4599
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4600
" for merge type %s.") %
3955
4601
merger.merge_type)
3956
4602
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4603
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4606
if (merger.merge_type.requires_file_merge_plan and
4607
(not getattr(merger.this_tree, 'plan_file_merge', None) or
4608
not getattr(merger.other_tree, 'plan_file_merge', None) or
4609
(merger.base_tree is not None and
4610
not getattr(merger.base_tree, 'plan_file_merge', None)))):
4611
raise errors.BzrCommandError(
4612
gettext('Plan file merge unsupported: '
4613
'Merge type incompatible with tree formats.'))
3960
4615
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4616
possible_transports, pb):
3962
4617
"""Produce a merger from a location, assuming it refers to a branch."""
3963
from bzrlib.tag import _merge_tags_if_possible
3964
4618
# find the branch locations
3965
4619
other_loc, user_location = self._select_branch_location(tree, location,
3967
4621
if revision is not None and len(revision) == 2:
3968
4622
base_loc, _unused = self._select_branch_location(tree,
3969
location, revision, 0)
4623
location, revision, 0)
3971
4625
base_loc = other_loc
3972
4626
# Open the branches
3973
4627
other_branch, other_path = Branch.open_containing(other_loc,
3974
possible_transports)
4628
possible_transports)
3975
4629
if base_loc == other_loc:
3976
4630
base_branch = other_branch
3978
4632
base_branch, base_path = Branch.open_containing(base_loc,
3979
possible_transports)
4633
possible_transports)
3980
4634
# Find the revision ids
3981
4635
other_revision_id = None
3982
4636
base_revision_id = None
4079
4742
Re-do the merge of all conflicted files, and show the base text in
4080
4743
conflict regions, in addition to the usual THIS and OTHER texts::
4082
bzr remerge --show-base
4745
brz remerge --show-base
4084
4747
Re-do the merge of "foobar", using the weave merge algorithm, with
4085
4748
additional processing to reduce the size of conflict regions::
4087
bzr remerge --merge-type weave --reprocess foobar
4750
brz remerge --merge-type weave --reprocess foobar
4089
4752
takes_args = ['file*']
4090
4753
takes_options = [
4094
help="Show base revision text in conflicts."),
4757
help="Show base revision text in conflicts."),
4097
4760
def run(self, file_list=None, merge_type=None, show_base=False,
4098
4761
reprocess=False):
4099
from bzrlib.conflicts import restore
4762
from .conflicts import restore
4100
4763
if merge_type is None:
4101
4764
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4765
tree, file_list = WorkingTree.open_containing_paths(file_list)
4766
self.add_cleanup(tree.lock_write().unlock)
4105
4767
parents = tree.get_parent_ids()
4106
4768
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4110
repository = tree.branch.repository
4111
interesting_ids = None
4769
raise errors.BzrCommandError(
4770
gettext("Sorry, remerge only works after normal"
4771
" merges. Not cherrypicking or multi-merges."))
4772
interesting_files = None
4112
4773
new_conflicts = []
4113
4774
conflicts = tree.conflicts()
4114
4775
if file_list is not None:
4115
interesting_ids = set()
4776
interesting_files = set()
4116
4777
for filename in file_list:
4117
file_id = tree.path2id(filename)
4778
if not tree.is_versioned(filename):
4119
4779
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4780
interesting_files.add(filename)
4781
if tree.kind(filename) != "directory":
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4784
for path, ie in tree.iter_entries_by_dir(
4785
specific_files=[filename]):
4786
interesting_files.add(path)
4126
4787
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
4789
# Remerge only supports resolving contents conflicts
4129
4790
allowed_conflicts = ('text conflict', 'contents conflict')
4130
4791
restore_files = [c.path for c in conflicts
4131
4792
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4793
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4133
4794
tree.set_conflicts(ConflictList(new_conflicts))
4134
4795
if file_list is not None:
4135
4796
restore_files = file_list
4162
4823
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4825
Set files in the working tree back to the contents of a previous revision.
4165
4827
Giving a list of files will revert only those files. Otherwise, all files
4166
4828
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4829
working tree basis revision is used. A revert operation affects only the
4830
working tree, not any revision history like the branch and repository or
4831
the working tree basis revision.
4169
4833
To remove only some changes, without reverting to a prior version, use
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4834
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4835
will remove the changes introduced by the second last commit (-2), without
4836
affecting the changes introduced by the last commit (-1). To remove
4837
certain changes on a hunk-by-hunk basis, see the shelve command.
4838
To update the branch to a specific revision or the latest revision and
4839
update the working tree accordingly while preserving local changes, see the
4174
By default, any files that have been manually changed will be backed up
4175
first. (Files changed only by merge are not backed up.) Backup files have
4176
'.~#~' appended to their name, where # is a number.
4842
Uncommitted changes to files that are reverted will be discarded.
4843
Howver, by default, any files that have been manually changed will be
4844
backed up first. (Files changed only by merge are not backed up.) Backup
4845
files have '.~#~' appended to their name, where # is a number.
4178
4847
When you provide files, you can use their current pathname or the pathname
4179
4848
from the target revision. So you can use revert to "undelete" a file by
4359
5034
elif theirs_only:
4360
5035
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
5037
local_branch = Branch.open_containing(directory)[0]
5038
self.add_cleanup(local_branch.lock_read().unlock)
4366
5040
parent = local_branch.get_parent()
4367
5041
if other_branch is None:
4368
5042
other_branch = parent
4369
5043
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
5044
raise errors.BzrCommandError(gettext("No peer location known"
4372
5046
display_url = urlutils.unescape_for_display(parent,
4373
5047
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
5048
message(gettext("Using saved parent location: {0}\n").format(
4377
5051
remote_branch = Branch.open(other_branch)
4378
5052
if remote_branch.base == local_branch.base:
4379
5053
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
5055
self.add_cleanup(remote_branch.lock_read().unlock)
4384
5057
local_revid_range = _revision_range_to_revid_range(
4385
5058
_get_revision_range(my_revision, local_branch,
4388
5061
remote_revid_range = _revision_range_to_revid_range(
4389
5062
_get_revision_range(revision,
4390
remote_branch, self.name()))
5063
remote_branch, self.name()))
4392
5065
local_extra, remote_extra = find_unmerged(
4393
5066
local_branch, remote_branch, restrict,
4394
5067
backward=not reverse,
4395
include_merges=include_merges,
5068
include_merged=include_merged,
4396
5069
local_revid_range=local_revid_range,
4397
5070
remote_revid_range=remote_revid_range)
4419
5098
if remote_extra and not mine_only:
4420
5099
if printed_local is True:
4421
5100
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5101
message(ngettext("You are missing %d revision:\n",
5102
"You are missing %d revisions:\n",
5103
len(remote_extra)) %
5105
if remote_branch.supports_tags():
5106
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5107
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
5108
remote_branch.repository,
4427
5111
lf.log_revision(revision)
4428
5112
status_code = 1
4430
5114
if mine_only and not local_extra:
4431
5115
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5116
message(gettext('This branch has no new revisions.\n'))
4433
5117
elif theirs_only and not remote_extra:
4434
5118
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5119
message(gettext('Other branch has no new revisions.\n'))
4436
5120
elif not (mine_only or theirs_only or local_extra or
4438
5122
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5124
message(gettext("Branches are up to date.\n"))
4441
5125
self.cleanup_now()
4442
5126
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5127
self.add_cleanup(local_branch.lock_write().unlock)
4445
5128
# handle race conditions - a parent might be set while we run.
4446
5129
if local_branch.get_parent() is None:
4447
5130
local_branch.set_parent(remote_branch.base)
4507
5191
@display_command
4508
5192
def run(self, verbose=False):
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
5193
from . import plugin
5194
# Don't give writelines a generator as some codecs don't like that
5195
self.outf.writelines(
5196
list(plugin.describe_plugins(show_paths=verbose)))
4531
5199
class cmd_testament(Command):
4532
5200
__doc__ = """Show testament (signing-form) of a revision."""
4533
5201
takes_options = [
4535
Option('long', help='Produce long-format testament.'),
4537
help='Produce a strict-format testament.')]
5203
Option('long', help='Produce long-format testament.'),
5205
help='Produce a strict-format testament.')]
4538
5206
takes_args = ['branch?']
5207
encoding_type = 'exact'
4539
5209
@display_command
4540
5210
def run(self, branch=u'.', revision=None, long=False, strict=False):
4541
from bzrlib.testament import Testament, StrictTestament
5211
from .testament import Testament, StrictTestament
4542
5212
if strict is True:
4543
5213
testament_class = StrictTestament
4578
5247
Option('long', help='Show commit date in annotations.'),
4582
5252
encoding_type = 'exact'
4584
5254
@display_command
4585
5255
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5256
show_ids=False, directory=None):
5257
from .annotate import (
4588
5260
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5261
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5262
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5263
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5265
self.add_cleanup(branch.lock_read().unlock)
4596
5266
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5267
self.add_cleanup(tree.lock_read().unlock)
5268
if wt is not None and revision is None:
4600
5269
file_id = wt.path2id(relpath)
4602
5271
file_id = tree.path2id(relpath)
4603
5272
if file_id is None:
4604
5273
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5274
if wt is not None and revision is None:
4607
5275
# If there is a tree and we're not annotating historical
4608
5276
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5277
annotate_file_tree(wt, relpath, self.outf, long, all,
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5280
annotate_file_tree(tree, relpath, self.outf, long, all,
5281
show_ids=show_ids, branch=branch)
4616
5284
class cmd_re_sign(Command):
4617
5285
__doc__ = """Create a digital signature for an existing revision."""
4618
5286
# TODO be able to replace existing ones.
4620
hidden = True # is this right ?
5288
hidden = True # is this right ?
4621
5289
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5290
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5292
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5293
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5294
raise errors.BzrCommandError(
5295
gettext('You can only supply one of revision_id or --revision'))
4627
5296
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5297
raise errors.BzrCommandError(
5298
gettext('You must supply either --revision or a revision_id'))
5299
b = WorkingTree.open_containing(directory)[0].branch
5300
self.add_cleanup(b.lock_write().unlock)
4632
5301
return self._run(b, revision_id_list, revision)
4634
5303
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5304
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5305
if revision_id_list is not None:
4638
5306
b.repository.start_write_group()
4640
5308
for revision_id in revision_id_list:
5309
revision_id = cache_utf8.encode(revision_id)
4641
5310
b.repository.sign_revision(revision_id, gpg_strategy)
5311
except BaseException:
4643
5312
b.repository.abort_write_group()
4694
5365
_see_also = ['checkouts', 'unbind']
4695
5366
takes_args = ['location?']
5367
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5369
def run(self, location=None, directory=u'.'):
5370
b, relpath = Branch.open_containing(directory)
4700
5371
if location is None:
4702
5373
location = b.get_old_bound_location()
4703
5374
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5375
raise errors.BzrCommandError(
5376
gettext('No location supplied. '
5377
'This format does not remember old locations.'))
4707
5379
if location is None:
4708
5380
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5381
raise errors.BzrCommandError(
5382
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5384
raise errors.BzrCommandError(
5385
gettext('No location supplied'
5386
' and no previous location known'))
4713
5387
b_other = Branch.open(location)
4715
5389
b.bind(b_other)
4716
5390
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5391
raise errors.BzrCommandError(
5392
gettext('These branches have diverged.'
5393
' Try merging, and then bind again.'))
4719
5394
if b.get_config().has_explicit_nickname():
4720
5395
b.nick = b_other.nick
4759
5434
# information in shared branches as well.
4760
5435
_see_also = ['commit']
4761
5436
takes_options = ['verbose', 'revision',
4762
Option('dry-run', help='Don\'t actually make changes.'),
4763
Option('force', help='Say yes to all questions.'),
4765
help="Only remove the commits from the local branch"
4766
" when in a checkout."
5437
Option('dry-run', help='Don\'t actually make changes.'),
5438
Option('force', help='Say yes to all questions.'),
5440
help='Keep tags that point to removed revisions.'),
5442
help="Only remove the commits from the local "
5443
"branch when in a checkout."
4769
5446
takes_args = ['location?']
4771
5448
encoding_type = 'replace'
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
5450
def run(self, location=None, dry_run=False, verbose=False,
5451
revision=None, force=False, local=False, keep_tags=False):
4776
5452
if location is None:
4777
5453
location = u'.'
4778
control, relpath = bzrdir.BzrDir.open_containing(location)
5454
control, relpath = controldir.ControlDir.open_containing(location)
4780
5456
tree = control.open_workingtree()
4781
5457
b = tree.branch
4827
5503
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5506
self.outf.write(gettext('Dry-run, pretending to remove'
5507
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5510
gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5513
if not ui.ui_factory.confirm_action(
5514
gettext(u'Uncommit these revisions'),
5515
'breezy.builtins.uncommit',
5517
self.outf.write(gettext('Canceled\n'))
4840
5520
mutter('Uncommitting from {%s} to {%s}',
4841
5521
last_rev_id, rev_id)
4842
5522
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5523
revno=revno, local=local, keep_tags=keep_tags)
5525
gettext('You can restore the old tip by running:\n'
5526
' brz pull . -r revid:%s\n')
5527
% last_rev_id.decode('utf-8'))
4848
5530
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5531
__doc__ = """Break a dead lock.
5533
This command breaks a lock on a repository, branch, working directory or
4851
5536
CAUTION: Locks should only be broken when you are sure that the process
4852
5537
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
5539
You can get information on what locks are open via the 'brz info
4855
5540
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5544
brz break-lock brz+ssh://example.com/brz/foo
5545
brz break-lock --conf ~/.bazaar
4861
5548
takes_args = ['location?']
5551
help='LOCATION is the directory where the config lock is.'),
5553
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5556
def run(self, location=None, config=False, force=False):
4864
5557
if location is None:
4865
5558
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5560
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5562
{'breezy.lockdir.break': True})
5564
conf = _mod_config.LockableConfig(file_name=location)
5567
control, relpath = controldir.ControlDir.open_containing(location)
5569
control.break_lock()
5570
except NotImplementedError:
4873
5574
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5575
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4876
5577
This just prints a line to signal when it is ready, then blocks on stdin.
4894
5595
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5596
RegistryOption('protocol',
4896
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
value_switches=True),
5597
help="Protocol to serve.",
5598
lazy_registry=('breezy.transport',
5599
'transport_server_registry'),
5600
value_switches=True),
5602
help='Listen for connections on nominated address.',
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.',
5605
help='Listen for connections on nominated port. Passing 0 as '
5606
'the port number will result in a dynamically allocated '
5607
'port. The default port depends on the protocol.',
5609
custom_help('directory',
5610
help='Serve contents of this directory.'),
4908
5611
Option('allow-writes',
4909
5612
help='By default the server is a readonly server. Supplying '
4910
5613
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5614
'the served directory and below. Note that ``brz serve`` '
4912
5615
'does not perform authentication, so unless some form of '
4913
5616
'external authentication is arranged supplying this '
4914
5617
'option leads to global uncontrolled write access to your '
5620
Option('client-timeout', type=float,
5621
help='Override the default idle client timeout (5min).'),
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4932
if port is not None:
4934
host, port = port.split(':')
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5624
def run(self, listen=None, port=None, inet=False, directory=None,
5625
allow_writes=False, protocol=None, client_timeout=None):
5626
from . import transport
4941
5627
if directory is None:
4942
directory = os.getcwd()
5628
directory = osutils.getcwd()
4943
5629
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5630
protocol = transport.transport_server_registry.get()
5631
url = transport.location_to_url(directory)
4947
5632
if not allow_writes:
4948
5633
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5634
t = transport.get_transport_from_url(url)
5635
protocol(t, listen, port, inet, client_timeout)
4953
5638
class cmd_join(Command):
4967
5652
_see_also = ['split']
4968
5653
takes_args = ['tree']
4969
5654
takes_options = [
4970
Option('reference', help='Join by reference.', hidden=True),
5655
Option('reference', help='Join by reference.', hidden=True),
4973
5658
def run(self, tree, reference=False):
5659
from breezy.mutabletree import BadReferenceTarget
4974
5660
sub_tree = WorkingTree.open(tree)
4975
5661
parent_dir = osutils.dirname(sub_tree.basedir)
4976
5662
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5663
repo = containing_tree.branch.repository
4978
5664
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5665
raise errors.BzrCommandError(gettext(
4980
5666
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5667
"You can use brz upgrade on the repository.")
4985
5671
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5672
except BadReferenceTarget as e:
4987
5673
# XXX: Would be better to just raise a nicely printable
4988
5674
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5675
raise errors.BzrCommandError(
5676
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5679
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5680
except errors.BadSubsumeSource as e:
5681
raise errors.BzrCommandError(
5682
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5685
class cmd_split(Command):
5055
5742
diff='Normal unified diff.',
5056
5743
plain='No patch, just directive.'),
5057
5744
Option('sign', help='GPG-sign the directive.'), 'revision',
5058
Option('mail-to', type=str,
5059
help='Instead of printing the directive, email to this address.'),
5060
Option('message', type=str, short_name='m',
5061
help='Message to use when committing this merge.')
5745
Option('mail-to', type=text_type,
5746
help='Instead of printing the directive, email to this '
5748
Option('message', type=text_type, short_name='m',
5749
help='Message to use when committing this merge.')
5064
5752
encoding_type = 'exact'
5066
5754
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5755
sign=False, revision=None, mail_to=None, message=None,
5757
from .revision import ensure_null, NULL_REVISION
5069
5758
include_patch, include_bundle = {
5070
5759
'plain': (False, False),
5071
5760
'diff': (True, False),
5072
5761
'bundle': (True, True),
5074
branch = Branch.open('.')
5763
branch = Branch.open(directory)
5075
5764
stored_submit_branch = branch.get_submit_branch()
5076
5765
if submit_branch is None:
5077
5766
submit_branch = stored_submit_branch
5162
5860
given, in which case it is sent to a file.
5164
5862
Mail is sent using your preferred mail program. This should be transparent
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5863
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5166
5864
If the preferred client can't be found (or used), your editor will be used.
5168
5866
To use a specific mail program, set the mail_client configuration option.
5169
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5170
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5171
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5172
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
5867
Supported values for specific clients are "claws", "evolution", "kmail",
5868
"mail.app" (MacOS X's Mail.app), "mutt", and "thunderbird"; generic options
5869
are "default", "editor", "emacsclient", "mapi", and "xdg-email". Plugins
5870
may also add supported clients.
5175
5872
If mail is being sent, a to address is required. This can be supplied
5176
5873
either on the commandline, by setting the submit_to configuration
5177
5874
option in the branch itself or the child_submit_to configuration option
5178
5875
in the submit branch.
5180
Two formats are currently supported: "4" uses revision bundle format 4 and
5181
merge directive format 2. It is significantly faster and smaller than
5182
older formats. It is compatible with Bazaar 0.19 and later. It is the
5183
default. "0.9" uses revision bundle format 0.9 and merge directive
5184
format 1. It is compatible with Bazaar 0.12 - 0.18.
5186
The merge directives created by bzr send may be applied using bzr merge or
5187
bzr pull by specifying a file containing a merge directive as the location.
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
5877
The merge directives created by brz send may be applied using brz merge or
5878
brz pull by specifying a file containing a merge directive as the location.
5880
brz send makes extensive use of public locations to map local locations into
5881
URLs that can be used by other people. See `brz help configuration` to
5882
set them, and use `brz info` to display them.
5194
5885
encoding_type = 'exact'
5208
5899
help='Branch to generate the submission from, '
5209
5900
'rather than the one containing the working directory.',
5210
5901
short_name='f',
5212
5903
Option('output', short_name='o',
5213
5904
help='Write merge directive to this file or directory; '
5214
5905
'use - for stdout.',
5216
5907
Option('strict',
5217
5908
help='Refuse to send if there are uncommitted changes in'
5218
5909
' the working tree, --no-strict disables the check.'),
5219
5910
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5914
Option('body', help='Body for the email.', type=text_type),
5224
5915
RegistryOption('format',
5225
5916
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5917
lazy_registry=('breezy.send', 'format_registry')),
5229
5920
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5921
no_patch=False, revision=None, remember=None, output=None,
5231
5922
format=None, mail_to=None, message=None, body=None,
5232
5923
strict=None, **kwargs):
5233
from bzrlib.send import send
5924
from .send import send
5234
5925
return send(submit_branch, revision, public_branch, remember,
5235
5926
format, no_bundle, no_patch, output,
5236
5927
kwargs.get('from', '.'), mail_to, message, body,
5359
6041
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
6042
self.add_cleanup(branch.lock_write().unlock)
5363
6044
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
6045
raise errors.BzrCommandError(
6046
gettext("No tag specified to delete."))
5365
6047
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
6048
note(gettext('Deleted tag %s.') % tag_name)
5369
6051
if len(revision) != 1:
5370
raise errors.BzrCommandError(
6052
raise errors.BzrCommandError(gettext(
5371
6053
"Tags can only be placed on a single revision, "
5373
6055
revision_id = revision[0].as_revision_id(branch)
5375
6057
revision_id = branch.last_revision()
5376
6058
if tag_name is None:
5377
6059
tag_name = branch.automatic_tag_name(revision_id)
5378
6060
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
6061
raise errors.BzrCommandError(gettext(
6062
"Please specify a tag name."))
6064
existing_target = branch.tags.lookup_tag(tag_name)
6065
except errors.NoSuchTag:
6066
existing_target = None
6067
if not force and existing_target not in (None, revision_id):
5382
6068
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6069
if existing_target == revision_id:
6070
note(gettext('Tag %s already exists for that revision.') % tag_name)
6072
branch.tags.set_tag(tag_name, revision_id)
6073
if existing_target is None:
6074
note(gettext('Created tag %s.') % tag_name)
6076
note(gettext('Updated tag %s.') % tag_name)
5387
6079
class cmd_tags(Command):
5393
6085
_see_also = ['tag']
5394
6086
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5401
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6087
custom_help('directory',
6088
help='Branch whose tags should be displayed.'),
6089
RegistryOption('sort',
6090
'Sort tags by different criteria.', title='Sorting',
6091
lazy_registry=('breezy.tag', 'tag_sort_methods')
5409
6097
@display_command
6098
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6099
from .tag import tag_sort_methods
5416
6100
branch, relpath = Branch.open_containing(directory)
5418
tags = branch.tags.get_tag_dict().items()
6102
tags = list(viewitems(branch.tags.get_tag_dict()))
5423
self.add_cleanup(branch.unlock)
6106
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6108
# Restrict to the specified range
6109
tags = self._tags_for_range(branch, revision)
6111
sort = tag_sort_methods.get()
5444
6113
if not show_ids:
5445
6114
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6115
for index, (tag, revid) in enumerate(tags):
5448
6117
revno = branch.revision_id_to_dotted_revno(revid)
5449
6118
if isinstance(revno, tuple):
5450
6119
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
6120
except (errors.NoSuchRevision,
6121
errors.GhostRevisionsHaveNoRevno,
6122
errors.UnsupportedOperation):
5452
6123
# Bad tag data/merges can lead to tagged revisions
5453
6124
# which are not in this branch. Fail gracefully ...
5455
6126
tags[index] = (tag, revno)
6128
tags = [(tag, revid.decode('utf-8')) for (tag, revid) in tags]
5456
6129
self.cleanup_now()
5457
6130
for tag, revspec in tags:
5458
6131
self.outf.write('%-20s %s\n' % (tag, revspec))
6133
def _tags_for_range(self, branch, revision):
6134
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6135
revid1, revid2 = rev1.rev_id, rev2.rev_id
6136
# _get_revision_range will always set revid2 if it's not specified.
6137
# If revid1 is None, it means we want to start from the branch
6138
# origin which is always a valid ancestor. If revid1 == revid2, the
6139
# ancestry check is useless.
6140
if revid1 and revid1 != revid2:
6141
# FIXME: We really want to use the same graph than
6142
# branch.iter_merge_sorted_revisions below, but this is not
6143
# easily available -- vila 2011-09-23
6144
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6145
# We don't want to output anything in this case...
6147
# only show revisions between revid1 and revid2 (inclusive)
6148
tagged_revids = branch.tags.get_reverse_tag_dict()
6150
for r in branch.iter_merge_sorted_revisions(
6151
start_revision_id=revid2, stop_revision_id=revid1,
6152
stop_rule='include'):
6153
revid_tags = tagged_revids.get(r[0], None)
6155
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6159
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6160
__doc__ = """Reconfigure the type of a brz directory.
5464
6162
A target configuration must be specified.
5476
6174
takes_args = ['location?']
5477
6175
takes_options = [
5478
6176
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6179
help='The relation between branch and tree.',
5482
6180
value_switches=True, enum_switch=False,
5483
6181
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6182
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6183
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6184
lightweight_checkout='Reconfigure to be a lightweight'
5487
' checkout (with no local history).',
6185
' checkout (with no local history).',
6187
RegistryOption.from_kwargs(
6189
title='Repository type',
6190
help='Location fo the repository.',
6191
value_switches=True, enum_switch=False,
5488
6192
standalone='Reconfigure to be a standalone branch '
5489
'(i.e. stop using shared repository).',
6193
'(i.e. stop using shared repository).',
5490
6194
use_shared='Reconfigure to use a shared repository.',
6196
RegistryOption.from_kwargs(
6198
title='Trees in Repository',
6199
help='Whether new branches in the repository have trees.',
6200
value_switches=True, enum_switch=False,
5491
6201
with_trees='Reconfigure repository to create '
5492
'working trees on branches by default.',
6202
'working trees on branches by default.',
5493
6203
with_no_trees='Reconfigure repository to not create '
5494
'working trees on branches by default.'
6204
'working trees on branches by default.'
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
6206
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5497
6207
Option('force',
5498
help='Perform reconfiguration even if local changes'
6208
help='Perform reconfiguration even if local changes'
5500
6210
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
6211
help='Reconfigure a branch to be stacked on another branch.',
5504
6214
Option('unstacked',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
6215
help='Reconfigure a branch to be unstacked. This '
6216
'may require copying substantial data into it.',
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5513
directory = bzrdir.BzrDir.open(location)
6220
def run(self, location=None, bind_to=None, force=False,
6221
tree_type=None, repository_type=None, repository_trees=None,
6222
stacked_on=None, unstacked=None):
6223
directory = controldir.ControlDir.open(location)
5514
6224
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6225
raise errors.BzrCommandError(
6226
gettext("Can't use both --stacked-on and --unstacked"))
5516
6227
elif stacked_on is not None:
5517
6228
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
6229
elif unstacked:
5520
6231
# At the moment you can use --stacked-on and a different
5521
6232
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6234
if (tree_type is None and
6235
repository_type is None and
6236
repository_trees is None):
5524
6237
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6240
raise errors.BzrCommandError(gettext('No target configuration '
6242
reconfiguration = None
6243
if tree_type == 'branch':
5530
6244
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6245
elif tree_type == 'tree':
5532
6246
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6247
elif tree_type == 'checkout':
5534
6248
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6249
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6250
elif tree_type == 'lightweight-checkout':
5537
6251
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6252
directory, bind_to)
5539
elif target_type == 'use-shared':
6254
reconfiguration.apply(force)
6255
reconfiguration = None
6256
if repository_type == 'use-shared':
5540
6257
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6258
elif repository_type == 'standalone':
5542
6259
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6261
reconfiguration.apply(force)
6262
reconfiguration = None
6263
if repository_trees == 'with-trees':
5544
6264
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6265
directory, True)
5546
elif target_type == 'with-no-trees':
6266
elif repository_trees == 'with-no-trees':
5547
6267
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6268
directory, False)
5549
reconfiguration.apply(force)
6270
reconfiguration.apply(force)
6271
reconfiguration = None
5552
6274
class cmd_switch(Command):
5575
6297
takes_args = ['to_location?']
5576
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
6298
takes_options = ['directory',
6300
help='Switch even if local commits will be lost.'),
5579
6302
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
6303
help='Create the target branch from this one before'
6304
' switching to it.'),
6306
help='Store and restore uncommitted changes in the'
5584
6310
def run(self, to_location=None, force=False, create_branch=False,
5586
from bzrlib import switch
6311
revision=None, directory=u'.', store=False):
6312
from . import switch
6313
tree_location = directory
5588
6314
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6315
possible_transports = []
6316
control_dir = controldir.ControlDir.open_containing(tree_location,
6317
possible_transports=possible_transports)[0]
5590
6318
if to_location is None:
5591
6319
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6320
raise errors.BzrCommandError(gettext('You must supply either a'
6321
' revision or a location'))
6322
to_location = tree_location
5596
branch = control_dir.open_branch()
6324
branch = control_dir.open_branch(
6325
possible_transports=possible_transports)
5597
6326
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6327
except errors.NotBranchError:
5600
6329
had_explicit_nick = False
5601
6330
if create_branch:
5602
6331
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6332
raise errors.BzrCommandError(
6333
gettext('cannot create branch without source branch'))
6334
to_location = lookup_new_sibling_branch(
6335
control_dir, to_location,
6336
possible_transports=possible_transports)
6337
if revision is not None:
6338
revision = revision.as_revision_id(branch)
6339
to_branch = branch.controldir.sprout(
6341
possible_transports=possible_transports,
6342
revision_id=revision,
6343
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6346
to_branch = Branch.open(to_location,
6347
possible_transports=possible_transports)
5617
6348
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6349
to_branch = open_sibling_branch(
6350
control_dir, to_location,
6351
possible_transports=possible_transports)
6352
if revision is not None:
6353
revision = revision.as_revision_id(to_branch)
6355
switch.switch(control_dir, to_branch, force, revision_id=revision,
6356
store_uncommitted=store)
6357
except controldir.BranchReferenceLoop:
6358
raise errors.BzrCommandError(
6359
gettext('switching would create a branch reference loop. '
6360
'Use the "bzr up" command to switch to a '
6361
'different revision.'))
5624
6362
if had_explicit_nick:
5625
branch = control_dir.open_branch() #get the new branch!
6363
branch = control_dir.open_branch() # get the new branch!
5626
6364
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
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
6365
note(gettext('Switched to branch: %s'),
6366
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5648
6369
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6456
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6458
current_view, view_dict = tree.views.get_view_info()
5737
6459
if name is None:
5738
6460
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6463
raise errors.BzrCommandError(gettext(
6464
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6466
raise errors.BzrCommandError(gettext(
6467
"Both --delete and --switch specified"))
5747
6469
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6470
self.outf.write(gettext("Deleted all views.\n"))
5749
6471
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6472
raise errors.BzrCommandError(
6473
gettext("No current view to delete"))
5752
6475
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6476
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6479
raise errors.BzrCommandError(gettext(
6480
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6482
raise errors.BzrCommandError(gettext(
6483
"Both --switch and --all specified"))
5761
6484
elif switch == 'off':
5762
6485
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6486
raise errors.BzrCommandError(
6487
gettext("No current view to disable"))
5764
6488
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6489
self.outf.write(gettext("Disabled '%s' view.\n") %
5767
6492
tree.views.set_view_info(switch, view_dict)
5768
6493
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6495
gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6498
self.outf.write(gettext('Views defined:\n'))
5773
6499
for view in sorted(view_dict):
5774
6500
if view == current_view:
5816
6544
self.outf.write(" %s\n" %
5817
6545
(some_hooks.get_hook_name(hook),))
5819
self.outf.write(" <no hooks installed>\n")
6547
self.outf.write(gettext(" <no hooks installed>\n"))
5822
6550
class cmd_remove_branch(Command):
5823
6551
__doc__ = """Remove a branch.
5825
This will remove the branch from the specified location but
6553
This will remove the branch from the specified location but
5826
6554
will keep any working tree or repository in place.
5830
6558
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
6560
brz remove-branch repo/trunk
5836
6564
takes_args = ["location?"]
6566
takes_options = ['directory',
6567
Option('force', help='Remove branch even if it is the active branch.')]
5838
6569
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
6571
def run(self, directory=None, location=None, force=False):
6572
br = open_nearby_branch(near=directory, location=location)
6573
if not force and br.controldir.has_workingtree():
6575
active_branch = br.controldir.open_branch(name="")
6576
except errors.NotBranchError:
6577
active_branch = None
6578
if (active_branch is not None and
6579
br.control_url == active_branch.control_url):
6580
raise errors.BzrCommandError(
6581
gettext("Branch is active. Use --force to remove it."))
6582
br.controldir.destroy_branch(br.name)
5847
6585
class cmd_shelve(Command):
5848
6586
__doc__ = """Temporarily set aside some changes from the current tree.
5868
6606
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6607
restore the most recently shelved changes.
6609
For complicated changes, it is possible to edit the changes in a separate
6610
editor program to decide what the file remaining in the working copy
6611
should look like. To do this, add the configuration option
6613
change_editor = PROGRAM @new_path @old_path
6615
where @new_path is replaced with the path of the new version of the
6616
file and @old_path is replaced with the path of the old version of
6617
the file. The PROGRAM should save the new file with the desired
6618
contents of the file in the working tree.
5872
6622
takes_args = ['file*']
5874
6624
takes_options = [
5876
6627
Option('all', help='Shelve all changes.'),
5878
6629
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6630
breezy.option.diff_writer_registry,
5880
6631
value_switches=True, enum_switch=False),
5882
6633
Option('list', help='List shelved changes.'),
5883
6634
Option('destroy',
5884
6635
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6637
_see_also = ['unshelve', 'configuration']
5888
6639
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6640
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6642
return self.run_for_list(directory=directory)
6643
from .shelf_ui import Shelver
5893
6644
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6645
writer = breezy.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6647
shelver = Shelver.from_args(writer(self.outf), revision, all,
6648
file_list, message, destroy=destroy, directory=directory)
5967
6720
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6722
takes_options = ['directory',
6723
Option('ignored', help='Delete all ignored files.'),
6724
Option('detritus', help='Delete conflict files, merge and revert'
5971
6725
' backups, and failed selftest dirs.'),
5972
6726
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6727
help='Delete files unknown to brz (default).'),
5974
6728
Option('dry-run', help='Show files to delete instead of'
5975
6729
' deleting them.'),
5976
6730
Option('force', help='Do not prompt before deleting.')]
5977
6732
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
6733
force=False, directory=u'.'):
6734
from .clean_tree import clean_tree
5980
6735
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6739
clean_tree(directory, unknown=unknown, ignored=ignored,
6740
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6743
class cmd_reference(Command):
5998
6753
takes_args = ['path?', 'location?']
6755
Option('force-unversioned',
6756
help='Set reference even if path is not versioned.'),
6000
def run(self, path=None, location=None):
6759
def run(self, path=None, location=None, force_unversioned=False):
6001
6760
branchdir = '.'
6002
6761
if path is not None:
6003
6762
branchdir = path
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6763
tree, branch, relpath = (
6764
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6006
6765
if path is not None:
6008
6767
if tree is None:
6009
6768
tree = branch.basis_tree()
6010
6769
if path is None:
6011
info = branch._get_all_reference_info().iteritems()
6770
info = viewitems(branch._get_all_reference_info())
6012
6771
self._display_reference_info(tree, branch, info)
6014
file_id = tree.path2id(path)
6773
if not tree.is_versioned(path) and not force_unversioned:
6016
6774
raise errors.NotVersionedError(path)
6017
6775
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6776
info = [(path, branch.get_reference_info(path))]
6019
6777
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6779
branch.set_reference_info(
6780
path, location, file_id=tree.path2id(path))
6023
6782
def _display_reference_info(self, tree, branch, info):
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6784
for path, (location, file_id) in info:
6030
6785
ref_list.append((path, location))
6031
6786
for path, location in sorted(ref_list):
6032
6787
self.outf.write('%s %s\n' % (path, location))
6790
class cmd_export_pot(Command):
6791
__doc__ = """Export command helps and error messages in po format."""
6794
takes_options = [Option('plugin',
6795
help='Export help text from named command '
6796
'(defaults to all built in commands).',
6798
Option('include-duplicates',
6799
help='Output multiple copies of the same msgid '
6800
'string if it appears more than once.'),
6803
def run(self, plugin=None, include_duplicates=False):
6804
from .export_pot import export_pot
6805
export_pot(self.outf, plugin, include_duplicates)
6808
class cmd_import(Command):
6809
__doc__ = """Import sources from a directory, tarball or zip file
6811
This command will import a directory, tarball or zip file into a bzr
6812
tree, replacing any versioned files already present. If a directory is
6813
specified, it is used as the target. If the directory does not exist, or
6814
is not versioned, it is created.
6816
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6818
If the tarball or zip has a single root directory, that directory is
6819
stripped when extracting the tarball. This is not done for directories.
6822
takes_args = ['source', 'tree?']
6824
def run(self, source, tree=None):
6825
from .upstream_import import do_import
6826
do_import(source, tree)
6829
class cmd_link_tree(Command):
6830
__doc__ = """Hardlink matching files to another tree.
6832
Only files with identical content and execute bit will be linked.
6835
takes_args = ['location']
6837
def run(self, location):
6838
from .transform import link_tree
6839
target_tree = WorkingTree.open_containing(".")[0]
6840
source_tree = WorkingTree.open(location)
6841
with target_tree.lock_write(), source_tree.lock_read():
6842
link_tree(target_tree, source_tree)
6845
class cmd_fetch_ghosts(Command):
6846
__doc__ = """Attempt to retrieve ghosts from another branch.
6848
If the other branch is not supplied, the last-pulled branch is used.
6852
aliases = ['fetch-missing']
6853
takes_args = ['branch?']
6854
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6856
def run(self, branch=None, no_fix=False):
6857
from .fetch_ghosts import GhostFetcher
6858
installed, failed = GhostFetcher.from_cmdline(branch).run()
6859
if len(installed) > 0:
6860
self.outf.write("Installed:\n")
6861
for rev in installed:
6862
self.outf.write(rev.decode('utf-8') + "\n")
6864
self.outf.write("Still missing:\n")
6866
self.outf.write(rev.decode('utf-8') + "\n")
6867
if not no_fix and len(installed) > 0:
6868
cmd_reconcile().run(".")
6035
6871
def _register_lazy_builtins():
6036
6872
# register lazy builtins from other modules; called at startup and should
6037
6873
# be only called once.
6038
6874
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6875
('cmd_bisect', [], 'breezy.bisect'),
6876
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6877
('cmd_config', [], 'breezy.config'),
6878
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
6879
('cmd_version_info', [], 'breezy.cmd_version_info'),
6880
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6881
('cmd_conflicts', [], 'breezy.conflicts'),
6882
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6883
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6884
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6885
('cmd_test_script', [], 'breezy.cmd_test_script'),
6046
6887
builtin_command_registry.register_lazy(name, aliases, module_name)