173
156
:return: workingtree, [relative_paths]
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
158
if file_list is None or len(file_list) == 0:
159
tree = WorkingTree.open_containing(default_branch)[0]
160
if tree.supports_views() and apply_view:
161
view_files = tree.views.lookup_view()
163
file_list = view_files
164
view_str = views.view_display_str(view_files)
165
note("Ignoring files outside view. View is %s" % view_str)
166
return tree, file_list
167
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
168
return tree, safe_relpath_files(tree, file_list, canonicalize,
169
apply_view=apply_view)
172
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
173
"""Convert file_list into a list of relpaths in tree.
175
:param tree: A tree to operate on.
176
:param file_list: A list of user provided paths or None.
177
:param apply_view: if True and a view is set, apply it or check that
178
specified files are within it
179
:return: A list of relative paths.
180
:raises errors.PathNotChild: When a provided path is in a different tree
183
if file_list is None:
185
if tree.supports_views() and apply_view:
186
view_files = tree.views.lookup_view()
190
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
191
# doesn't - fix that up here before we enter the loop.
193
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
196
for filename in file_list:
198
relpath = fixer(osutils.dereference_path(filename))
199
if view_files and not osutils.is_inside_any(view_files, relpath):
200
raise errors.FileOutsideView(filename, view_files)
201
new_list.append(relpath)
202
except errors.PathNotChild:
203
raise errors.FileInWrongBranch(tree.branch, filename)
181
207
def _get_view_info_for_change_reporter(tree):
312
322
takes_args = ['revision_id?']
313
takes_options = ['directory', 'revision']
323
takes_options = ['revision']
314
324
# cat-revision is more for frontends so should be exact
315
325
encoding = 'strict'
317
def print_revision(self, revisions, revid):
318
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
319
record = stream.next()
320
if record.storage_kind == 'absent':
321
raise errors.NoSuchRevision(revisions, revid)
322
revtext = record.get_bytes_as('fulltext')
323
self.outf.write(revtext.decode('utf-8'))
326
def run(self, revision_id=None, revision=None, directory=u'.'):
328
def run(self, revision_id=None, revision=None):
327
329
if revision_id is not None and revision is not None:
328
330
raise errors.BzrCommandError('You can only supply one of'
329
331
' revision_id or --revision')
330
332
if revision_id is None and revision is None:
331
333
raise errors.BzrCommandError('You must supply either'
332
334
' --revision or a revision_id')
333
b = WorkingTree.open_containing(directory)[0].branch
335
revisions = b.repository.revisions
336
if revisions is None:
337
raise errors.BzrCommandError('Repository %r does not support '
338
'access to raw revision texts')
340
b.repository.lock_read()
342
# TODO: jam 20060112 should cat-revision always output utf-8?
343
if revision_id is not None:
344
revision_id = osutils.safe_revision_id(revision_id, warn=False)
346
self.print_revision(revisions, revision_id)
347
except errors.NoSuchRevision:
348
msg = "The repository %s contains no revision %s." % (
349
b.repository.base, revision_id)
350
raise errors.BzrCommandError(msg)
351
elif revision is not None:
354
raise errors.BzrCommandError(
355
'You cannot specify a NULL revision.')
356
rev_id = rev.as_revision_id(b)
357
self.print_revision(revisions, rev_id)
359
b.repository.unlock()
335
b = WorkingTree.open_containing(u'.')[0].branch
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
362
355
class cmd_dump_btree(Command):
363
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
365
358
PATH is a btree index file, it can be any URL. This includes things like
366
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
449
435
To re-create the working tree, use "bzr checkout".
451
437
_see_also = ['checkout', 'working-trees']
452
takes_args = ['location*']
438
takes_args = ['location?']
453
439
takes_options = [
455
441
help='Remove the working tree even if it has '
456
'uncommitted or shelved changes.'),
442
'uncommitted changes.'),
459
def run(self, location_list, force=False):
460
if not location_list:
463
for location in location_list:
464
d = bzrdir.BzrDir.open(location)
467
working = d.open_workingtree()
468
except errors.NoWorkingTree:
469
raise errors.BzrCommandError("No working tree to remove")
470
except errors.NotLocalUrl:
471
raise errors.BzrCommandError("You cannot remove the working tree"
474
if (working.has_changes()):
475
raise errors.UncommittedChanges(working)
476
if working.get_shelf_manager().last_shelf() is not None:
477
raise errors.ShelvedChanges(working)
479
if working.user_url != working.branch.user_url:
480
raise errors.BzrCommandError("You cannot remove the working tree"
481
" from a lightweight checkout")
483
d.destroy_workingtree()
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
486
469
class cmd_revno(Command):
487
__doc__ = """Show current revision number.
470
"""Show current revision number.
489
472
This is equal to the number of revisions on this branch.
492
475
_see_also = ['info']
493
476
takes_args = ['location?']
495
Option('tree', help='Show revno of working tree'),
499
def run(self, tree=False, location=u'.'):
502
wt = WorkingTree.open_containing(location)[0]
503
self.add_cleanup(wt.lock_read().unlock)
504
except (errors.NoWorkingTree, errors.NotLocalUrl):
505
raise errors.NoWorkingTree(location)
506
revid = wt.last_revision()
508
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
509
except errors.NoSuchRevision:
511
revno = ".".join(str(n) for n in revno_t)
513
b = Branch.open_containing(location)[0]
514
self.add_cleanup(b.lock_read().unlock)
517
self.outf.write(str(revno) + '\n')
479
def run(self, location=u'.'):
480
self.outf.write(str(Branch.open_containing(location)[0].revno()))
481
self.outf.write('\n')
520
484
class cmd_revision_info(Command):
521
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
524
488
takes_args = ['revision_info*']
525
489
takes_options = [
527
custom_help('directory',
528
492
help='Branch to examine, '
529
'rather than the one containing the working directory.'),
530
Option('tree', help='Show revno of working tree'),
493
'rather than the one containing the working directory.',
534
def run(self, revision=None, directory=u'.', tree=False,
535
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
538
wt = WorkingTree.open_containing(directory)[0]
540
self.add_cleanup(wt.lock_read().unlock)
541
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
b = Branch.open_containing(directory)[0]
544
self.add_cleanup(b.lock_read().unlock)
546
503
if revision is not None:
547
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
548
505
if revision_info_list is not None:
549
for rev_str in revision_info_list:
550
rev_spec = RevisionSpec.from_string(rev_str)
551
revision_ids.append(rev_spec.as_revision_id(b))
552
# No arguments supplied, default to the last revision
553
if len(revision_ids) == 0:
556
raise errors.NoWorkingTree(directory)
557
revision_ids.append(wt.last_revision())
559
revision_ids.append(b.last_revision())
563
for revision_id in revision_ids:
506
for rev in revision_info_list:
507
revs.append(RevisionSpec.from_string(rev))
509
b = Branch.open_containing(directory)[0]
512
revs.append(RevisionSpec.from_string('-1'))
515
revision_id = rev.as_revision_id(b)
565
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
566
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
567
518
except errors.NoSuchRevision:
569
maxlen = max(maxlen, len(revno))
570
revinfos.append([revno, revision_id])
574
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
519
dotted_map = b.get_revision_id_to_revno_map()
520
revno = '.'.join(str(i) for i in dotted_map[revision_id])
521
print '%s %s' % (revno, revision_id)
577
524
class cmd_add(Command):
578
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
580
527
In non-recursive mode, all the named items are added, regardless
581
528
of whether they were previously ignored. A warning is given if
646
590
should_print=(not is_quiet()))
649
self.add_cleanup(base_tree.lock_read().unlock)
650
tree, file_list = tree_files_for_add(file_list)
651
added, ignored = tree.smart_add(file_list, not
652
no_recurse, action=action, save=not dry_run)
593
base_tree.lock_read()
595
file_list = self._maybe_expand_globs(file_list)
596
tree, file_list = tree_files_for_add(file_list)
597
added, ignored = tree.smart_add(file_list, not
598
no_recurse, action=action, save=not dry_run)
600
if base_tree is not None:
654
602
if len(ignored) > 0:
656
604
for glob in sorted(ignored.keys()):
657
605
for path in ignored[glob]:
658
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add ignored files, "
614
"please add them explicitly by name. "
615
"(\"bzr ignored\" gives a list)\n")
662
618
class cmd_mkdir(Command):
663
__doc__ = """Create a new versioned directory.
619
"""Create a new versioned directory.
665
621
This is equivalent to creating the directory and then adding it.
723
674
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
725
676
revision = _get_one_revision('inventory', revision)
726
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
727
self.add_cleanup(work_tree.lock_read().unlock)
728
if revision is not None:
729
tree = revision.as_tree(work_tree.branch)
731
extra_trees = [work_tree]
732
self.add_cleanup(tree.lock_read().unlock)
737
if file_list is not None:
738
file_ids = tree.paths2ids(file_list, trees=extra_trees,
739
require_versioned=True)
740
# find_ids_across_trees may include some paths that don't
742
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
743
for file_id in file_ids if file_id in tree)
745
entries = tree.inventory.entries()
677
work_tree, file_list = tree_files(file_list)
678
work_tree.lock_read()
680
if revision is not None:
681
tree = revision.as_tree(work_tree.branch)
683
extra_trees = [work_tree]
689
if file_list is not None:
690
file_ids = tree.paths2ids(file_list, trees=extra_trees,
691
require_versioned=True)
692
# find_ids_across_trees may include some paths that don't
694
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
695
for file_id in file_ids if file_id in tree)
697
entries = tree.inventory.entries()
700
if tree is not work_tree:
748
703
for path, entry in entries:
749
704
if kind and kind != entry.kind:
887
846
dest = osutils.pathjoin(dest_parent, dest_tail)
888
847
mutter("attempting to move %s => %s", src, dest)
889
848
tree.rename_one(src, dest, after=after)
891
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
894
852
class cmd_pull(Command):
895
__doc__ = """Turn this branch into a mirror of another branch.
853
"""Turn this branch into a mirror of another branch.
897
By default, this command only works on branches that have not diverged.
898
Branches are considered diverged if the destination branch's most recent
899
commit is one that has not been merged (directly or indirectly) into the
855
This command only works on branches that have not diverged. Branches are
856
considered diverged if the destination branch's most recent commit is one
857
that has not been merged (directly or indirectly) into the parent.
902
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
903
860
from one into the other. Once one branch has merged, the other should
904
861
be able to pull it again.
906
If you want to replace your local changes and just want your branch to
907
match the remote one, use pull --overwrite. This will work even if the two
908
branches have diverged.
863
If you want to forget your local changes and just update your branch to
864
match the remote one, use pull --overwrite.
910
866
If there is no default location set, the first pull will set it. After
911
867
that, you can omit the location to use the default. To change the
992
943
branch_from = Branch.open(location,
993
944
possible_transports=possible_transports)
994
self.add_cleanup(branch_from.lock_read().unlock)
996
946
if branch_to.get_parent() is None or remember:
997
947
branch_to.set_parent(branch_from.base)
999
if revision is not None:
1000
revision_id = revision.as_revision_id(branch_from)
1002
if tree_to is not None:
1003
view_info = _get_view_info_for_change_reporter(tree_to)
1004
change_reporter = delta._ChangeReporter(
1005
unversioned_filter=tree_to.is_ignored,
1006
view_info=view_info)
1007
result = tree_to.pull(
1008
branch_from, overwrite, revision_id, change_reporter,
1009
possible_transports=possible_transports, local=local,
1010
show_base=show_base)
1012
result = branch_to.pull(
1013
branch_from, overwrite, revision_id, local=local)
1015
result.report(self.outf)
1016
if verbose and result.old_revid != result.new_revid:
1017
log.show_branch_change(
1018
branch_to, self.outf, result.old_revno,
949
if branch_from is not branch_to:
950
branch_from.lock_read()
952
if revision is not None:
953
revision_id = revision.as_revision_id(branch_from)
955
branch_to.lock_write()
957
if tree_to is not None:
958
view_info = _get_view_info_for_change_reporter(tree_to)
959
change_reporter = delta._ChangeReporter(
960
unversioned_filter=tree_to.is_ignored,
962
result = tree_to.pull(
963
branch_from, overwrite, revision_id, change_reporter,
964
possible_transports=possible_transports, local=local)
966
result = branch_to.pull(
967
branch_from, overwrite, revision_id, local=local)
969
result.report(self.outf)
970
if verbose and result.old_revid != result.new_revid:
971
log.show_branch_change(
972
branch_to, self.outf, result.old_revno,
977
if branch_from is not branch_to:
1022
981
class cmd_push(Command):
1023
__doc__ = """Update a mirror of this branch.
982
"""Update a mirror of this branch.
1025
984
The target branch will not have its working tree populated because this
1026
985
is both expensive, and is not supported on remote file systems.
1079
1038
def run(self, location=None, remember=False, overwrite=False,
1080
1039
create_prefix=False, verbose=False, revision=None,
1081
1040
use_existing_dir=False, directory=None, stacked_on=None,
1082
stacked=False, strict=None, no_tree=False):
1041
stacked=False, strict=None):
1083
1042
from bzrlib.push import _show_push_branch
1085
1044
if directory is None:
1086
1045
directory = '.'
1087
1046
# Get the source branch
1089
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1047
tree, br_from = bzrdir.BzrDir.open_tree_or_branch(directory)
1049
strict = br_from.get_config().get_user_option('push_strict')
1050
if strict is not None:
1051
# FIXME: This should be better supported by config
1053
bools = dict(yes=True, no=False, on=True, off=False,
1054
true=True, false=False)
1056
strict = bools[strict.lower()]
1060
changes = tree.changes_from(tree.basis_tree())
1061
if changes.has_changed():
1062
raise errors.UncommittedChanges(tree)
1090
1063
# Get the tip's revision_id
1091
1064
revision = _get_one_revision('push', revision)
1092
1065
if revision is not None:
1093
1066
revision_id = revision.in_history(br_from).rev_id
1095
1068
revision_id = None
1096
if tree is not None and revision_id is None:
1097
tree.check_changed_or_out_of_date(
1098
strict, 'push_strict',
1099
more_error='Use --no-strict to force the push.',
1100
more_warning='Uncommitted changes will not be pushed.')
1101
1070
# Get the stacked_on branch, if any
1102
1071
if stacked_on is not None:
1103
1072
stacked_on = urlutils.normalize_url(stacked_on)
1151
1120
_see_also = ['checkout']
1152
1121
takes_args = ['from_location', 'to_location?']
1153
takes_options = ['revision',
1154
Option('hardlink', help='Hard-link working tree files where possible.'),
1155
Option('files-from', type=str,
1156
help="Get file contents from this tree."),
1122
takes_options = ['revision', Option('hardlink',
1123
help='Hard-link working tree files where possible.'),
1157
1124
Option('no-tree',
1158
1125
help="Create a branch without a working-tree."),
1160
help="Switch the checkout in the current directory "
1161
"to the new branch."),
1162
1126
Option('stacked',
1163
1127
help='Create a stacked branch referring to the source branch. '
1164
1128
'The new branch will depend on the availability of the source '
1165
1129
'branch for all operations.'),
1166
1130
Option('standalone',
1167
1131
help='Do not use a shared repository, even if available.'),
1168
Option('use-existing-dir',
1169
help='By default branch will fail if the target'
1170
' directory exists, but does not already'
1171
' have a control directory. This flag will'
1172
' allow branch to proceed.'),
1174
help="Bind new branch to from location."),
1176
1133
aliases = ['get', 'clone']
1178
1135
def run(self, from_location, to_location=None, revision=None,
1179
hardlink=False, stacked=False, standalone=False, no_tree=False,
1180
use_existing_dir=False, switch=False, bind=False,
1182
from bzrlib import switch as _mod_switch
1136
hardlink=False, stacked=False, standalone=False, no_tree=False):
1183
1137
from bzrlib.tag import _merge_tags_if_possible
1184
1139
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1186
if not (hardlink or files_from):
1187
# accelerator_tree is usually slower because you have to read N
1188
# files (no readahead, lots of seeks, etc), but allow the user to
1189
# explicitly request it
1141
if (accelerator_tree is not None and
1142
accelerator_tree.supports_content_filtering()):
1190
1143
accelerator_tree = None
1191
if files_from is not None and files_from != from_location:
1192
accelerator_tree = WorkingTree.open(files_from)
1193
1144
revision = _get_one_revision('branch', revision)
1194
self.add_cleanup(br_from.lock_read().unlock)
1195
if revision is not None:
1196
revision_id = revision.as_revision_id(br_from)
1198
# FIXME - wt.last_revision, fallback to branch, fall back to
1199
# None or perhaps NULL_REVISION to mean copy nothing
1201
revision_id = br_from.last_revision()
1202
if to_location is None:
1203
to_location = urlutils.derive_to_location(from_location)
1204
to_transport = transport.get_transport(to_location)
1206
to_transport.mkdir('.')
1207
except errors.FileExists:
1208
if not use_existing_dir:
1209
raise errors.BzrCommandError('Target directory "%s" '
1210
'already exists.' % to_location)
1147
if revision is not None:
1148
revision_id = revision.as_revision_id(br_from)
1213
bzrdir.BzrDir.open_from_transport(to_transport)
1214
except errors.NotBranchError:
1217
raise errors.AlreadyBranchError(to_location)
1218
except errors.NoSuchFile:
1219
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1222
# preserve whatever source format we have.
1223
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1224
possible_transports=[to_transport],
1225
accelerator_tree=accelerator_tree,
1226
hardlink=hardlink, stacked=stacked,
1227
force_new_repo=standalone,
1228
create_tree_if_local=not no_tree,
1229
source_branch=br_from)
1230
branch = dir.open_branch()
1231
except errors.NoSuchRevision:
1232
to_transport.delete_tree('.')
1233
msg = "The branch %s has no revision %s." % (from_location,
1235
raise errors.BzrCommandError(msg)
1236
_merge_tags_if_possible(br_from, branch)
1237
# If the source branch is stacked, the new branch may
1238
# be stacked whether we asked for that explicitly or not.
1239
# We therefore need a try/except here and not just 'if stacked:'
1241
note('Created new stacked branch referring to %s.' %
1242
branch.get_stacked_on_url())
1243
except (errors.NotStacked, errors.UnstackableBranchFormat,
1244
errors.UnstackableRepositoryFormat), e:
1245
note('Branched %d revision(s).' % branch.revno())
1247
# Bind to the parent
1248
parent_branch = Branch.open(from_location)
1249
branch.bind(parent_branch)
1250
note('New branch bound to %s' % from_location)
1252
# Switch to the new branch
1253
wt, _ = WorkingTree.open_containing('.')
1254
_mod_switch.switch(wt.bzrdir, branch)
1255
note('Switched to branch: %s',
1256
urlutils.unescape_for_display(branch.base, 'utf-8'))
1150
# FIXME - wt.last_revision, fallback to branch, fall back to
1151
# None or perhaps NULL_REVISION to mean copy nothing
1153
revision_id = br_from.last_revision()
1154
if to_location is None:
1155
to_location = urlutils.derive_to_location(from_location)
1156
to_transport = transport.get_transport(to_location)
1158
to_transport.mkdir('.')
1159
except errors.FileExists:
1160
raise errors.BzrCommandError('Target directory "%s" already'
1161
' exists.' % to_location)
1162
except errors.NoSuchFile:
1163
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1166
# preserve whatever source format we have.
1167
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1168
possible_transports=[to_transport],
1169
accelerator_tree=accelerator_tree,
1170
hardlink=hardlink, stacked=stacked,
1171
force_new_repo=standalone,
1172
create_tree_if_local=not no_tree,
1173
source_branch=br_from)
1174
branch = dir.open_branch()
1175
except errors.NoSuchRevision:
1176
to_transport.delete_tree('.')
1177
msg = "The branch %s has no revision %s." % (from_location,
1179
raise errors.BzrCommandError(msg)
1180
_merge_tags_if_possible(br_from, branch)
1181
# If the source branch is stacked, the new branch may
1182
# be stacked whether we asked for that explicitly or not.
1183
# We therefore need a try/except here and not just 'if stacked:'
1185
note('Created new stacked branch referring to %s.' %
1186
branch.get_stacked_on_url())
1187
except (errors.NotStacked, errors.UnstackableBranchFormat,
1188
errors.UnstackableRepositoryFormat), e:
1189
note('Branched %d revision(s).' % branch.revno())
1259
1194
class cmd_checkout(Command):
1260
__doc__ = """Create a new checkout of an existing branch.
1195
"""Create a new checkout of an existing branch.
1262
1197
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1263
1198
the branch found in '.'. This is useful if you have removed the working tree
1342
1272
@display_command
1343
1273
def run(self, dir=u'.'):
1344
1274
tree = WorkingTree.open_containing(dir)[0]
1345
self.add_cleanup(tree.lock_read().unlock)
1346
new_inv = tree.inventory
1347
old_tree = tree.basis_tree()
1348
self.add_cleanup(old_tree.lock_read().unlock)
1349
old_inv = old_tree.inventory
1351
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1352
for f, paths, c, v, p, n, k, e in iterator:
1353
if paths[0] == paths[1]:
1357
renames.append(paths)
1359
for old_name, new_name in renames:
1360
self.outf.write("%s => %s\n" % (old_name, new_name))
1277
new_inv = tree.inventory
1278
old_tree = tree.basis_tree()
1279
old_tree.lock_read()
1281
old_inv = old_tree.inventory
1283
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1284
for f, paths, c, v, p, n, k, e in iterator:
1285
if paths[0] == paths[1]:
1289
renames.append(paths)
1291
for old_name, new_name in renames:
1292
self.outf.write("%s => %s\n" % (old_name, new_name))
1363
1299
class cmd_update(Command):
1364
__doc__ = """Update a tree to have the latest code committed to its branch.
1300
"""Update a tree to have the latest code committed to its branch.
1366
1302
This will perform a merge into the working tree, and may generate
1367
1303
conflicts. If you have any local changes, you will still
1370
1306
If you want to discard your local changes, you can just do a
1371
1307
'bzr revert' instead of 'bzr commit' after the update.
1373
If you want to restore a file that has been removed locally, use
1374
'bzr revert' instead of 'bzr update'.
1376
If the tree's branch is bound to a master branch, it will also update
1377
the branch from the master.
1380
1310
_see_also = ['pull', 'working-trees', 'status-flags']
1381
1311
takes_args = ['dir?']
1382
takes_options = ['revision',
1384
help="Show base revision text in conflicts."),
1386
1312
aliases = ['up']
1388
def run(self, dir='.', revision=None, show_base=None):
1389
if revision is not None and len(revision) != 1:
1390
raise errors.BzrCommandError(
1391
"bzr update --revision takes exactly one revision")
1314
def run(self, dir='.'):
1392
1315
tree = WorkingTree.open_containing(dir)[0]
1393
branch = tree.branch
1394
1316
possible_transports = []
1395
master = branch.get_master_branch(
1317
master = tree.branch.get_master_branch(
1396
1318
possible_transports=possible_transports)
1397
1319
if master is not None:
1398
branch_location = master.base
1399
1320
tree.lock_write()
1401
branch_location = tree.branch.base
1402
1322
tree.lock_tree_write()
1403
self.add_cleanup(tree.unlock)
1404
# get rid of the final '/' and be ready for display
1405
branch_location = urlutils.unescape_for_display(
1406
branch_location.rstrip('/'),
1408
existing_pending_merges = tree.get_parent_ids()[1:]
1412
# may need to fetch data into a heavyweight checkout
1413
# XXX: this may take some time, maybe we should display a
1415
old_tip = branch.update(possible_transports)
1416
if revision is not None:
1417
revision_id = revision[0].as_revision_id(branch)
1419
revision_id = branch.last_revision()
1420
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1421
revno = branch.revision_id_to_dotted_revno(revision_id)
1422
note("Tree is up to date at revision %s of branch %s" %
1423
('.'.join(map(str, revno)), branch_location))
1425
view_info = _get_view_info_for_change_reporter(tree)
1426
change_reporter = delta._ChangeReporter(
1427
unversioned_filter=tree.is_ignored,
1428
view_info=view_info)
1324
existing_pending_merges = tree.get_parent_ids()[1:]
1325
last_rev = _mod_revision.ensure_null(tree.last_revision())
1326
if last_rev == _mod_revision.ensure_null(
1327
tree.branch.last_revision()):
1328
# may be up to date, check master too.
1329
if master is None or last_rev == _mod_revision.ensure_null(
1330
master.last_revision()):
1331
revno = tree.branch.revision_id_to_revno(last_rev)
1332
note("Tree is up to date at revision %d." % (revno,))
1334
view_info = _get_view_info_for_change_reporter(tree)
1430
1335
conflicts = tree.update(
1432
possible_transports=possible_transports,
1433
revision=revision_id,
1435
show_base=show_base)
1436
except errors.NoSuchRevision, e:
1437
raise errors.BzrCommandError(
1438
"branch has no revision %s\n"
1439
"bzr update --revision only works"
1440
" for a revision in the branch history"
1442
revno = tree.branch.revision_id_to_dotted_revno(
1443
_mod_revision.ensure_null(tree.last_revision()))
1444
note('Updated to revision %s of branch %s' %
1445
('.'.join(map(str, revno)), branch_location))
1446
parent_ids = tree.get_parent_ids()
1447
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1448
note('Your local commits will now show as pending merges with '
1449
"'bzr status', and can be committed with 'bzr commit'.")
1336
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1337
view_info=view_info), possible_transports=possible_transports)
1338
revno = tree.branch.revision_id_to_revno(
1339
_mod_revision.ensure_null(tree.last_revision()))
1340
note('Updated to revision %d.' % (revno,))
1341
if tree.get_parent_ids()[1:] != existing_pending_merges:
1342
note('Your local commits will now show as pending merges with '
1343
"'bzr status', and can be committed with 'bzr commit'.")
1456
1352
class cmd_info(Command):
1457
__doc__ = """Show information about a working tree, branch or repository.
1353
"""Show information about a working tree, branch or repository.
1459
1355
This command will show all known locations and formats associated to the
1460
1356
tree, branch or repository.
1512
1407
RegistryOption.from_kwargs('file-deletion-strategy',
1513
1408
'The file deletion mode to be used.',
1514
1409
title='Deletion Strategy', value_switches=True, enum_switch=False,
1515
safe='Backup changed files (default).',
1516
keep='Delete from bzr but leave the working copy.',
1517
no_backup='Don\'t backup changed files.',
1410
safe='Only delete files if they can be'
1411
' safely recovered (default).',
1412
keep="Don't delete any files.",
1518
1413
force='Delete all the specified files, even if they can not be '
1519
'recovered and even if they are non-empty directories. '
1520
'(deprecated, use no-backup)')]
1414
'recovered and even if they are non-empty directories.')]
1521
1415
aliases = ['rm', 'del']
1522
1416
encoding_type = 'replace'
1524
1418
def run(self, file_list, verbose=False, new=False,
1525
1419
file_deletion_strategy='safe'):
1526
if file_deletion_strategy == 'force':
1527
note("(The --force option is deprecated, rather use --no-backup "
1529
file_deletion_strategy = 'no-backup'
1531
tree, file_list = WorkingTree.open_containing_paths(file_list)
1420
tree, file_list = tree_files(file_list)
1533
1422
if file_list is not None:
1534
1423
file_list = [f for f in file_list]
1536
self.add_cleanup(tree.lock_write().unlock)
1537
# Heuristics should probably all move into tree.remove_smart or
1540
added = tree.changes_from(tree.basis_tree(),
1541
specific_files=file_list).added
1542
file_list = sorted([f[0] for f in added], reverse=True)
1543
if len(file_list) == 0:
1544
raise errors.BzrCommandError('No matching files.')
1545
elif file_list is None:
1546
# missing files show up in iter_changes(basis) as
1547
# versioned-with-no-kind.
1549
for change in tree.iter_changes(tree.basis_tree()):
1550
# Find paths in the working tree that have no kind:
1551
if change[1][1] is not None and change[6][1] is None:
1552
missing.append(change[1][1])
1553
file_list = sorted(missing, reverse=True)
1554
file_deletion_strategy = 'keep'
1555
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1556
keep_files=file_deletion_strategy=='keep',
1557
force=(file_deletion_strategy=='no-backup'))
1427
# Heuristics should probably all move into tree.remove_smart or
1430
added = tree.changes_from(tree.basis_tree(),
1431
specific_files=file_list).added
1432
file_list = sorted([f[0] for f in added], reverse=True)
1433
if len(file_list) == 0:
1434
raise errors.BzrCommandError('No matching files.')
1435
elif file_list is None:
1436
# missing files show up in iter_changes(basis) as
1437
# versioned-with-no-kind.
1439
for change in tree.iter_changes(tree.basis_tree()):
1440
# Find paths in the working tree that have no kind:
1441
if change[1][1] is not None and change[6][1] is None:
1442
missing.append(change[1][1])
1443
file_list = sorted(missing, reverse=True)
1444
file_deletion_strategy = 'keep'
1445
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1446
keep_files=file_deletion_strategy=='keep',
1447
force=file_deletion_strategy=='force')
1560
1452
class cmd_file_id(Command):
1561
__doc__ = """Print file_id of a particular file or directory.
1453
"""Print file_id of a particular file or directory.
1563
1455
The file_id is assigned when the file is first added and remains the
1564
1456
same through all revisions where the file exists, even when it is
1994
1831
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1995
1832
' one or two revision specifiers')
1997
if using is not None and format is not None:
1998
raise errors.BzrCommandError('--using and --format are mutually '
2001
(old_tree, new_tree,
2002
old_branch, new_branch,
2003
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2004
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2005
# GNU diff on Windows uses ANSI encoding for filenames
2006
path_encoding = osutils.get_diff_header_encoding()
1834
old_tree, new_tree, specific_files, extra_trees = \
1835
_get_trees_to_diff(file_list, revision, old, new,
2007
1837
return show_diff_trees(old_tree, new_tree, sys.stdout,
2008
1838
specific_files=specific_files,
2009
1839
external_diff_options=diff_options,
2010
1840
old_label=old_label, new_label=new_label,
2011
extra_trees=extra_trees,
2012
path_encoding=path_encoding,
1841
extra_trees=extra_trees, using=using)
2017
1844
class cmd_deleted(Command):
2018
__doc__ = """List files deleted in the working tree.
1845
"""List files deleted in the working tree.
2020
1847
# TODO: Show files deleted since a previous revision, or
2021
1848
# between two revisions.
2024
1851
# level of effort but possibly much less IO. (Or possibly not,
2025
1852
# if the directories are very large...)
2026
1853
_see_also = ['status', 'ls']
2027
takes_options = ['directory', 'show-ids']
1854
takes_options = ['show-ids']
2029
1856
@display_command
2030
def run(self, show_ids=False, directory=u'.'):
2031
tree = WorkingTree.open_containing(directory)[0]
2032
self.add_cleanup(tree.lock_read().unlock)
2033
old = tree.basis_tree()
2034
self.add_cleanup(old.lock_read().unlock)
2035
for path, ie in old.inventory.iter_entries():
2036
if not tree.has_id(ie.file_id):
2037
self.outf.write(path)
2039
self.outf.write(' ')
2040
self.outf.write(ie.file_id)
2041
self.outf.write('\n')
1857
def run(self, show_ids=False):
1858
tree = WorkingTree.open_containing(u'.')[0]
1861
old = tree.basis_tree()
1864
for path, ie in old.inventory.iter_entries():
1865
if not tree.has_id(ie.file_id):
1866
self.outf.write(path)
1868
self.outf.write(' ')
1869
self.outf.write(ie.file_id)
1870
self.outf.write('\n')
2044
1877
class cmd_modified(Command):
2045
__doc__ = """List files modified in working tree.
1878
"""List files modified in working tree.
2049
1882
_see_also = ['status', 'ls']
2050
takes_options = ['directory', 'null']
1885
help='Write an ascii NUL (\\0) separator '
1886
'between files rather than a newline.')
2052
1889
@display_command
2053
def run(self, null=False, directory=u'.'):
2054
tree = WorkingTree.open_containing(directory)[0]
1890
def run(self, null=False):
1891
tree = WorkingTree.open_containing(u'.')[0]
2055
1892
td = tree.changes_from(tree.basis_tree())
2056
1893
for path, id, kind, text_modified, meta_modified in td.modified:
2063
1900
class cmd_added(Command):
2064
__doc__ = """List files added in working tree.
1901
"""List files added in working tree.
2068
1905
_see_also = ['status', 'ls']
2069
takes_options = ['directory', 'null']
1908
help='Write an ascii NUL (\\0) separator '
1909
'between files rather than a newline.')
2071
1912
@display_command
2072
def run(self, null=False, directory=u'.'):
2073
wt = WorkingTree.open_containing(directory)[0]
2074
self.add_cleanup(wt.lock_read().unlock)
2075
basis = wt.basis_tree()
2076
self.add_cleanup(basis.lock_read().unlock)
2077
basis_inv = basis.inventory
2080
if file_id in basis_inv:
2082
if inv.is_root(file_id) and len(basis_inv) == 0:
2084
path = inv.id2path(file_id)
2085
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2088
self.outf.write(path + '\0')
2090
self.outf.write(osutils.quotefn(path) + '\n')
1913
def run(self, null=False):
1914
wt = WorkingTree.open_containing(u'.')[0]
1917
basis = wt.basis_tree()
1920
basis_inv = basis.inventory
1923
if file_id in basis_inv:
1925
if inv.is_root(file_id) and len(basis_inv) == 0:
1927
path = inv.id2path(file_id)
1928
if not os.access(osutils.abspath(path), os.F_OK):
1931
self.outf.write(path + '\0')
1933
self.outf.write(osutils.quotefn(path) + '\n')
2093
1940
class cmd_root(Command):
2094
__doc__ = """Show the tree root directory.
1941
"""Show the tree root directory.
2096
1943
The root is the nearest enclosing directory with a .bzr control
2408
2241
diff_type = 'full'
2410
# Build the log formatter
2411
if log_format is None:
2412
log_format = log.log_formatter_registry.get_default(b)
2413
# Make a non-encoding output to include the diffs - bug 328007
2414
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2415
lf = log_format(show_ids=show_ids, to_file=self.outf,
2416
to_exact_file=unencoded_output,
2417
show_timezone=timezone,
2418
delta_format=get_verbosity_level(),
2420
show_advice=levels is None,
2421
author_list_handler=authors)
2423
# Choose the algorithm for doing the logging. It's annoying
2424
# having multiple code paths like this but necessary until
2425
# the underlying repository format is faster at generating
2426
# deltas or can provide everything we need from the indices.
2427
# The default algorithm - match-using-deltas - works for
2428
# multiple files and directories and is faster for small
2429
# amounts of history (200 revisions say). However, it's too
2430
# slow for logging a single file in a repository with deep
2431
# history, i.e. > 10K revisions. In the spirit of "do no
2432
# evil when adding features", we continue to use the
2433
# original algorithm - per-file-graph - for the "single
2434
# file that isn't a directory without showing a delta" case.
2435
partial_history = revision and b.repository._format.supports_chks
2436
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2437
or delta_type or partial_history)
2439
# Build the LogRequest and execute it
2440
if len(file_ids) == 0:
2442
rqst = make_log_request_dict(
2443
direction=direction, specific_fileids=file_ids,
2444
start_revision=rev1, end_revision=rev2, limit=limit,
2445
message_search=message, delta_type=delta_type,
2446
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2447
exclude_common_ancestry=exclude_common_ancestry,
2449
Logger(b, rqst).show(lf)
2245
# Build the log formatter
2246
if log_format is None:
2247
log_format = log.log_formatter_registry.get_default(b)
2248
lf = log_format(show_ids=show_ids, to_file=self.outf,
2249
show_timezone=timezone,
2250
delta_format=get_verbosity_level(),
2252
show_advice=levels is None)
2254
# Choose the algorithm for doing the logging. It's annoying
2255
# having multiple code paths like this but necessary until
2256
# the underlying repository format is faster at generating
2257
# deltas or can provide everything we need from the indices.
2258
# The default algorithm - match-using-deltas - works for
2259
# multiple files and directories and is faster for small
2260
# amounts of history (200 revisions say). However, it's too
2261
# slow for logging a single file in a repository with deep
2262
# history, i.e. > 10K revisions. In the spirit of "do no
2263
# evil when adding features", we continue to use the
2264
# original algorithm - per-file-graph - for the "single
2265
# file that isn't a directory without showing a delta" case.
2266
partial_history = revision and b.repository._format.supports_chks
2267
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2268
or delta_type or partial_history)
2270
# Build the LogRequest and execute it
2271
if len(file_ids) == 0:
2273
rqst = make_log_request_dict(
2274
direction=direction, specific_fileids=file_ids,
2275
start_revision=rev1, end_revision=rev2, limit=limit,
2276
message_search=message, delta_type=delta_type,
2277
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2278
Logger(b, rqst).show(lf)
2452
2283
def _get_revision_range(revisionspec_list, branch, command_name):
2541
2366
help='Recurse into subdirectories.'),
2542
2367
Option('from-root',
2543
2368
help='Print paths relative to the root of the branch.'),
2544
Option('unknown', short_name='u',
2545
help='Print unknown files.'),
2369
Option('unknown', help='Print unknown files.'),
2546
2370
Option('versioned', help='Print versioned files.',
2547
2371
short_name='V'),
2548
Option('ignored', short_name='i',
2549
help='Print ignored files.'),
2550
Option('kind', short_name='k',
2372
Option('ignored', help='Print ignored files.'),
2374
help='Write an ascii NUL (\\0) separator '
2375
'between files rather than a newline.'),
2551
2377
help='List entries of a particular kind: file, directory, symlink.',
2557
2381
@display_command
2558
2382
def run(self, revision=None, verbose=False,
2559
2383
recursive=False, from_root=False,
2560
2384
unknown=False, versioned=False, ignored=False,
2561
null=False, kind=None, show_ids=False, path=None, directory=None):
2385
null=False, kind=None, show_ids=False, path=None):
2563
2387
if kind and kind not in ('file', 'directory', 'symlink'):
2564
2388
raise errors.BzrCommandError('invalid kind specified')
2598
2422
view_str = views.view_display_str(view_files)
2599
2423
note("Ignoring files outside view. View is %s" % view_str)
2601
self.add_cleanup(tree.lock_read().unlock)
2602
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2603
from_dir=relpath, recursive=recursive):
2604
# Apply additional masking
2605
if not all and not selection[fc]:
2607
if kind is not None and fkind != kind:
2612
fullpath = osutils.pathjoin(relpath, fp)
2615
views.check_path_in_view(tree, fullpath)
2616
except errors.FileOutsideView:
2427
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2428
from_dir=relpath, recursive=recursive):
2429
# Apply additional masking
2430
if not all and not selection[fc]:
2432
if kind is not None and fkind != kind:
2437
fullpath = osutils.pathjoin(relpath, fp)
2440
views.check_path_in_view(tree, fullpath)
2441
except errors.FileOutsideView:
2621
fp = osutils.pathjoin(prefix, fp)
2622
kindch = entry.kind_character()
2623
outstring = fp + kindch
2624
ui.ui_factory.clear_term()
2626
outstring = '%-8s %s' % (fc, outstring)
2627
if show_ids and fid is not None:
2628
outstring = "%-50s %s" % (outstring, fid)
2629
self.outf.write(outstring + '\n')
2631
self.outf.write(fp + '\0')
2634
self.outf.write(fid)
2635
self.outf.write('\0')
2643
self.outf.write('%-50s %s\n' % (outstring, my_id))
2446
fp = osutils.pathjoin(prefix, fp)
2447
kindch = entry.kind_character()
2448
outstring = fp + kindch
2449
ui.ui_factory.clear_term()
2451
outstring = '%-8s %s' % (fc, outstring)
2452
if show_ids and fid is not None:
2453
outstring = "%-50s %s" % (outstring, fid)
2645
2454
self.outf.write(outstring + '\n')
2456
self.outf.write(fp + '\0')
2459
self.outf.write(fid)
2460
self.outf.write('\0')
2468
self.outf.write('%-50s %s\n' % (outstring, my_id))
2470
self.outf.write(outstring + '\n')
2648
2475
class cmd_unknowns(Command):
2649
__doc__ = """List unknown files.
2476
"""List unknown files.
2653
2480
_see_also = ['ls']
2654
takes_options = ['directory']
2656
2482
@display_command
2657
def run(self, directory=u'.'):
2658
for f in WorkingTree.open_containing(directory)[0].unknowns():
2484
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2659
2485
self.outf.write(osutils.quotefn(f) + '\n')
2662
2488
class cmd_ignore(Command):
2663
__doc__ = """Ignore specified files or patterns.
2489
"""Ignore specified files or patterns.
2665
2491
See ``bzr help patterns`` for details on the syntax of patterns.
2667
If a .bzrignore file does not exist, the ignore command
2668
will create one and add the specified files or patterns to the newly
2669
created file. The ignore command will also automatically add the
2670
.bzrignore file to be versioned. Creating a .bzrignore file without
2671
the use of the ignore command will require an explicit add command.
2673
2493
To remove patterns from the ignore list, edit the .bzrignore file.
2674
2494
After adding, editing or deleting that file either indirectly by
2675
2495
using this command or directly by using an editor, be sure to commit
2678
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2679
the global ignore file can be found in the application data directory as
2680
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2681
Global ignores are not touched by this command. The global ignore file
2682
can be edited directly using an editor.
2684
Patterns prefixed with '!' are exceptions to ignore patterns and take
2685
precedence over regular ignores. Such exceptions are used to specify
2686
files that should be versioned which would otherwise be ignored.
2688
Patterns prefixed with '!!' act as regular ignore patterns, but have
2689
precedence over the '!' exception patterns.
2693
* Ignore patterns containing shell wildcards must be quoted from
2696
* Ignore patterns starting with "#" act as comments in the ignore file.
2697
To ignore patterns that begin with that character, use the "RE:" prefix.
2498
Note: ignore patterns containing shell wildcards must be quoted from
2700
2502
Ignore the top level Makefile::
2702
2504
bzr ignore ./Makefile
2704
Ignore .class files in all directories...::
2506
Ignore class files in all directories::
2706
2508
bzr ignore "*.class"
2708
...but do not ignore "special.class"::
2710
bzr ignore "!special.class"
2712
Ignore files whose name begins with the "#" character::
2716
2510
Ignore .o files under the lib directory::
2718
2512
bzr ignore "lib/**/*.o"
2724
2518
Ignore everything but the "debian" toplevel directory::
2726
2520
bzr ignore "RE:(?!debian/).*"
2728
Ignore everything except the "local" toplevel directory,
2729
but always ignore "*~" autosave files, even under local/::
2732
bzr ignore "!./local"
2736
2523
_see_also = ['status', 'ignored', 'patterns']
2737
2524
takes_args = ['name_pattern*']
2738
takes_options = ['directory',
2739
Option('default-rules',
2740
help='Display the default ignore rules that bzr uses.')
2526
Option('old-default-rules',
2527
help='Write out the ignore rules bzr < 0.9 always used.')
2743
def run(self, name_pattern_list=None, default_rules=None,
2530
def run(self, name_pattern_list=None, old_default_rules=None):
2745
2531
from bzrlib import ignores
2746
if default_rules is not None:
2747
# dump the default rules and exit
2748
for pattern in ignores.USER_DEFAULTS:
2749
self.outf.write("%s\n" % pattern)
2532
if old_default_rules is not None:
2533
# dump the rules and exit
2534
for pattern in ignores.OLD_DEFAULTS:
2751
2537
if not name_pattern_list:
2752
2538
raise errors.BzrCommandError("ignore requires at least one "
2753
"NAME_PATTERN or --default-rules.")
2539
"NAME_PATTERN or --old-default-rules")
2754
2540
name_pattern_list = [globbing.normalize_pattern(p)
2755
2541
for p in name_pattern_list]
2757
for p in name_pattern_list:
2758
if not globbing.Globster.is_pattern_valid(p):
2759
bad_patterns += ('\n %s' % p)
2761
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2762
ui.ui_factory.show_error(msg)
2763
raise errors.InvalidPattern('')
2764
2542
for name_pattern in name_pattern_list:
2765
2543
if (name_pattern[0] == '/' or
2766
2544
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2767
2545
raise errors.BzrCommandError(
2768
2546
"NAME_PATTERN should not be an absolute path")
2769
tree, relpath = WorkingTree.open_containing(directory)
2547
tree, relpath = WorkingTree.open_containing(u'.')
2770
2548
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2771
2549
ignored = globbing.Globster(name_pattern_list)
2773
self.add_cleanup(tree.lock_read().unlock)
2774
2552
for entry in tree.list_files():
2776
2554
if id is not None:
2777
2555
filename = entry[0]
2778
2556
if ignored.match(filename):
2779
matches.append(filename)
2557
matches.append(filename.encode('utf-8'))
2780
2559
if len(matches) > 0:
2781
self.outf.write("Warning: the following files are version controlled and"
2782
" match your ignore pattern:\n%s"
2783
"\nThese files will continue to be version controlled"
2784
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2560
print "Warning: the following files are version controlled and" \
2561
" match your ignore pattern:\n%s" \
2562
"\nThese files will continue to be version controlled" \
2563
" unless you 'bzr remove' them." % ("\n".join(matches),)
2787
2566
class cmd_ignored(Command):
2788
__doc__ = """List ignored files and the patterns that matched them.
2567
"""List ignored files and the patterns that matched them.
2790
2569
List all the ignored files and the ignore pattern that caused the file to
2798
2577
encoding_type = 'replace'
2799
2578
_see_also = ['ignore', 'ls']
2800
takes_options = ['directory']
2802
2580
@display_command
2803
def run(self, directory=u'.'):
2804
tree = WorkingTree.open_containing(directory)[0]
2805
self.add_cleanup(tree.lock_read().unlock)
2806
for path, file_class, kind, file_id, entry in tree.list_files():
2807
if file_class != 'I':
2809
## XXX: Slightly inefficient since this was already calculated
2810
pat = tree.is_ignored(path)
2811
self.outf.write('%-50s %s\n' % (path, pat))
2582
tree = WorkingTree.open_containing(u'.')[0]
2585
for path, file_class, kind, file_id, entry in tree.list_files():
2586
if file_class != 'I':
2588
## XXX: Slightly inefficient since this was already calculated
2589
pat = tree.is_ignored(path)
2590
self.outf.write('%-50s %s\n' % (path, pat))
2814
2595
class cmd_lookup_revision(Command):
2815
__doc__ = """Lookup the revision-id from a revision-number
2596
"""Lookup the revision-id from a revision-number
2818
2599
bzr lookup-revision 33
2821
2602
takes_args = ['revno']
2822
takes_options = ['directory']
2824
2604
@display_command
2825
def run(self, revno, directory=u'.'):
2605
def run(self, revno):
2827
2607
revno = int(revno)
2828
2608
except ValueError:
2829
raise errors.BzrCommandError("not a valid revision-number: %r"
2831
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2832
self.outf.write("%s\n" % revid)
2609
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2611
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2835
2614
class cmd_export(Command):
2836
__doc__ = """Export current or past revision to a destination directory or archive.
2615
"""Export current or past revision to a destination directory or archive.
2838
2617
If no revision is specified this exports the last committed revision.
2917
2692
@display_command
2918
2693
def run(self, filename, revision=None, name_from_revision=False,
2919
filters=False, directory=None):
2920
2695
if revision is not None and len(revision) != 1:
2921
2696
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2922
2697
" one revision specifier")
2923
2698
tree, branch, relpath = \
2924
_open_directory_or_containing_tree_or_branch(filename, directory)
2925
self.add_cleanup(branch.lock_read().unlock)
2926
return self._run(tree, branch, relpath, filename, revision,
2927
name_from_revision, filters)
2699
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2702
return self._run(tree, branch, relpath, filename, revision,
2703
name_from_revision, filters)
2929
2707
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2931
2709
if tree is None:
2932
2710
tree = b.basis_tree()
2933
2711
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2934
self.add_cleanup(rev_tree.lock_read().unlock)
2936
2713
old_file_id = rev_tree.path2id(relpath)
3175
2939
if local and not tree.branch.get_bound_location():
3176
2940
raise errors.LocalRequiresBoundBranch()
3178
if message is not None:
3180
file_exists = osutils.lexists(message)
3181
except UnicodeError:
3182
# The commit message contains unicode characters that can't be
3183
# represented in the filesystem encoding, so that can't be a
3188
'The commit message is a file name: "%(f)s".\n'
3189
'(use --file "%(f)s" to take commit message from that file)'
3191
ui.ui_factory.show_warning(warning_msg)
3193
message = message.replace('\r\n', '\n')
3194
message = message.replace('\r', '\n')
3196
raise errors.BzrCommandError(
3197
"please specify either --message or --file")
3199
2942
def get_message(commit_obj):
3200
2943
"""Callback to get commit message"""
3204
my_message = f.read().decode(osutils.get_user_encoding())
3207
elif message is not None:
3208
my_message = message
3210
# No message supplied: make one up.
3211
# text is the status of the tree
3212
text = make_commit_message_template_encoded(tree,
2944
my_message = message
2945
if my_message is None and not file:
2946
t = make_commit_message_template_encoded(tree,
3213
2947
selected_list, diff=show_diff,
3214
2948
output_encoding=osutils.get_user_encoding())
3215
# start_message is the template generated from hooks
3216
# XXX: Warning - looks like hooks return unicode,
3217
# make_commit_message_template_encoded returns user encoding.
3218
# We probably want to be using edit_commit_message instead to
3220
2949
start_message = generate_commit_message_template(commit_obj)
3221
my_message = edit_commit_message_encoded(text,
2950
my_message = edit_commit_message_encoded(t,
3222
2951
start_message=start_message)
3223
2952
if my_message is None:
3224
2953
raise errors.BzrCommandError("please specify a commit"
3225
2954
" message with either --message or --file")
2955
elif my_message and file:
2956
raise errors.BzrCommandError(
2957
"please specify either --message or --file")
2959
my_message = codecs.open(file, 'rt',
2960
osutils.get_user_encoding()).read()
3226
2961
if my_message == "":
3227
2962
raise errors.BzrCommandError("empty commit message specified")
3228
2963
return my_message
3230
# The API permits a commit with a filter of [] to mean 'select nothing'
3231
# but the command line should not do that.
3232
if not selected_list:
3233
selected_list = None
3235
2966
tree.commit(message_callback=get_message,
3236
2967
specific_files=selected_list,
3237
2968
allow_pointless=unchanged, strict=strict, local=local,
3238
2969
reporter=None, verbose=verbose, revprops=properties,
3239
authors=author, timestamp=commit_stamp,
3241
exclude=tree.safe_relpath_files(exclude))
2971
exclude=safe_relpath_files(tree, exclude))
3242
2972
except PointlessCommit:
2973
# FIXME: This should really happen before the file is read in;
2974
# perhaps prepare the commit; get the message; then actually commit
3243
2975
raise errors.BzrCommandError("No changes to commit."
3244
2976
" Use --unchanged to commit anyhow.")
3245
2977
except ConflictsInTree:
3330
3061
class cmd_upgrade(Command):
3331
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3333
When the default format has changed after a major new release of
3334
Bazaar, you may be informed during certain operations that you
3335
should upgrade. Upgrading to a newer format may improve performance
3336
or make new features available. It may however limit interoperability
3337
with older repositories or with older versions of Bazaar.
3339
If you wish to upgrade to a particular format rather than the
3340
current default, that can be specified using the --format option.
3341
As a consequence, you can use the upgrade command this way to
3342
"downgrade" to an earlier format, though some conversions are
3343
a one way process (e.g. changing from the 1.x default to the
3344
2.x default) so downgrading is not always possible.
3346
A backup.bzr.~#~ directory is created at the start of the conversion
3347
process (where # is a number). By default, this is left there on
3348
completion. If the conversion fails, delete the new .bzr directory
3349
and rename this one back in its place. Use the --clean option to ask
3350
for the backup.bzr directory to be removed on successful conversion.
3351
Alternatively, you can delete it by hand if everything looks good
3354
If the location given is a shared repository, dependent branches
3355
are also converted provided the repository converts successfully.
3356
If the conversion of a branch fails, remaining branches are still
3359
For more information on upgrades, see the Bazaar Upgrade Guide,
3360
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3062
"""Upgrade branch storage to current format.
3064
The check command or bzr developers may sometimes advise you to run
3065
this command. When the default format has changed you may also be warned
3066
during other operations to upgrade.
3363
_see_also = ['check', 'reconcile', 'formats']
3069
_see_also = ['check']
3364
3070
takes_args = ['url?']
3365
3071
takes_options = [
3366
RegistryOption('format',
3367
help='Upgrade to a specific format. See "bzr help'
3368
' formats" for details.',
3369
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3370
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3371
value_switches=True, title='Branch format'),
3373
help='Remove the backup.bzr directory if successful.'),
3375
help="Show what would be done, but don't actually do anything."),
3072
RegistryOption('format',
3073
help='Upgrade to a specific format. See "bzr help'
3074
' formats" for details.',
3075
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3076
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3077
value_switches=True, title='Branch format'),
3378
def run(self, url='.', format=None, clean=False, dry_run=False):
3080
def run(self, url='.', format=None):
3379
3081
from bzrlib.upgrade import upgrade
3380
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3382
if len(exceptions) == 1:
3383
# Compatibility with historical behavior
3082
upgrade(url, format)
3389
3085
class cmd_whoami(Command):
3390
__doc__ = """Show or set bzr user id.
3086
"""Show or set bzr user id.
3393
3089
Show the email of the current user::
3680
3369
raise errors.BzrCommandError("subunit not available. subunit "
3681
3370
"needs to be installed to use --subunit.")
3682
3371
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3683
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3684
# stdout, which would corrupt the subunit stream.
3685
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3686
# following code can be deleted when it's sufficiently deployed
3687
# -- vila/mgz 20100514
3688
if (sys.platform == "win32"
3689
and getattr(sys.stdout, 'fileno', None) is not None):
3691
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3693
3373
self.additional_selftest_args.setdefault(
3694
3374
'suite_decorators', []).append(parallel)
3696
raise errors.BzrCommandError(
3697
"--benchmark is no longer supported from bzr 2.2; "
3698
"use bzr-usertest instead")
3699
test_suite_factory = None
3700
selftest_kwargs = {"verbose": verbose,
3702
"stop_on_failure": one,
3703
"transport": transport,
3704
"test_suite_factory": test_suite_factory,
3705
"lsprof_timed": lsprof_timed,
3706
"lsprof_tests": lsprof_tests,
3707
"matching_tests_first": first,
3708
"list_only": list_only,
3709
"random_seed": randomize,
3710
"exclude_pattern": exclude,
3712
"load_list": load_list,
3713
"debug_flags": debugflag,
3714
"starting_with": starting_with
3716
selftest_kwargs.update(self.additional_selftest_args)
3718
# Make deprecation warnings visible, unless -Werror is set
3719
cleanup = symbol_versioning.activate_deprecation_warnings(
3376
test_suite_factory = benchmarks.test_suite
3377
# Unless user explicitly asks for quiet, be verbose in benchmarks
3378
verbose = not is_quiet()
3379
# TODO: should possibly lock the history file...
3380
benchfile = open(".perf_history", "at", buffering=1)
3382
test_suite_factory = None
3722
result = tests.selftest(**selftest_kwargs)
3385
selftest_kwargs = {"verbose": verbose,
3387
"stop_on_failure": one,
3388
"transport": transport,
3389
"test_suite_factory": test_suite_factory,
3390
"lsprof_timed": lsprof_timed,
3391
"bench_history": benchfile,
3392
"matching_tests_first": first,
3393
"list_only": list_only,
3394
"random_seed": randomize,
3395
"exclude_pattern": exclude,
3397
"load_list": load_list,
3398
"debug_flags": debugflag,
3399
"starting_with": starting_with
3401
selftest_kwargs.update(self.additional_selftest_args)
3402
result = selftest(**selftest_kwargs)
3404
if benchfile is not None:
3725
3406
return int(not result)
3728
3409
class cmd_version(Command):
3729
__doc__ = """Show version of bzr."""
3410
"""Show version of bzr."""
3731
3412
encoding_type = 'replace'
3732
3413
takes_options = [
3766
3447
branch1 = Branch.open_containing(branch)[0]
3767
3448
branch2 = Branch.open_containing(other)[0]
3768
self.add_cleanup(branch1.lock_read().unlock)
3769
self.add_cleanup(branch2.lock_read().unlock)
3770
last1 = ensure_null(branch1.last_revision())
3771
last2 = ensure_null(branch2.last_revision())
3773
graph = branch1.repository.get_graph(branch2.repository)
3774
base_rev_id = graph.find_unique_lca(last1, last2)
3776
self.outf.write('merge base is revision %s\n' % base_rev_id)
3453
last1 = ensure_null(branch1.last_revision())
3454
last2 = ensure_null(branch2.last_revision())
3456
graph = branch1.repository.get_graph(branch2.repository)
3457
base_rev_id = graph.find_unique_lca(last1, last2)
3459
print 'merge base is revision %s' % base_rev_id
3779
3466
class cmd_merge(Command):
3780
__doc__ = """Perform a three-way merge.
3467
"""Perform a three-way merge.
3782
3469
The source of the merge can be specified either in the form of a branch,
3783
3470
or in the form of a path to a file containing a merge directive generated
3784
3471
with bzr send. If neither is specified, the default is the upstream branch
3785
3472
or the branch most recently merged using --remember.
3787
When merging from a branch, by default bzr will try to merge in all new
3788
work from the other branch, automatically determining an appropriate base
3789
revision. If this fails, you may need to give an explicit base.
3791
To pick a different ending revision, pass "--revision OTHER". bzr will
3792
try to merge in all new work up to and including revision OTHER.
3794
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3795
through OTHER, excluding BASE but including OTHER, will be merged. If this
3796
causes some revisions to be skipped, i.e. if the destination branch does
3797
not already contain revision BASE, such a merge is commonly referred to as
3800
Revision numbers are always relative to the source branch.
3474
When merging a branch, by default the tip will be merged. To pick a different
3475
revision, pass --revision. If you specify two values, the first will be used as
3476
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3477
available revisions, like this is commonly referred to as "cherrypicking".
3479
Revision numbers are always relative to the branch being merged.
3481
By default, bzr will try to merge in all new work from the other
3482
branch, automatically determining an appropriate base. If this
3483
fails, you may need to give an explicit base.
3802
3485
Merge will do its best to combine the changes in two branches, but there
3803
3486
are some kinds of problems only a human can fix. When it encounters those,
3896
3563
verified = 'inapplicable'
3897
3564
tree = WorkingTree.open_containing(directory)[0]
3566
# die as quickly as possible if there are uncommitted changes
3900
3568
basis_tree = tree.revision_tree(tree.last_revision())
3901
3569
except errors.NoSuchRevision:
3902
3570
basis_tree = tree.basis_tree()
3904
# die as quickly as possible if there are uncommitted changes
3906
if tree.has_changes():
3572
changes = tree.changes_from(basis_tree)
3573
if changes.has_changed():
3907
3574
raise errors.UncommittedChanges(tree)
3909
3576
view_info = _get_view_info_for_change_reporter(tree)
3910
3577
change_reporter = delta._ChangeReporter(
3911
3578
unversioned_filter=tree.is_ignored, view_info=view_info)
3912
pb = ui.ui_factory.nested_progress_bar()
3913
self.add_cleanup(pb.finished)
3914
self.add_cleanup(tree.lock_write().unlock)
3915
if location is not None:
3917
mergeable = bundle.read_mergeable_from_url(location,
3918
possible_transports=possible_transports)
3919
except errors.NotABundle:
3581
pb = ui.ui_factory.nested_progress_bar()
3582
cleanups.append(pb.finished)
3584
cleanups.append(tree.unlock)
3585
if location is not None:
3587
mergeable = bundle.read_mergeable_from_url(location,
3588
possible_transports=possible_transports)
3589
except errors.NotABundle:
3593
raise errors.BzrCommandError('Cannot use --uncommitted'
3594
' with bundles or merge directives.')
3596
if revision is not None:
3597
raise errors.BzrCommandError(
3598
'Cannot use -r with merge directives or bundles')
3599
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3602
if merger is None and uncommitted:
3603
if revision is not None and len(revision) > 0:
3604
raise errors.BzrCommandError('Cannot use --uncommitted and'
3605
' --revision at the same time.')
3606
location = self._select_branch_location(tree, location)[0]
3607
other_tree, other_path = WorkingTree.open_containing(location)
3608
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3610
allow_pending = False
3611
if other_path != '':
3612
merger.interesting_files = [other_path]
3615
merger, allow_pending = self._get_merger_from_branch(tree,
3616
location, revision, remember, possible_transports, pb)
3618
merger.merge_type = merge_type
3619
merger.reprocess = reprocess
3620
merger.show_base = show_base
3621
self.sanity_check_merger(merger)
3622
if (merger.base_rev_id == merger.other_rev_id and
3623
merger.other_rev_id is not None):
3624
note('Nothing to do.')
3627
if merger.interesting_files is not None:
3628
raise errors.BzrCommandError('Cannot pull individual files')
3629
if (merger.base_rev_id == tree.last_revision()):
3630
result = tree.pull(merger.other_branch, False,
3631
merger.other_rev_id)
3632
result.report(self.outf)
3634
merger.check_basis(False)
3636
return self._do_preview(merger)
3923
raise errors.BzrCommandError('Cannot use --uncommitted'
3924
' with bundles or merge directives.')
3926
if revision is not None:
3927
raise errors.BzrCommandError(
3928
'Cannot use -r with merge directives or bundles')
3929
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3932
if merger is None and uncommitted:
3933
if revision is not None and len(revision) > 0:
3934
raise errors.BzrCommandError('Cannot use --uncommitted and'
3935
' --revision at the same time.')
3936
merger = self.get_merger_from_uncommitted(tree, location, None)
3937
allow_pending = False
3940
merger, allow_pending = self._get_merger_from_branch(tree,
3941
location, revision, remember, possible_transports, None)
3943
merger.merge_type = merge_type
3944
merger.reprocess = reprocess
3945
merger.show_base = show_base
3946
self.sanity_check_merger(merger)
3947
if (merger.base_rev_id == merger.other_rev_id and
3948
merger.other_rev_id is not None):
3949
note('Nothing to do.')
3952
if merger.interesting_files is not None:
3953
raise errors.BzrCommandError('Cannot pull individual files')
3954
if (merger.base_rev_id == tree.last_revision()):
3955
result = tree.pull(merger.other_branch, False,
3956
merger.other_rev_id)
3957
result.report(self.outf)
3959
if merger.this_basis is None:
3960
raise errors.BzrCommandError(
3961
"This branch has no commits."
3962
" (perhaps you would prefer 'bzr pull')")
3964
return self._do_preview(merger)
3966
return self._do_interactive(merger)
3968
return self._do_merge(merger, change_reporter, allow_pending,
3971
def _get_preview(self, merger):
3638
return self._do_merge(merger, change_reporter, allow_pending,
3641
for cleanup in reversed(cleanups):
3644
def _do_preview(self, merger):
3645
from bzrlib.diff import show_diff_trees
3972
3646
tree_merger = merger.make_merger()
3973
3647
tt = tree_merger.make_preview_transform()
3974
self.add_cleanup(tt.finalize)
3975
result_tree = tt.get_preview_tree()
3978
def _do_preview(self, merger):
3979
from bzrlib.diff import show_diff_trees
3980
result_tree = self._get_preview(merger)
3981
path_encoding = osutils.get_diff_header_encoding()
3982
show_diff_trees(merger.this_tree, result_tree, self.outf,
3983
old_label='', new_label='',
3984
path_encoding=path_encoding)
3649
result_tree = tt.get_preview_tree()
3650
show_diff_trees(merger.this_tree, result_tree, self.outf,
3651
old_label='', new_label='')
3986
3655
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3987
3656
merger.change_reporter = change_reporter
4174
3809
def run(self, file_list=None, merge_type=None, show_base=False,
4175
3810
reprocess=False):
4176
from bzrlib.conflicts import restore
4177
3811
if merge_type is None:
4178
3812
merge_type = _mod_merge.Merge3Merger
4179
tree, file_list = WorkingTree.open_containing_paths(file_list)
4180
self.add_cleanup(tree.lock_write().unlock)
4181
parents = tree.get_parent_ids()
4182
if len(parents) != 2:
4183
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4184
" merges. Not cherrypicking or"
4186
repository = tree.branch.repository
4187
interesting_ids = None
4189
conflicts = tree.conflicts()
4190
if file_list is not None:
4191
interesting_ids = set()
4192
for filename in file_list:
4193
file_id = tree.path2id(filename)
4195
raise errors.NotVersionedError(filename)
4196
interesting_ids.add(file_id)
4197
if tree.kind(file_id) != "directory":
3813
tree, file_list = tree_files(file_list)
3816
parents = tree.get_parent_ids()
3817
if len(parents) != 2:
3818
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3819
" merges. Not cherrypicking or"
3821
repository = tree.branch.repository
3822
interesting_ids = None
3824
conflicts = tree.conflicts()
3825
if file_list is not None:
3826
interesting_ids = set()
3827
for filename in file_list:
3828
file_id = tree.path2id(filename)
3830
raise errors.NotVersionedError(filename)
3831
interesting_ids.add(file_id)
3832
if tree.kind(file_id) != "directory":
4200
for name, ie in tree.inventory.iter_entries(file_id):
4201
interesting_ids.add(ie.file_id)
4202
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4204
# Remerge only supports resolving contents conflicts
4205
allowed_conflicts = ('text conflict', 'contents conflict')
4206
restore_files = [c.path for c in conflicts
4207
if c.typestring in allowed_conflicts]
4208
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4209
tree.set_conflicts(ConflictList(new_conflicts))
4210
if file_list is not None:
4211
restore_files = file_list
4212
for filename in restore_files:
3835
for name, ie in tree.inventory.iter_entries(file_id):
3836
interesting_ids.add(ie.file_id)
3837
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3839
# Remerge only supports resolving contents conflicts
3840
allowed_conflicts = ('text conflict', 'contents conflict')
3841
restore_files = [c.path for c in conflicts
3842
if c.typestring in allowed_conflicts]
3843
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3844
tree.set_conflicts(ConflictList(new_conflicts))
3845
if file_list is not None:
3846
restore_files = file_list
3847
for filename in restore_files:
3849
restore(tree.abspath(filename))
3850
except errors.NotConflicted:
3852
# Disable pending merges, because the file texts we are remerging
3853
# have not had those merges performed. If we use the wrong parents
3854
# list, we imply that the working tree text has seen and rejected
3855
# all the changes from the other tree, when in fact those changes
3856
# have not yet been seen.
3857
pb = ui.ui_factory.nested_progress_bar()
3858
tree.set_parent_ids(parents[:1])
4214
restore(tree.abspath(filename))
4215
except errors.NotConflicted:
4217
# Disable pending merges, because the file texts we are remerging
4218
# have not had those merges performed. If we use the wrong parents
4219
# list, we imply that the working tree text has seen and rejected
4220
# all the changes from the other tree, when in fact those changes
4221
# have not yet been seen.
4222
tree.set_parent_ids(parents[:1])
4224
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4225
merger.interesting_ids = interesting_ids
4226
merger.merge_type = merge_type
4227
merger.show_base = show_base
4228
merger.reprocess = reprocess
4229
conflicts = merger.do_merge()
3860
merger = _mod_merge.Merger.from_revision_ids(pb,
3862
merger.interesting_ids = interesting_ids
3863
merger.merge_type = merge_type
3864
merger.show_base = show_base
3865
merger.reprocess = reprocess
3866
conflicts = merger.do_merge()
3868
tree.set_parent_ids(parents)
4231
tree.set_parent_ids(parents)
4232
3872
if conflicts > 0:
4257
3896
name. If you name a directory, all the contents of that directory will be
4260
If you have newly added files since the target revision, they will be
4261
removed. If the files to be removed have been changed, backups will be
4262
created as above. Directories containing unknown files will not be
3899
Any files that have been newly added since that revision will be deleted,
3900
with a backup kept if appropriate. Directories containing unknown files
3901
will not be deleted.
4265
The working tree contains a list of revisions that have been merged but
4266
not yet committed. These revisions will be included as additional parents
4267
of the next commit. Normally, using revert clears that list as well as
4268
reverting the files. If any files are specified, revert leaves the list
4269
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4270
.`` in the tree root to revert all files but keep the recorded merges,
4271
and ``bzr revert --forget-merges`` to clear the pending merge list without
3903
The working tree contains a list of pending merged revisions, which will
3904
be included as parents in the next commit. Normally, revert clears that
3905
list as well as reverting the files. If any files are specified, revert
3906
leaves the pending merge list alone and reverts only the files. Use "bzr
3907
revert ." in the tree root to revert all files but keep the merge record,
3908
and "bzr revert --forget-merges" to clear the pending merge list without
4272
3909
reverting any files.
4274
Using "bzr revert --forget-merges", it is possible to apply all of the
4275
changes from a branch in a single revision. To do this, perform the merge
4276
as desired. Then doing revert with the "--forget-merges" option will keep
4277
the content of the tree as it was, but it will clear the list of pending
4278
merges. The next commit will then contain all of the changes that are
4279
present in the other branch, but without any other parent revisions.
4280
Because this technique forgets where these changes originated, it may
4281
cause additional conflicts on later merges involving the same source and
4285
_see_also = ['cat', 'export', 'merge', 'shelve']
3912
_see_also = ['cat', 'export']
4286
3913
takes_options = [
4288
3915
Option('no-backup', "Do not save backups of reverted files."),
4294
3921
def run(self, revision=None, no_backup=False, file_list=None,
4295
3922
forget_merges=None):
4296
tree, file_list = WorkingTree.open_containing_paths(file_list)
4297
self.add_cleanup(tree.lock_tree_write().unlock)
4299
tree.set_parent_ids(tree.get_parent_ids()[:1])
4301
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3923
tree, file_list = tree_files(file_list)
3927
tree.set_parent_ids(tree.get_parent_ids()[:1])
3929
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4304
3934
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4305
3935
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4306
tree.revert(file_list, rev_tree, not no_backup, None,
4307
report_changes=True)
3936
pb = ui.ui_factory.nested_progress_bar()
3938
tree.revert(file_list, rev_tree, not no_backup, pb,
3939
report_changes=True)
4310
3944
class cmd_assert_fail(Command):
4311
__doc__ = """Test reporting of assertion failures"""
3945
"""Test reporting of assertion failures"""
4312
3946
# intended just for use in testing
4465
4089
_get_revision_range(revision,
4466
4090
remote_branch, self.name()))
4468
local_extra, remote_extra = find_unmerged(
4469
local_branch, remote_branch, restrict,
4470
backward=not reverse,
4471
include_merges=include_merges,
4472
local_revid_range=local_revid_range,
4473
remote_revid_range=remote_revid_range)
4475
if log_format is None:
4476
registry = log.log_formatter_registry
4477
log_format = registry.get_default(local_branch)
4478
lf = log_format(to_file=self.outf,
4480
show_timezone='original')
4483
if local_extra and not theirs_only:
4484
message("You have %d extra revision(s):\n" %
4486
for revision in iter_log_revisions(local_extra,
4487
local_branch.repository,
4489
lf.log_revision(revision)
4490
printed_local = True
4493
printed_local = False
4495
if remote_extra and not mine_only:
4496
if printed_local is True:
4498
message("You are missing %d revision(s):\n" %
4500
for revision in iter_log_revisions(remote_extra,
4501
remote_branch.repository,
4503
lf.log_revision(revision)
4506
if mine_only and not local_extra:
4507
# We checked local, and found nothing extra
4508
message('This branch is up to date.\n')
4509
elif theirs_only and not remote_extra:
4510
# We checked remote, and found nothing extra
4511
message('Other branch is up to date.\n')
4512
elif not (mine_only or theirs_only or local_extra or
4514
# We checked both branches, and neither one had extra
4516
message("Branches are up to date.\n")
4092
local_branch.lock_read()
4094
remote_branch.lock_read()
4096
local_extra, remote_extra = find_unmerged(
4097
local_branch, remote_branch, restrict,
4098
backward=not reverse,
4099
include_merges=include_merges,
4100
local_revid_range=local_revid_range,
4101
remote_revid_range=remote_revid_range)
4103
if log_format is None:
4104
registry = log.log_formatter_registry
4105
log_format = registry.get_default(local_branch)
4106
lf = log_format(to_file=self.outf,
4108
show_timezone='original')
4111
if local_extra and not theirs_only:
4112
message("You have %d extra revision(s):\n" %
4114
for revision in iter_log_revisions(local_extra,
4115
local_branch.repository,
4117
lf.log_revision(revision)
4118
printed_local = True
4121
printed_local = False
4123
if remote_extra and not mine_only:
4124
if printed_local is True:
4126
message("You are missing %d revision(s):\n" %
4128
for revision in iter_log_revisions(remote_extra,
4129
remote_branch.repository,
4131
lf.log_revision(revision)
4134
if mine_only and not local_extra:
4135
# We checked local, and found nothing extra
4136
message('This branch is up to date.\n')
4137
elif theirs_only and not remote_extra:
4138
# We checked remote, and found nothing extra
4139
message('Other branch is up to date.\n')
4140
elif not (mine_only or theirs_only or local_extra or
4142
# We checked both branches, and neither one had extra
4144
message("Branches are up to date.\n")
4146
remote_branch.unlock()
4148
local_branch.unlock()
4518
4149
if not status_code and parent is None and other_branch is not None:
4519
self.add_cleanup(local_branch.lock_write().unlock)
4520
# handle race conditions - a parent might be set while we run.
4521
if local_branch.get_parent() is None:
4522
local_branch.set_parent(remote_branch.base)
4150
local_branch.lock_write()
4152
# handle race conditions - a parent might be set while we run.
4153
if local_branch.get_parent() is None:
4154
local_branch.set_parent(remote_branch.base)
4156
local_branch.unlock()
4523
4157
return status_code
4526
4160
class cmd_pack(Command):
4527
__doc__ = """Compress the data within a repository.
4529
This operation compresses the data within a bazaar repository. As
4530
bazaar supports automatic packing of repository, this operation is
4531
normally not required to be done manually.
4533
During the pack operation, bazaar takes a backup of existing repository
4534
data, i.e. pack files. This backup is eventually removed by bazaar
4535
automatically when it is safe to do so. To save disk space by removing
4536
the backed up pack files, the --clean-obsolete-packs option may be
4539
Warning: If you use --clean-obsolete-packs and your machine crashes
4540
during or immediately after repacking, you may be left with a state
4541
where the deletion has been written to disk but the new packs have not
4542
been. In this case the repository may be unusable.
4161
"""Compress the data within a repository."""
4545
4163
_see_also = ['repositories']
4546
4164
takes_args = ['branch_or_repo?']
4548
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4551
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4166
def run(self, branch_or_repo='.'):
4552
4167
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4554
4169
branch = dir.open_branch()
4555
4170
repository = branch.repository
4556
4171
except errors.NotBranchError:
4557
4172
repository = dir.open_repository()
4558
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4561
4176
class cmd_plugins(Command):
4562
__doc__ = """List the installed plugins.
4177
"""List the installed plugins.
4564
4179
This command displays the list of installed plugins including
4565
4180
version of plugin and a short description of each.
4652
4270
Option('long', help='Show commit date in annotations.'),
4657
4274
encoding_type = 'exact'
4659
4276
@display_command
4660
4277
def run(self, filename, all=False, long=False, revision=None,
4661
show_ids=False, directory=None):
4662
4279
from bzrlib.annotate import annotate_file, annotate_file_tree
4663
4280
wt, branch, relpath = \
4664
_open_directory_or_containing_tree_or_branch(filename, directory)
4666
self.add_cleanup(wt.lock_read().unlock)
4668
self.add_cleanup(branch.lock_read().unlock)
4669
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4670
self.add_cleanup(tree.lock_read().unlock)
4672
file_id = wt.path2id(relpath)
4674
file_id = tree.path2id(relpath)
4676
raise errors.NotVersionedError(filename)
4677
file_version = tree.inventory[file_id].revision
4678
if wt is not None and revision is None:
4679
# If there is a tree and we're not annotating historical
4680
# versions, annotate the working tree's content.
4681
annotate_file_tree(wt, file_id, self.outf, long, all,
4684
annotate_file(branch, file_version, file_id, long, all, self.outf,
4281
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4287
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4289
file_id = wt.path2id(relpath)
4291
file_id = tree.path2id(relpath)
4293
raise errors.NotVersionedError(filename)
4294
file_version = tree.inventory[file_id].revision
4295
if wt is not None and revision is None:
4296
# If there is a tree and we're not annotating historical
4297
# versions, annotate the working tree's content.
4298
annotate_file_tree(wt, file_id, self.outf, long, all,
4301
annotate_file(branch, file_version, file_id, long, all, self.outf,
4688
4310
class cmd_re_sign(Command):
4689
__doc__ = """Create a digital signature for an existing revision."""
4311
"""Create a digital signature for an existing revision."""
4690
4312
# TODO be able to replace existing ones.
4692
4314
hidden = True # is this right ?
4693
4315
takes_args = ['revision_id*']
4694
takes_options = ['directory', 'revision']
4316
takes_options = ['revision']
4696
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4318
def run(self, revision_id_list=None, revision=None):
4697
4319
if revision_id_list is not None and revision is not None:
4698
4320
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4699
4321
if revision_id_list is None and revision is None:
4700
4322
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4701
b = WorkingTree.open_containing(directory)[0].branch
4702
self.add_cleanup(b.lock_write().unlock)
4703
return self._run(b, revision_id_list, revision)
4323
b = WorkingTree.open_containing(u'.')[0].branch
4326
return self._run(b, revision_id_list, revision)
4705
4330
def _run(self, b, revision_id_list, revision):
4706
4331
import bzrlib.gpg as gpg
4896
4524
end_revision=last_revno)
4899
self.outf.write('Dry-run, pretending to remove'
4900
' the above revisions.\n')
4527
print 'Dry-run, pretending to remove the above revisions.'
4529
val = raw_input('Press <enter> to continue')
4902
self.outf.write('The above revision(s) will be removed.\n')
4905
if not ui.ui_factory.confirm_action(
4906
'Uncommit these revisions',
4907
'bzrlib.builtins.uncommit',
4909
self.outf.write('Canceled\n')
4531
print 'The above revision(s) will be removed.'
4533
val = raw_input('Are you sure [y/N]? ')
4534
if val.lower() not in ('y', 'yes'):
4912
4538
mutter('Uncommitting from {%s} to {%s}',
4913
4539
last_rev_id, rev_id)
4914
4540
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4915
4541
revno=revno, local=local)
4916
self.outf.write('You can restore the old tip by running:\n'
4917
' bzr pull . -r revid:%s\n' % last_rev_id)
4542
note('You can restore the old tip by running:\n'
4543
' bzr pull . -r revid:%s', last_rev_id)
4920
4546
class cmd_break_lock(Command):
4921
__doc__ = """Break a dead lock.
4923
This command breaks a lock on a repository, branch, working directory or
4547
"""Break a dead lock on a repository, branch or working directory.
4926
4549
CAUTION: Locks should only be broken when you are sure that the process
4927
4550
holding the lock has been stopped.
4929
You can get information on what locks are open via the 'bzr info
4930
[location]' command.
4552
You can get information on what locks are open via the 'bzr info' command.
4934
bzr break-lock bzr+ssh://example.com/bzr/foo
4935
bzr break-lock --conf ~/.bazaar
4938
4557
takes_args = ['location?']
4941
help='LOCATION is the directory where the config lock is.'),
4943
help='Do not ask for confirmation before breaking the lock.'),
4946
def run(self, location=None, config=False, force=False):
4559
def run(self, location=None, show=False):
4947
4560
if location is None:
4948
4561
location = u'.'
4950
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4952
{'bzrlib.lockdir.break': True})
4954
conf = _mod_config.LockableConfig(file_name=location)
4957
control, relpath = bzrdir.BzrDir.open_containing(location)
4959
control.break_lock()
4960
except NotImplementedError:
4562
control, relpath = bzrdir.BzrDir.open_containing(location)
4564
control.break_lock()
4565
except NotImplementedError:
4964
4569
class cmd_wait_until_signalled(Command):
4965
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4570
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4967
4572
This just prints a line to signal when it is ready, then blocks on stdin.
5226
4826
directly from the merge directive, without retrieving data from a
5229
`bzr send` creates a compact data set that, when applied using bzr
5230
merge, has the same effect as merging from the source branch.
5232
By default the merge directive is self-contained and can be applied to any
5233
branch containing submit_branch in its ancestory without needing access to
5236
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5237
revisions, but only a structured request to merge from the
5238
public_location. In that case the public_branch is needed and it must be
5239
up-to-date and accessible to the recipient. The public_branch is always
5240
included if known, so that people can check it later.
5242
The submit branch defaults to the parent of the source branch, but can be
5243
overridden. Both submit branch and public branch will be remembered in
5244
branch.conf the first time they are used for a particular branch. The
5245
source branch defaults to that containing the working directory, but can
5246
be changed using --from.
5248
In order to calculate those changes, bzr must analyse the submit branch.
5249
Therefore it is most efficient for the submit branch to be a local mirror.
5250
If a public location is known for the submit_branch, that location is used
5251
in the merge directive.
5253
The default behaviour is to send the merge directive by mail, unless -o is
5254
given, in which case it is sent to a file.
4829
If --no-bundle is specified, then public_branch is needed (and must be
4830
up-to-date), so that the receiver can perform the merge using the
4831
public_branch. The public_branch is always included if known, so that
4832
people can check it later.
4834
The submit branch defaults to the parent, but can be overridden. Both
4835
submit branch and public branch will be remembered if supplied.
4837
If a public_branch is known for the submit_branch, that public submit
4838
branch is used in the merge instructions. This means that a local mirror
4839
can be used as your actual submit branch, once you have set public_branch
5256
4842
Mail is sent using your preferred mail program. This should be transparent
5257
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4843
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5258
4844
If the preferred client can't be found (or used), your editor will be used.
5260
4846
To use a specific mail program, set the mail_client configuration option.
5261
4847
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5262
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5263
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5264
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4848
specific clients are "claws", "evolution", "kmail", "mutt", and
4849
"thunderbird"; generic options are "default", "editor", "emacsclient",
4850
"mapi", and "xdg-email". Plugins may also add supported clients.
5267
4852
If mail is being sent, a to address is required. This can be supplied
5268
4853
either on the commandline, by setting the submit_to configuration
5302
4883
short_name='f',
5304
4885
Option('output', short_name='o',
5305
help='Write merge directive to this file or directory; '
4886
help='Write merge directive to this file; '
5306
4887
'use - for stdout.',
5309
help='Refuse to send if there are uncommitted changes in'
5310
' the working tree, --no-strict disables the check.'),
5311
4889
Option('mail-to', help='Mail the request to this address.',
5315
4893
Option('body', help='Body for the email.', type=unicode),
5316
4894
RegistryOption('format',
5317
help='Use the specified output format.',
5318
lazy_registry=('bzrlib.send', 'format_registry')),
4895
help='Use the specified output format.',
4896
lazy_registry=('bzrlib.send', 'format_registry'))
5321
4899
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5322
4900
no_patch=False, revision=None, remember=False, output=None,
5323
format=None, mail_to=None, message=None, body=None,
5324
strict=None, **kwargs):
4901
format=None, mail_to=None, message=None, body=None, **kwargs):
5325
4902
from bzrlib.send import send
5326
4903
return send(submit_branch, revision, public_branch, remember,
5327
format, no_bundle, no_patch, output,
5328
kwargs.get('from', '.'), mail_to, message, body,
4904
format, no_bundle, no_patch, output,
4905
kwargs.get('from', '.'), mail_to, message, body,
5333
4909
class cmd_bundle_revisions(cmd_send):
5334
__doc__ = """Create a merge-directive for submitting changes.
4910
"""Create a merge-directive for submitting changes.
5336
4912
A merge directive provides many things needed for requesting merges:
5419
4992
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5420
4993
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5422
If no tag name is specified it will be determined through the
5423
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5424
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5428
4996
_see_also = ['commit', 'tags']
5429
takes_args = ['tag_name?']
4997
takes_args = ['tag_name']
5430
4998
takes_options = [
5431
4999
Option('delete',
5432
5000
help='Delete this tag rather than placing it.',
5434
custom_help('directory',
5435
help='Branch in which to place the tag.'),
5003
help='Branch in which to place the tag.',
5436
5007
Option('force',
5437
5008
help='Replace existing tags.',
5442
def run(self, tag_name=None,
5013
def run(self, tag_name,
5448
5019
branch, relpath = Branch.open_containing(directory)
5449
self.add_cleanup(branch.lock_write().unlock)
5451
if tag_name is None:
5452
raise errors.BzrCommandError("No tag specified to delete.")
5453
branch.tags.delete_tag(tag_name)
5454
note('Deleted tag %s.' % tag_name)
5457
if len(revision) != 1:
5458
raise errors.BzrCommandError(
5459
"Tags can only be placed on a single revision, "
5461
revision_id = revision[0].as_revision_id(branch)
5023
branch.tags.delete_tag(tag_name)
5024
self.outf.write('Deleted tag %s.\n' % tag_name)
5463
revision_id = branch.last_revision()
5464
if tag_name is None:
5465
tag_name = branch.automatic_tag_name(revision_id)
5466
if tag_name is None:
5467
raise errors.BzrCommandError(
5468
"Please specify a tag name.")
5469
if (not force) and branch.tags.has_tag(tag_name):
5470
raise errors.TagAlreadyExists(tag_name)
5471
branch.tags.set_tag(tag_name, revision_id)
5472
note('Created tag %s.' % tag_name)
5027
if len(revision) != 1:
5028
raise errors.BzrCommandError(
5029
"Tags can only be placed on a single revision, "
5031
revision_id = revision[0].as_revision_id(branch)
5033
revision_id = branch.last_revision()
5034
if (not force) and branch.tags.has_tag(tag_name):
5035
raise errors.TagAlreadyExists(tag_name)
5036
branch.tags.set_tag(tag_name, revision_id)
5037
self.outf.write('Created tag %s.\n' % tag_name)
5475
5042
class cmd_tags(Command):
5476
__doc__ = """List tags.
5478
5045
This command shows a table of tag names and the revisions they reference.
5481
5048
_see_also = ['tag']
5482
5049
takes_options = [
5483
custom_help('directory',
5484
help='Branch whose tags should be displayed.'),
5051
help='Branch whose tags should be displayed.',
5485
5055
RegistryOption.from_kwargs('sort',
5486
5056
'Sort tags by different criteria.', title='Sorting',
5487
natural='Sort numeric substrings as numbers:'
5488
' suitable for version numbers. (default)',
5489
alpha='Sort tags lexicographically.',
5057
alpha='Sort tags lexicographically (default).',
5490
5058
time='Sort tags chronologically.',
5509
self.add_cleanup(branch.lock_read().unlock)
5511
graph = branch.repository.get_graph()
5512
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5513
revid1, revid2 = rev1.rev_id, rev2.rev_id
5514
# only show revisions between revid1 and revid2 (inclusive)
5515
tags = [(tag, revid) for tag, revid in tags if
5516
graph.is_between(revid, revid1, revid2)]
5517
if sort == 'natural':
5518
def natural_sort_key(tag):
5519
return [f(s) for f,s in
5520
zip(itertools.cycle((unicode.lower,int)),
5521
re.split('([0-9]+)', tag[0]))]
5522
tags.sort(key=natural_sort_key)
5523
elif sort == 'alpha':
5525
elif sort == 'time':
5527
for tag, revid in tags:
5529
revobj = branch.repository.get_revision(revid)
5530
except errors.NoSuchRevision:
5531
timestamp = sys.maxint # place them at the end
5533
timestamp = revobj.timestamp
5534
timestamps[revid] = timestamp
5535
tags.sort(key=lambda x: timestamps[x[1]])
5537
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5538
for index, (tag, revid) in enumerate(tags):
5540
revno = branch.revision_id_to_dotted_revno(revid)
5541
if isinstance(revno, tuple):
5542
revno = '.'.join(map(str, revno))
5543
except errors.NoSuchRevision:
5544
# Bad tag data/merges can lead to tagged revisions
5545
# which are not in this branch. Fail gracefully ...
5547
tags[index] = (tag, revno)
5080
graph = branch.repository.get_graph()
5081
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5082
revid1, revid2 = rev1.rev_id, rev2.rev_id
5083
# only show revisions between revid1 and revid2 (inclusive)
5084
tags = [(tag, revid) for tag, revid in tags if
5085
graph.is_between(revid, revid1, revid2)]
5088
elif sort == 'time':
5090
for tag, revid in tags:
5092
revobj = branch.repository.get_revision(revid)
5093
except errors.NoSuchRevision:
5094
timestamp = sys.maxint # place them at the end
5096
timestamp = revobj.timestamp
5097
timestamps[revid] = timestamp
5098
tags.sort(key=lambda x: timestamps[x[1]])
5100
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5101
for index, (tag, revid) in enumerate(tags):
5103
revno = branch.revision_id_to_dotted_revno(revid)
5104
if isinstance(revno, tuple):
5105
revno = '.'.join(map(str, revno))
5106
except errors.NoSuchRevision:
5107
# Bad tag data/merges can lead to tagged revisions
5108
# which are not in this branch. Fail gracefully ...
5110
tags[index] = (tag, revno)
5549
5113
for tag, revspec in tags:
5550
5114
self.outf.write('%-20s %s\n' % (tag, revspec))
5553
5117
class cmd_reconfigure(Command):
5554
__doc__ = """Reconfigure the type of a bzr directory.
5118
"""Reconfigure the type of a bzr directory.
5556
5120
A target configuration must be specified.
5588
5152
Option('bind-to', help='Branch to bind checkout to.', type=str),
5589
5153
Option('force',
5590
help='Perform reconfiguration even if local changes'
5592
Option('stacked-on',
5593
help='Reconfigure a branch to be stacked on another branch.',
5597
help='Reconfigure a branch to be unstacked. This '
5598
'may require copying substantial data into it.',
5154
help='Perform reconfiguration even if local changes'
5602
def run(self, location=None, target_type=None, bind_to=None, force=False,
5158
def run(self, location=None, target_type=None, bind_to=None, force=False):
5605
5159
directory = bzrdir.BzrDir.open(location)
5606
if stacked_on and unstacked:
5607
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5608
elif stacked_on is not None:
5609
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5611
reconfigure.ReconfigureUnstacked().apply(directory)
5612
# At the moment you can use --stacked-on and a different
5613
# reconfiguration shape at the same time; there seems no good reason
5615
5160
if target_type is None:
5616
if stacked_on or unstacked:
5619
raise errors.BzrCommandError('No target configuration '
5161
raise errors.BzrCommandError('No target configuration specified')
5621
5162
elif target_type == 'branch':
5622
5163
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5623
5164
elif target_type == 'tree':
5660
5201
/path/to/newbranch.
5662
5203
Bound branches use the nickname of its master branch unless it is set
5663
locally, in which case switching will update the local nickname to be
5204
locally, in which case switching will update the the local nickname to be
5664
5205
that of the master.
5667
takes_args = ['to_location?']
5668
takes_options = ['directory',
5670
help='Switch even if local commits will be lost.'),
5672
Option('create-branch', short_name='b',
5673
help='Create the target branch from this one before'
5674
' switching to it.'),
5208
takes_args = ['to_location']
5209
takes_options = [Option('force',
5210
help='Switch even if local commits will be lost.')
5677
def run(self, to_location=None, force=False, create_branch=False,
5678
revision=None, directory=u'.'):
5213
def run(self, to_location, force=False):
5679
5214
from bzrlib import switch
5680
tree_location = directory
5681
revision = _get_one_revision('switch', revision)
5682
5216
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5683
if to_location is None:
5684
if revision is None:
5685
raise errors.BzrCommandError('You must supply either a'
5686
' revision or a location')
5687
to_location = tree_location
5689
5218
branch = control_dir.open_branch()
5690
5219
had_explicit_nick = branch.get_config().has_explicit_nickname()
5691
5220
except errors.NotBranchError:
5693
5221
had_explicit_nick = False
5696
raise errors.BzrCommandError('cannot create branch without'
5698
to_location = directory_service.directories.dereference(
5700
if '/' not in to_location and '\\' not in to_location:
5701
# This path is meant to be relative to the existing branch
5702
this_url = self._get_branch_location(control_dir)
5703
to_location = urlutils.join(this_url, '..', to_location)
5704
to_branch = branch.bzrdir.sprout(to_location,
5705
possible_transports=[branch.bzrdir.root_transport],
5706
source_branch=branch).open_branch()
5709
to_branch = Branch.open(to_location)
5710
except errors.NotBranchError:
5711
this_url = self._get_branch_location(control_dir)
5712
to_branch = Branch.open(
5713
urlutils.join(this_url, '..', to_location))
5714
if revision is not None:
5715
revision = revision.as_revision_id(to_branch)
5716
switch.switch(control_dir, to_branch, force, revision_id=revision)
5223
to_branch = Branch.open(to_location)
5224
except errors.NotBranchError:
5225
this_url = self._get_branch_location(control_dir)
5226
to_branch = Branch.open(
5227
urlutils.join(this_url, '..', to_location))
5228
switch.switch(control_dir, to_branch, force)
5717
5229
if had_explicit_nick:
5718
5230
branch = control_dir.open_branch() #get the new branch!
5719
5231
branch.nick = to_branch.nick
5990
5463
Option('destroy',
5991
5464
help='Destroy removed changes instead of shelving them.'),
5993
_see_also = ['unshelve', 'configuration']
5466
_see_also = ['unshelve']
5995
5468
def run(self, revision=None, all=False, file_list=None, message=None,
5996
writer=None, list=False, destroy=False, directory=None):
5469
writer=None, list=False, destroy=False):
5998
return self.run_for_list(directory=directory)
5471
return self.run_for_list()
5999
5472
from bzrlib.shelf_ui import Shelver
6000
5473
if writer is None:
6001
5474
writer = bzrlib.option.diff_writer_registry.get()
6003
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6004
file_list, message, destroy=destroy, directory=directory)
5476
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5477
message, destroy=destroy).run()
6009
5478
except errors.UserAbort:
6012
def run_for_list(self, directory=None):
6013
if directory is None:
6015
tree = WorkingTree.open_containing(directory)[0]
6016
self.add_cleanup(tree.lock_read().unlock)
6017
manager = tree.get_shelf_manager()
6018
shelves = manager.active_shelves()
6019
if len(shelves) == 0:
6020
note('No shelved changes.')
6022
for shelf_id in reversed(shelves):
6023
message = manager.get_metadata(shelf_id).get('message')
6025
message = '<no message>'
6026
self.outf.write('%3d: %s\n' % (shelf_id, message))
5481
def run_for_list(self):
5482
tree = WorkingTree.open_containing('.')[0]
5485
manager = tree.get_shelf_manager()
5486
shelves = manager.active_shelves()
5487
if len(shelves) == 0:
5488
note('No shelved changes.')
5490
for shelf_id in reversed(shelves):
5491
message = manager.get_metadata(shelf_id).get('message')
5493
message = '<no message>'
5494
self.outf.write('%3d: %s\n' % (shelf_id, message))
6030
5500
class cmd_unshelve(Command):
6031
__doc__ = """Restore shelved changes.
5501
"""Restore shelved changes.
6033
5503
By default, the most recently shelved changes are restored. However if you
6034
5504
specify a shelf by id those changes will be restored instead. This works
6038
5508
takes_args = ['shelf_id?']
6039
5509
takes_options = [
6041
5510
RegistryOption.from_kwargs(
6042
5511
'action', help="The action to perform.",
6043
5512
enum_switch=False, value_switches=True,
6044
5513
apply="Apply changes and remove from the shelf.",
6045
5514
dry_run="Show changes, but do not apply or remove them.",
6046
preview="Instead of unshelving the changes, show the diff that "
6047
"would result from unshelving.",
6048
delete_only="Delete changes without applying them.",
6049
keep="Apply changes but don't delete them.",
5515
delete_only="Delete changes without applying them."
6052
5518
_see_also = ['shelve']
6054
def run(self, shelf_id=None, action='apply', directory=u'.'):
5520
def run(self, shelf_id=None, action='apply'):
6055
5521
from bzrlib.shelf_ui import Unshelver
6056
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
6060
unshelver.tree.unlock()
5522
Unshelver.from_args(shelf_id, action).run()
6063
5525
class cmd_clean_tree(Command):
6064
__doc__ = """Remove unwanted files from working tree.
5526
"""Remove unwanted files from working tree.
6066
5528
By default, only unknown files, not ignored files, are deleted. Versioned
6067
5529
files are never deleted.
6142
5603
self.outf.write('%s %s\n' % (path, location))
6145
def _register_lazy_builtins():
6146
# register lazy builtins from other modules; called at startup and should
6147
# be only called once.
6148
for (name, aliases, module_name) in [
6149
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6150
('cmd_config', [], 'bzrlib.config'),
6151
('cmd_dpush', [], 'bzrlib.foreign'),
6152
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6153
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6154
('cmd_conflicts', [], 'bzrlib.conflicts'),
6155
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6156
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6158
builtin_command_registry.register_lazy(name, aliases, module_name)
5606
# these get imported and then picked up by the scan for cmd_*
5607
# TODO: Some more consistent way to split command definitions across files;
5608
# we do need to load at least some information about them to know of
5609
# aliases. ideally we would avoid loading the implementation until the
5610
# details were needed.
5611
from bzrlib.cmd_version_info import cmd_version_info
5612
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5613
from bzrlib.bundle.commands import (
5616
from bzrlib.foreign import cmd_dpush
5617
from bzrlib.sign_my_commits import cmd_sign_my_commits
5618
from bzrlib.weave_commands import cmd_versionedfile_list, \
5619
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
