155
171
:return: workingtree, [relative_paths]
157
if file_list is None or len(file_list) == 0:
158
tree = WorkingTree.open_containing(default_branch)[0]
159
if tree.supports_views() and apply_view:
160
view_files = tree.views.lookup_view()
162
file_list = view_files
163
view_str = views.view_display_str(view_files)
164
note("Ignoring files outside view. View is %s" % view_str)
165
return tree, file_list
166
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
167
return tree, safe_relpath_files(tree, file_list, canonicalize,
168
apply_view=apply_view)
171
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
172
"""Convert file_list into a list of relpaths in tree.
174
:param tree: A tree to operate on.
175
:param file_list: A list of user provided paths or None.
176
:param apply_view: if True and a view is set, apply it or check that
177
specified files are within it
178
:return: A list of relative paths.
179
:raises errors.PathNotChild: When a provided path is in a different tree
182
if file_list is None:
184
if tree.supports_views() and apply_view:
185
view_files = tree.views.lookup_view()
189
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
190
# doesn't - fix that up here before we enter the loop.
192
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
195
for filename in file_list:
197
relpath = fixer(osutils.dereference_path(filename))
198
if view_files and not osutils.is_inside_any(view_files, relpath):
199
raise errors.FileOutsideView(filename, view_files)
200
new_list.append(relpath)
201
except errors.PathNotChild:
202
raise errors.FileInWrongBranch(tree.branch, filename)
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
206
179
def _get_view_info_for_change_reporter(tree):
321
310
takes_args = ['revision_id?']
322
takes_options = ['revision']
311
takes_options = ['directory', 'revision']
323
312
# cat-revision is more for frontends so should be exact
324
313
encoding = 'strict'
315
def print_revision(self, revisions, revid):
316
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
317
record = stream.next()
318
if record.storage_kind == 'absent':
319
raise errors.NoSuchRevision(revisions, revid)
320
revtext = record.get_bytes_as('fulltext')
321
self.outf.write(revtext.decode('utf-8'))
327
def run(self, revision_id=None, revision=None):
324
def run(self, revision_id=None, revision=None, directory=u'.'):
328
325
if revision_id is not None and revision is not None:
329
326
raise errors.BzrCommandError('You can only supply one of'
330
327
' revision_id or --revision')
331
328
if revision_id is None and revision is None:
332
329
raise errors.BzrCommandError('You must supply either'
333
330
' --revision or a revision_id')
334
b = WorkingTree.open_containing(u'.')[0].branch
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
340
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (b.repository.base,
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
348
raise errors.BzrCommandError('You cannot specify a NULL'
350
rev_id = rev.as_revision_id(b)
351
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
331
b = WorkingTree.open_containing(directory)[0].branch
333
revisions = b.repository.revisions
334
if revisions is None:
335
raise errors.BzrCommandError('Repository %r does not support '
336
'access to raw revision texts')
338
b.repository.lock_read()
340
# TODO: jam 20060112 should cat-revision always output utf-8?
341
if revision_id is not None:
342
revision_id = osutils.safe_revision_id(revision_id, warn=False)
344
self.print_revision(revisions, revision_id)
345
except errors.NoSuchRevision:
346
msg = "The repository %s contains no revision %s." % (
347
b.repository.base, revision_id)
348
raise errors.BzrCommandError(msg)
349
elif revision is not None:
352
raise errors.BzrCommandError(
353
'You cannot specify a NULL revision.')
354
rev_id = rev.as_revision_id(b)
355
self.print_revision(revisions, rev_id)
357
b.repository.unlock()
354
360
class cmd_dump_btree(Command):
355
"""Dump the contents of a btree index file to stdout.
361
__doc__ = """Dump the contents of a btree index file to stdout.
357
363
PATH is a btree index file, it can be any URL. This includes things like
358
364
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
434
447
To re-create the working tree, use "bzr checkout".
436
449
_see_also = ['checkout', 'working-trees']
437
takes_args = ['location?']
450
takes_args = ['location*']
438
451
takes_options = [
440
453
help='Remove the working tree even if it has '
441
'uncommitted changes.'),
454
'uncommitted or shelved changes.'),
444
def run(self, location='.', force=False):
445
d = bzrdir.BzrDir.open(location)
448
working = d.open_workingtree()
449
except errors.NoWorkingTree:
450
raise errors.BzrCommandError("No working tree to remove")
451
except errors.NotLocalUrl:
452
raise errors.BzrCommandError("You cannot remove the working tree"
455
# XXX: What about pending merges ? -- vila 20090629
456
if working.has_changes(working.basis_tree()):
457
raise errors.UncommittedChanges(working)
459
working_path = working.bzrdir.root_transport.base
460
branch_path = working.branch.bzrdir.root_transport.base
461
if working_path != branch_path:
462
raise errors.BzrCommandError("You cannot remove the working tree"
463
" from a lightweight checkout")
465
d.destroy_workingtree()
457
def run(self, location_list, force=False):
458
if not location_list:
461
for location in location_list:
462
d = bzrdir.BzrDir.open(location)
465
working = d.open_workingtree()
466
except errors.NoWorkingTree:
467
raise errors.BzrCommandError("No working tree to remove")
468
except errors.NotLocalUrl:
469
raise errors.BzrCommandError("You cannot remove the working tree"
472
if (working.has_changes()):
473
raise errors.UncommittedChanges(working)
474
if working.get_shelf_manager().last_shelf() is not None:
475
raise errors.ShelvedChanges(working)
477
if working.user_url != working.branch.user_url:
478
raise errors.BzrCommandError("You cannot remove the working tree"
479
" from a lightweight checkout")
481
d.destroy_workingtree()
468
484
class cmd_revno(Command):
469
"""Show current revision number.
485
__doc__ = """Show current revision number.
471
487
This is equal to the number of revisions on this branch.
484
500
wt = WorkingTree.open_containing(location)[0]
501
self.add_cleanup(wt.lock_read().unlock)
486
502
except (errors.NoWorkingTree, errors.NotLocalUrl):
487
503
raise errors.NoWorkingTree(location)
504
revid = wt.last_revision()
489
revid = wt.last_revision()
491
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
492
except errors.NoSuchRevision:
494
revno = ".".join(str(n) for n in revno_t)
506
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
507
except errors.NoSuchRevision:
509
revno = ".".join(str(n) for n in revno_t)
498
511
b = Branch.open_containing(location)[0]
512
self.add_cleanup(b.lock_read().unlock)
505
515
self.outf.write(str(revno) + '\n')
508
518
class cmd_revision_info(Command):
509
"""Show revision number and revision id for a given revision identifier.
519
__doc__ = """Show revision number and revision id for a given revision identifier.
512
522
takes_args = ['revision_info*']
513
523
takes_options = [
525
custom_help('directory',
516
526
help='Branch to examine, '
517
'rather than the one containing the working directory.',
527
'rather than the one containing the working directory.'),
521
528
Option('tree', help='Show revno of working tree'),
529
536
wt = WorkingTree.open_containing(directory)[0]
538
self.add_cleanup(wt.lock_read().unlock)
532
539
except (errors.NoWorkingTree, errors.NotLocalUrl):
534
541
b = Branch.open_containing(directory)[0]
538
if revision is not None:
539
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
540
if revision_info_list is not None:
541
for rev_str in revision_info_list:
542
rev_spec = RevisionSpec.from_string(rev_str)
543
revision_ids.append(rev_spec.as_revision_id(b))
544
# No arguments supplied, default to the last revision
545
if len(revision_ids) == 0:
548
raise errors.NoWorkingTree(directory)
549
revision_ids.append(wt.last_revision())
551
revision_ids.append(b.last_revision())
555
for revision_id in revision_ids:
557
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
558
revno = '.'.join(str(i) for i in dotted_revno)
559
except errors.NoSuchRevision:
561
maxlen = max(maxlen, len(revno))
562
revinfos.append([revno, revision_id])
542
self.add_cleanup(b.lock_read().unlock)
544
if revision is not None:
545
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
546
if revision_info_list is not None:
547
for rev_str in revision_info_list:
548
rev_spec = RevisionSpec.from_string(rev_str)
549
revision_ids.append(rev_spec.as_revision_id(b))
550
# No arguments supplied, default to the last revision
551
if len(revision_ids) == 0:
554
raise errors.NoWorkingTree(directory)
555
revision_ids.append(wt.last_revision())
557
revision_ids.append(b.last_revision())
561
for revision_id in revision_ids:
563
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
564
revno = '.'.join(str(i) for i in dotted_revno)
565
except errors.NoSuchRevision:
567
maxlen = max(maxlen, len(revno))
568
revinfos.append([revno, revision_id])
569
571
for ri in revinfos:
570
572
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
573
575
class cmd_add(Command):
574
"""Add specified files or directories.
576
__doc__ = """Add specified files or directories.
576
578
In non-recursive mode, all the named items are added, regardless
577
579
of whether they were previously ignored. A warning is given if
639
644
should_print=(not is_quiet()))
642
base_tree.lock_read()
644
file_list = self._maybe_expand_globs(file_list)
645
tree, file_list = tree_files_for_add(file_list)
646
added, ignored = tree.smart_add(file_list, not
647
no_recurse, action=action, save=not dry_run)
649
if base_tree is not None:
647
self.add_cleanup(base_tree.lock_read().unlock)
648
tree, file_list = tree_files_for_add(file_list)
649
added, ignored = tree.smart_add(file_list, not
650
no_recurse, action=action, save=not dry_run)
651
652
if len(ignored) > 0:
653
654
for glob in sorted(ignored.keys()):
654
655
for path in ignored[glob]:
655
656
self.outf.write("ignored %s matching \"%s\"\n"
659
for glob, paths in ignored.items():
660
match_len += len(paths)
661
self.outf.write("ignored %d file(s).\n" % match_len)
662
self.outf.write("If you wish to add ignored files, "
663
"please add them explicitly by name. "
664
"(\"bzr ignored\" gives a list)\n")
667
660
class cmd_mkdir(Command):
668
"""Create a new versioned directory.
661
__doc__ = """Create a new versioned directory.
670
663
This is equivalent to creating the directory and then adding it.
723
721
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
725
723
revision = _get_one_revision('inventory', revision)
726
work_tree, file_list = tree_files(file_list)
727
work_tree.lock_read()
729
if revision is not None:
730
tree = revision.as_tree(work_tree.branch)
732
extra_trees = [work_tree]
738
if file_list is not None:
739
file_ids = tree.paths2ids(file_list, trees=extra_trees,
740
require_versioned=True)
741
# find_ids_across_trees may include some paths that don't
743
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
744
for file_id in file_ids if file_id in tree)
746
entries = tree.inventory.entries()
749
if tree is not work_tree:
724
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
725
self.add_cleanup(work_tree.lock_read().unlock)
726
if revision is not None:
727
tree = revision.as_tree(work_tree.branch)
729
extra_trees = [work_tree]
730
self.add_cleanup(tree.lock_read().unlock)
735
if file_list is not None:
736
file_ids = tree.paths2ids(file_list, trees=extra_trees,
737
require_versioned=True)
738
# find_ids_across_trees may include some paths that don't
740
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
741
for file_id in file_ids if file_id in tree)
743
entries = tree.inventory.entries()
752
746
for path, entry in entries:
753
747
if kind and kind != entry.kind:
895
885
dest = osutils.pathjoin(dest_parent, dest_tail)
896
886
mutter("attempting to move %s => %s", src, dest)
897
887
tree.rename_one(src, dest, after=after)
898
self.outf.write("%s => %s\n" % (src, dest))
889
self.outf.write("%s => %s\n" % (src, dest))
901
892
class cmd_pull(Command):
902
"""Turn this branch into a mirror of another branch.
893
__doc__ = """Turn this branch into a mirror of another branch.
904
This command only works on branches that have not diverged. Branches are
905
considered diverged if the destination branch's most recent commit is one
906
that has not been merged (directly or indirectly) into the parent.
895
By default, this command only works on branches that have not diverged.
896
Branches are considered diverged if the destination branch's most recent
897
commit is one that has not been merged (directly or indirectly) into the
908
900
If branches have diverged, you can use 'bzr merge' to integrate the changes
909
901
from one into the other. Once one branch has merged, the other should
910
902
be able to pull it again.
912
If you want to forget your local changes and just update your branch to
913
match the remote one, use pull --overwrite.
904
If you want to replace your local changes and just want your branch to
905
match the remote one, use pull --overwrite. This will work even if the two
906
branches have diverged.
915
908
If there is no default location set, the first pull will set it. After
916
909
that, you can omit the location to use the default. To change the
992
990
branch_from = Branch.open(location,
993
991
possible_transports=possible_transports)
992
self.add_cleanup(branch_from.lock_read().unlock)
995
994
if branch_to.get_parent() is None or remember:
996
995
branch_to.set_parent(branch_from.base)
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1026
if branch_from is not branch_to:
1027
branch_from.unlock()
997
if revision is not None:
998
revision_id = revision.as_revision_id(branch_from)
1000
if tree_to is not None:
1001
view_info = _get_view_info_for_change_reporter(tree_to)
1002
change_reporter = delta._ChangeReporter(
1003
unversioned_filter=tree_to.is_ignored,
1004
view_info=view_info)
1005
result = tree_to.pull(
1006
branch_from, overwrite, revision_id, change_reporter,
1007
possible_transports=possible_transports, local=local,
1008
show_base=show_base)
1010
result = branch_to.pull(
1011
branch_from, overwrite, revision_id, local=local)
1013
result.report(self.outf)
1014
if verbose and result.old_revid != result.new_revid:
1015
log.show_branch_change(
1016
branch_to, self.outf, result.old_revno,
1030
1020
class cmd_push(Command):
1031
"""Update a mirror of this branch.
1021
__doc__ = """Update a mirror of this branch.
1033
1023
The target branch will not have its working tree populated because this
1034
1024
is both expensive, and is not supported on remote file systems.
1095
1085
# Get the source branch
1096
1086
(tree, br_from,
1097
1087
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1099
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1100
if strict is None: strict = True # default value
1101
1088
# Get the tip's revision_id
1102
1089
revision = _get_one_revision('push', revision)
1103
1090
if revision is not None:
1104
1091
revision_id = revision.in_history(br_from).rev_id
1106
1093
revision_id = None
1107
if strict and tree is not None and revision_id is None:
1108
if (tree.has_changes(tree.basis_tree())
1109
or len(tree.get_parent_ids()) > 1):
1110
raise errors.UncommittedChanges(
1111
tree, more='Use --no-strict to force the push.')
1112
if tree.last_revision() != tree.branch.last_revision():
1113
# The tree has lost sync with its branch, there is little
1114
# chance that the user is aware of it but he can still force
1115
# the push with --no-strict
1116
raise errors.OutOfDateTree(
1117
tree, more='Use --no-strict to force the push.')
1094
if tree is not None and revision_id is None:
1095
tree.check_changed_or_out_of_date(
1096
strict, 'push_strict',
1097
more_error='Use --no-strict to force the push.',
1098
more_warning='Uncommitted changes will not be pushed.')
1119
1099
# Get the stacked_on branch, if any
1120
1100
if stacked_on is not None:
1121
1101
stacked_on = urlutils.normalize_url(stacked_on)
1183
1168
' directory exists, but does not already'
1184
1169
' have a control directory. This flag will'
1185
1170
' allow branch to proceed.'),
1172
help="Bind new branch to from location."),
1187
1174
aliases = ['get', 'clone']
1189
1176
def run(self, from_location, to_location=None, revision=None,
1190
1177
hardlink=False, stacked=False, standalone=False, no_tree=False,
1191
use_existing_dir=False):
1178
use_existing_dir=False, switch=False, bind=False,
1180
from bzrlib import switch as _mod_switch
1192
1181
from bzrlib.tag import _merge_tags_if_possible
1194
1182
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1196
if (accelerator_tree is not None and
1197
accelerator_tree.supports_content_filtering()):
1184
if not (hardlink or files_from):
1185
# accelerator_tree is usually slower because you have to read N
1186
# files (no readahead, lots of seeks, etc), but allow the user to
1187
# explicitly request it
1198
1188
accelerator_tree = None
1189
if files_from is not None and files_from != from_location:
1190
accelerator_tree = WorkingTree.open(files_from)
1199
1191
revision = _get_one_revision('branch', revision)
1192
self.add_cleanup(br_from.lock_read().unlock)
1193
if revision is not None:
1194
revision_id = revision.as_revision_id(br_from)
1196
# FIXME - wt.last_revision, fallback to branch, fall back to
1197
# None or perhaps NULL_REVISION to mean copy nothing
1199
revision_id = br_from.last_revision()
1200
if to_location is None:
1201
to_location = urlutils.derive_to_location(from_location)
1202
to_transport = transport.get_transport(to_location)
1202
if revision is not None:
1203
revision_id = revision.as_revision_id(br_from)
1204
to_transport.mkdir('.')
1205
except errors.FileExists:
1206
if not use_existing_dir:
1207
raise errors.BzrCommandError('Target directory "%s" '
1208
'already exists.' % to_location)
1205
# FIXME - wt.last_revision, fallback to branch, fall back to
1206
# None or perhaps NULL_REVISION to mean copy nothing
1208
revision_id = br_from.last_revision()
1209
if to_location is None:
1210
to_location = urlutils.derive_to_location(from_location)
1211
to_transport = transport.get_transport(to_location)
1213
to_transport.mkdir('.')
1214
except errors.FileExists:
1215
if not use_existing_dir:
1216
raise errors.BzrCommandError('Target directory "%s" '
1217
'already exists.' % to_location)
1211
bzrdir.BzrDir.open_from_transport(to_transport)
1212
except errors.NotBranchError:
1220
bzrdir.BzrDir.open_from_transport(to_transport)
1221
except errors.NotBranchError:
1224
raise errors.AlreadyBranchError(to_location)
1225
except errors.NoSuchFile:
1226
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1229
# preserve whatever source format we have.
1230
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1231
possible_transports=[to_transport],
1232
accelerator_tree=accelerator_tree,
1233
hardlink=hardlink, stacked=stacked,
1234
force_new_repo=standalone,
1235
create_tree_if_local=not no_tree,
1236
source_branch=br_from)
1237
branch = dir.open_branch()
1238
except errors.NoSuchRevision:
1239
to_transport.delete_tree('.')
1240
msg = "The branch %s has no revision %s." % (from_location,
1242
raise errors.BzrCommandError(msg)
1243
_merge_tags_if_possible(br_from, branch)
1244
# If the source branch is stacked, the new branch may
1245
# be stacked whether we asked for that explicitly or not.
1246
# We therefore need a try/except here and not just 'if stacked:'
1248
note('Created new stacked branch referring to %s.' %
1249
branch.get_stacked_on_url())
1250
except (errors.NotStacked, errors.UnstackableBranchFormat,
1251
errors.UnstackableRepositoryFormat), e:
1252
note('Branched %d revision(s).' % branch.revno())
1215
raise errors.AlreadyBranchError(to_location)
1216
except errors.NoSuchFile:
1217
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1220
# preserve whatever source format we have.
1221
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1222
possible_transports=[to_transport],
1223
accelerator_tree=accelerator_tree,
1224
hardlink=hardlink, stacked=stacked,
1225
force_new_repo=standalone,
1226
create_tree_if_local=not no_tree,
1227
source_branch=br_from)
1228
branch = dir.open_branch()
1229
except errors.NoSuchRevision:
1230
to_transport.delete_tree('.')
1231
msg = "The branch %s has no revision %s." % (from_location,
1233
raise errors.BzrCommandError(msg)
1234
_merge_tags_if_possible(br_from, branch)
1235
# If the source branch is stacked, the new branch may
1236
# be stacked whether we asked for that explicitly or not.
1237
# We therefore need a try/except here and not just 'if stacked:'
1239
note('Created new stacked branch referring to %s.' %
1240
branch.get_stacked_on_url())
1241
except (errors.NotStacked, errors.UnstackableBranchFormat,
1242
errors.UnstackableRepositoryFormat), e:
1243
note('Branched %d revision(s).' % branch.revno())
1245
# Bind to the parent
1246
parent_branch = Branch.open(from_location)
1247
branch.bind(parent_branch)
1248
note('New branch bound to %s' % from_location)
1250
# Switch to the new branch
1251
wt, _ = WorkingTree.open_containing('.')
1252
_mod_switch.switch(wt.bzrdir, branch)
1253
note('Switched to branch: %s',
1254
urlutils.unescape_for_display(branch.base, 'utf-8'))
1257
1257
class cmd_checkout(Command):
1258
"""Create a new checkout of an existing branch.
1258
__doc__ = """Create a new checkout of an existing branch.
1260
1260
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1261
1261
the branch found in '.'. This is useful if you have removed the working tree
1335
1340
@display_command
1336
1341
def run(self, dir=u'.'):
1337
1342
tree = WorkingTree.open_containing(dir)[0]
1340
new_inv = tree.inventory
1341
old_tree = tree.basis_tree()
1342
old_tree.lock_read()
1344
old_inv = old_tree.inventory
1346
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1347
for f, paths, c, v, p, n, k, e in iterator:
1348
if paths[0] == paths[1]:
1352
renames.append(paths)
1354
for old_name, new_name in renames:
1355
self.outf.write("%s => %s\n" % (old_name, new_name))
1343
self.add_cleanup(tree.lock_read().unlock)
1344
new_inv = tree.inventory
1345
old_tree = tree.basis_tree()
1346
self.add_cleanup(old_tree.lock_read().unlock)
1347
old_inv = old_tree.inventory
1349
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1350
for f, paths, c, v, p, n, k, e in iterator:
1351
if paths[0] == paths[1]:
1355
renames.append(paths)
1357
for old_name, new_name in renames:
1358
self.outf.write("%s => %s\n" % (old_name, new_name))
1362
1361
class cmd_update(Command):
1363
"""Update a tree to have the latest code committed to its branch.
1362
__doc__ = """Update a tree to have the latest code committed to its branch.
1365
1364
This will perform a merge into the working tree, and may generate
1366
1365
conflicts. If you have any local changes, you will still
1369
1368
If you want to discard your local changes, you can just do a
1370
1369
'bzr revert' instead of 'bzr commit' after the update.
1371
If you want to restore a file that has been removed locally, use
1372
'bzr revert' instead of 'bzr update'.
1374
If the tree's branch is bound to a master branch, it will also update
1375
the branch from the master.
1373
1378
_see_also = ['pull', 'working-trees', 'status-flags']
1374
1379
takes_args = ['dir?']
1380
takes_options = ['revision',
1382
help="Show base revision text in conflicts."),
1375
1384
aliases = ['up']
1377
def run(self, dir='.'):
1386
def run(self, dir='.', revision=None, show_base=None):
1387
if revision is not None and len(revision) != 1:
1388
raise errors.BzrCommandError(
1389
"bzr update --revision takes exactly one revision")
1378
1390
tree = WorkingTree.open_containing(dir)[0]
1391
branch = tree.branch
1379
1392
possible_transports = []
1380
master = tree.branch.get_master_branch(
1393
master = branch.get_master_branch(
1381
1394
possible_transports=possible_transports)
1382
1395
if master is not None:
1396
branch_location = master.base
1383
1397
tree.lock_write()
1399
branch_location = tree.branch.base
1385
1400
tree.lock_tree_write()
1401
self.add_cleanup(tree.unlock)
1402
# get rid of the final '/' and be ready for display
1403
branch_location = urlutils.unescape_for_display(
1404
branch_location.rstrip('/'),
1406
existing_pending_merges = tree.get_parent_ids()[1:]
1410
# may need to fetch data into a heavyweight checkout
1411
# XXX: this may take some time, maybe we should display a
1413
old_tip = branch.update(possible_transports)
1414
if revision is not None:
1415
revision_id = revision[0].as_revision_id(branch)
1417
revision_id = branch.last_revision()
1418
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1419
revno = branch.revision_id_to_dotted_revno(revision_id)
1420
note("Tree is up to date at revision %s of branch %s" %
1421
('.'.join(map(str, revno)), branch_location))
1423
view_info = _get_view_info_for_change_reporter(tree)
1424
change_reporter = delta._ChangeReporter(
1425
unversioned_filter=tree.is_ignored,
1426
view_info=view_info)
1387
existing_pending_merges = tree.get_parent_ids()[1:]
1388
last_rev = _mod_revision.ensure_null(tree.last_revision())
1389
if last_rev == _mod_revision.ensure_null(
1390
tree.branch.last_revision()):
1391
# may be up to date, check master too.
1392
if master is None or last_rev == _mod_revision.ensure_null(
1393
master.last_revision()):
1394
revno = tree.branch.revision_id_to_revno(last_rev)
1395
note("Tree is up to date at revision %d." % (revno,))
1397
view_info = _get_view_info_for_change_reporter(tree)
1398
1428
conflicts = tree.update(
1399
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1400
view_info=view_info), possible_transports=possible_transports)
1401
revno = tree.branch.revision_id_to_revno(
1402
_mod_revision.ensure_null(tree.last_revision()))
1403
note('Updated to revision %d.' % (revno,))
1404
if tree.get_parent_ids()[1:] != existing_pending_merges:
1405
note('Your local commits will now show as pending merges with '
1406
"'bzr status', and can be committed with 'bzr commit'.")
1430
possible_transports=possible_transports,
1431
revision=revision_id,
1433
show_base=show_base)
1434
except errors.NoSuchRevision, e:
1435
raise errors.BzrCommandError(
1436
"branch has no revision %s\n"
1437
"bzr update --revision only works"
1438
" for a revision in the branch history"
1440
revno = tree.branch.revision_id_to_dotted_revno(
1441
_mod_revision.ensure_null(tree.last_revision()))
1442
note('Updated to revision %s of branch %s' %
1443
('.'.join(map(str, revno)), branch_location))
1444
parent_ids = tree.get_parent_ids()
1445
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1446
note('Your local commits will now show as pending merges with '
1447
"'bzr status', and can be committed with 'bzr commit'.")
1415
1454
class cmd_info(Command):
1416
"""Show information about a working tree, branch or repository.
1455
__doc__ = """Show information about a working tree, branch or repository.
1418
1457
This command will show all known locations and formats associated to the
1419
1458
tree, branch or repository.
1470
1510
RegistryOption.from_kwargs('file-deletion-strategy',
1471
1511
'The file deletion mode to be used.',
1472
1512
title='Deletion Strategy', value_switches=True, enum_switch=False,
1473
safe='Only delete files if they can be'
1474
' safely recovered (default).',
1513
safe='Backup changed files (default).',
1475
1514
keep='Delete from bzr but leave the working copy.',
1515
no_backup='Don\'t backup changed files.',
1476
1516
force='Delete all the specified files, even if they can not be '
1477
'recovered and even if they are non-empty directories.')]
1517
'recovered and even if they are non-empty directories. '
1518
'(deprecated, use no-backup)')]
1478
1519
aliases = ['rm', 'del']
1479
1520
encoding_type = 'replace'
1481
1522
def run(self, file_list, verbose=False, new=False,
1482
1523
file_deletion_strategy='safe'):
1483
tree, file_list = tree_files(file_list)
1524
if file_deletion_strategy == 'force':
1525
note("(The --force option is deprecated, rather use --no-backup "
1527
file_deletion_strategy = 'no-backup'
1529
tree, file_list = WorkingTree.open_containing_paths(file_list)
1485
1531
if file_list is not None:
1486
1532
file_list = [f for f in file_list]
1490
# Heuristics should probably all move into tree.remove_smart or
1493
added = tree.changes_from(tree.basis_tree(),
1494
specific_files=file_list).added
1495
file_list = sorted([f[0] for f in added], reverse=True)
1496
if len(file_list) == 0:
1497
raise errors.BzrCommandError('No matching files.')
1498
elif file_list is None:
1499
# missing files show up in iter_changes(basis) as
1500
# versioned-with-no-kind.
1502
for change in tree.iter_changes(tree.basis_tree()):
1503
# Find paths in the working tree that have no kind:
1504
if change[1][1] is not None and change[6][1] is None:
1505
missing.append(change[1][1])
1506
file_list = sorted(missing, reverse=True)
1507
file_deletion_strategy = 'keep'
1508
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1509
keep_files=file_deletion_strategy=='keep',
1510
force=file_deletion_strategy=='force')
1534
self.add_cleanup(tree.lock_write().unlock)
1535
# Heuristics should probably all move into tree.remove_smart or
1538
added = tree.changes_from(tree.basis_tree(),
1539
specific_files=file_list).added
1540
file_list = sorted([f[0] for f in added], reverse=True)
1541
if len(file_list) == 0:
1542
raise errors.BzrCommandError('No matching files.')
1543
elif file_list is None:
1544
# missing files show up in iter_changes(basis) as
1545
# versioned-with-no-kind.
1547
for change in tree.iter_changes(tree.basis_tree()):
1548
# Find paths in the working tree that have no kind:
1549
if change[1][1] is not None and change[6][1] is None:
1550
missing.append(change[1][1])
1551
file_list = sorted(missing, reverse=True)
1552
file_deletion_strategy = 'keep'
1553
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1554
keep_files=file_deletion_strategy=='keep',
1555
force=(file_deletion_strategy=='no-backup'))
1515
1558
class cmd_file_id(Command):
1516
"""Print file_id of a particular file or directory.
1559
__doc__ = """Print file_id of a particular file or directory.
1518
1561
The file_id is assigned when the file is first added and remains the
1519
1562
same through all revisions where the file exists, even when it is
1894
1992
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1895
1993
' one or two revision specifiers')
1897
old_tree, new_tree, specific_files, extra_trees = \
1898
_get_trees_to_diff(file_list, revision, old, new,
1995
if using is not None and format is not None:
1996
raise errors.BzrCommandError('--using and --format are mutually '
1999
(old_tree, new_tree,
2000
old_branch, new_branch,
2001
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2002
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2003
# GNU diff on Windows uses ANSI encoding for filenames
2004
path_encoding = osutils.get_diff_header_encoding()
1900
2005
return show_diff_trees(old_tree, new_tree, sys.stdout,
1901
2006
specific_files=specific_files,
1902
2007
external_diff_options=diff_options,
1903
2008
old_label=old_label, new_label=new_label,
1904
extra_trees=extra_trees, using=using)
2009
extra_trees=extra_trees,
2010
path_encoding=path_encoding,
1907
2015
class cmd_deleted(Command):
1908
"""List files deleted in the working tree.
2016
__doc__ = """List files deleted in the working tree.
1910
2018
# TODO: Show files deleted since a previous revision, or
1911
2019
# between two revisions.
1914
2022
# level of effort but possibly much less IO. (Or possibly not,
1915
2023
# if the directories are very large...)
1916
2024
_see_also = ['status', 'ls']
1917
takes_options = ['show-ids']
2025
takes_options = ['directory', 'show-ids']
1919
2027
@display_command
1920
def run(self, show_ids=False):
1921
tree = WorkingTree.open_containing(u'.')[0]
1924
old = tree.basis_tree()
1927
for path, ie in old.inventory.iter_entries():
1928
if not tree.has_id(ie.file_id):
1929
self.outf.write(path)
1931
self.outf.write(' ')
1932
self.outf.write(ie.file_id)
1933
self.outf.write('\n')
2028
def run(self, show_ids=False, directory=u'.'):
2029
tree = WorkingTree.open_containing(directory)[0]
2030
self.add_cleanup(tree.lock_read().unlock)
2031
old = tree.basis_tree()
2032
self.add_cleanup(old.lock_read().unlock)
2033
for path, ie in old.inventory.iter_entries():
2034
if not tree.has_id(ie.file_id):
2035
self.outf.write(path)
2037
self.outf.write(' ')
2038
self.outf.write(ie.file_id)
2039
self.outf.write('\n')
1940
2042
class cmd_modified(Command):
1941
"""List files modified in working tree.
2043
__doc__ = """List files modified in working tree.
1945
2047
_see_also = ['status', 'ls']
1948
help='Write an ascii NUL (\\0) separator '
1949
'between files rather than a newline.')
2048
takes_options = ['directory', 'null']
1952
2050
@display_command
1953
def run(self, null=False):
1954
tree = WorkingTree.open_containing(u'.')[0]
2051
def run(self, null=False, directory=u'.'):
2052
tree = WorkingTree.open_containing(directory)[0]
2053
self.add_cleanup(tree.lock_read().unlock)
1955
2054
td = tree.changes_from(tree.basis_tree())
1956
2056
for path, id, kind, text_modified, meta_modified in td.modified:
1958
2058
self.outf.write(path + '\0')
1963
2063
class cmd_added(Command):
1964
"""List files added in working tree.
2064
__doc__ = """List files added in working tree.
1968
2068
_see_also = ['status', 'ls']
1971
help='Write an ascii NUL (\\0) separator '
1972
'between files rather than a newline.')
2069
takes_options = ['directory', 'null']
1975
2071
@display_command
1976
def run(self, null=False):
1977
wt = WorkingTree.open_containing(u'.')[0]
1980
basis = wt.basis_tree()
1983
basis_inv = basis.inventory
1986
if file_id in basis_inv:
1988
if inv.is_root(file_id) and len(basis_inv) == 0:
1990
path = inv.id2path(file_id)
1991
if not os.access(osutils.abspath(path), os.F_OK):
1994
self.outf.write(path + '\0')
1996
self.outf.write(osutils.quotefn(path) + '\n')
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')
2003
2093
class cmd_root(Command):
2004
"""Show the tree root directory.
2094
__doc__ = """Show the tree root directory.
2006
2096
The root is the nearest enclosing directory with a .bzr control
2304
2408
diff_type = 'full'
2308
# Build the log formatter
2309
if log_format is None:
2310
log_format = log.log_formatter_registry.get_default(b)
2311
lf = log_format(show_ids=show_ids, to_file=self.outf,
2312
show_timezone=timezone,
2313
delta_format=get_verbosity_level(),
2315
show_advice=levels is None)
2317
# Choose the algorithm for doing the logging. It's annoying
2318
# having multiple code paths like this but necessary until
2319
# the underlying repository format is faster at generating
2320
# deltas or can provide everything we need from the indices.
2321
# The default algorithm - match-using-deltas - works for
2322
# multiple files and directories and is faster for small
2323
# amounts of history (200 revisions say). However, it's too
2324
# slow for logging a single file in a repository with deep
2325
# history, i.e. > 10K revisions. In the spirit of "do no
2326
# evil when adding features", we continue to use the
2327
# original algorithm - per-file-graph - for the "single
2328
# file that isn't a directory without showing a delta" case.
2329
partial_history = revision and b.repository._format.supports_chks
2330
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2331
or delta_type or partial_history)
2333
# Build the LogRequest and execute it
2334
if len(file_ids) == 0:
2336
rqst = make_log_request_dict(
2337
direction=direction, specific_fileids=file_ids,
2338
start_revision=rev1, end_revision=rev2, limit=limit,
2339
message_search=message, delta_type=delta_type,
2340
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2341
Logger(b, rqst).show(lf)
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)
2346
2452
def _get_revision_range(revisionspec_list, branch, command_name):
2429
2541
help='Recurse into subdirectories.'),
2430
2542
Option('from-root',
2431
2543
help='Print paths relative to the root of the branch.'),
2432
Option('unknown', help='Print unknown files.'),
2544
Option('unknown', short_name='u',
2545
help='Print unknown files.'),
2433
2546
Option('versioned', help='Print versioned files.',
2434
2547
short_name='V'),
2435
Option('ignored', help='Print ignored files.'),
2437
help='Write an ascii NUL (\\0) separator '
2438
'between files rather than a newline.'),
2548
Option('ignored', short_name='i',
2549
help='Print ignored files.'),
2550
Option('kind', short_name='k',
2440
2551
help='List entries of a particular kind: file, directory, symlink.',
2444
2557
@display_command
2445
2558
def run(self, revision=None, verbose=False,
2446
2559
recursive=False, from_root=False,
2447
2560
unknown=False, versioned=False, ignored=False,
2448
null=False, kind=None, show_ids=False, path=None):
2561
null=False, kind=None, show_ids=False, path=None, directory=None):
2450
2563
if kind and kind not in ('file', 'directory', 'symlink'):
2451
2564
raise errors.BzrCommandError('invalid kind specified')
2485
2598
view_str = views.view_display_str(view_files)
2486
2599
note("Ignoring files outside view. View is %s" % view_str)
2490
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2491
from_dir=relpath, recursive=recursive):
2492
# Apply additional masking
2493
if not all and not selection[fc]:
2495
if kind is not None and fkind != kind:
2500
fullpath = osutils.pathjoin(relpath, fp)
2503
views.check_path_in_view(tree, fullpath)
2504
except errors.FileOutsideView:
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:
2509
fp = osutils.pathjoin(prefix, fp)
2510
kindch = entry.kind_character()
2511
outstring = fp + kindch
2512
ui.ui_factory.clear_term()
2514
outstring = '%-8s %s' % (fc, outstring)
2515
if show_ids and fid is not None:
2516
outstring = "%-50s %s" % (outstring, fid)
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))
2517
2645
self.outf.write(outstring + '\n')
2519
self.outf.write(fp + '\0')
2522
self.outf.write(fid)
2523
self.outf.write('\0')
2531
self.outf.write('%-50s %s\n' % (outstring, my_id))
2533
self.outf.write(outstring + '\n')
2538
2648
class cmd_unknowns(Command):
2539
"""List unknown files.
2649
__doc__ = """List unknown files.
2543
2653
_see_also = ['ls']
2654
takes_options = ['directory']
2545
2656
@display_command
2547
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2657
def run(self, directory=u'.'):
2658
for f in WorkingTree.open_containing(directory)[0].unknowns():
2548
2659
self.outf.write(osutils.quotefn(f) + '\n')
2551
2662
class cmd_ignore(Command):
2552
"""Ignore specified files or patterns.
2663
__doc__ = """Ignore specified files or patterns.
2554
2665
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.
2556
2673
To remove patterns from the ignore list, edit the .bzrignore file.
2557
2674
After adding, editing or deleting that file either indirectly by
2558
2675
using this command or directly by using an editor, be sure to commit
2561
Note: ignore patterns containing shell wildcards must be quoted from
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.
2565
2700
Ignore the top level Makefile::
2567
2702
bzr ignore ./Makefile
2569
Ignore class files in all directories::
2704
Ignore .class files in all directories...::
2571
2706
bzr ignore "*.class"
2708
...but do not ignore "special.class"::
2710
bzr ignore "!special.class"
2712
Ignore files whose name begins with the "#" character::
2573
2716
Ignore .o files under the lib directory::
2575
2718
bzr ignore "lib/**/*.o"
2581
2724
Ignore everything but the "debian" toplevel directory::
2583
2726
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"
2586
2736
_see_also = ['status', 'ignored', 'patterns']
2587
2737
takes_args = ['name_pattern*']
2589
Option('old-default-rules',
2590
help='Write out the ignore rules bzr < 0.9 always used.')
2738
takes_options = ['directory',
2739
Option('default-rules',
2740
help='Display the default ignore rules that bzr uses.')
2593
def run(self, name_pattern_list=None, old_default_rules=None):
2743
def run(self, name_pattern_list=None, default_rules=None,
2594
2745
from bzrlib import ignores
2595
if old_default_rules is not None:
2596
# dump the rules and exit
2597
for pattern in ignores.OLD_DEFAULTS:
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)
2600
2751
if not name_pattern_list:
2601
2752
raise errors.BzrCommandError("ignore requires at least one "
2602
"NAME_PATTERN or --old-default-rules")
2753
"NAME_PATTERN or --default-rules.")
2603
2754
name_pattern_list = [globbing.normalize_pattern(p)
2604
2755
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('')
2605
2764
for name_pattern in name_pattern_list:
2606
2765
if (name_pattern[0] == '/' or
2607
2766
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2608
2767
raise errors.BzrCommandError(
2609
2768
"NAME_PATTERN should not be an absolute path")
2610
tree, relpath = WorkingTree.open_containing(u'.')
2769
tree, relpath = WorkingTree.open_containing(directory)
2611
2770
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2612
2771
ignored = globbing.Globster(name_pattern_list)
2773
self.add_cleanup(tree.lock_read().unlock)
2615
2774
for entry in tree.list_files():
2617
2776
if id is not None:
2618
2777
filename = entry[0]
2619
2778
if ignored.match(filename):
2620
matches.append(filename.encode('utf-8'))
2779
matches.append(filename)
2622
2780
if len(matches) > 0:
2623
print "Warning: the following files are version controlled and" \
2624
" match your ignore pattern:\n%s" \
2625
"\nThese files will continue to be version controlled" \
2626
" unless you 'bzr remove' them." % ("\n".join(matches),)
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),))
2629
2787
class cmd_ignored(Command):
2630
"""List ignored files and the patterns that matched them.
2788
__doc__ = """List ignored files and the patterns that matched them.
2632
2790
List all the ignored files and the ignore pattern that caused the file to
2640
2798
encoding_type = 'replace'
2641
2799
_see_also = ['ignore', 'ls']
2800
takes_options = ['directory']
2643
2802
@display_command
2645
tree = WorkingTree.open_containing(u'.')[0]
2648
for path, file_class, kind, file_id, entry in tree.list_files():
2649
if file_class != 'I':
2651
## XXX: Slightly inefficient since this was already calculated
2652
pat = tree.is_ignored(path)
2653
self.outf.write('%-50s %s\n' % (path, pat))
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))
2658
2814
class cmd_lookup_revision(Command):
2659
"""Lookup the revision-id from a revision-number
2815
__doc__ = """Lookup the revision-id from a revision-number
2662
2818
bzr lookup-revision 33
2665
2821
takes_args = ['revno']
2822
takes_options = ['directory']
2667
2824
@display_command
2668
def run(self, revno):
2825
def run(self, revno, directory=u'.'):
2670
2827
revno = int(revno)
2671
2828
except ValueError:
2672
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2674
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
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)
2677
2835
class cmd_export(Command):
2678
"""Export current or past revision to a destination directory or archive.
2836
__doc__ = """Export current or past revision to a destination directory or archive.
2680
2838
If no revision is specified this exports the last committed revision.
2755
2917
@display_command
2756
2918
def run(self, filename, revision=None, name_from_revision=False,
2919
filters=False, directory=None):
2758
2920
if revision is not None and len(revision) != 1:
2759
2921
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2760
2922
" one revision specifier")
2761
2923
tree, branch, relpath = \
2762
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2765
return self._run(tree, branch, relpath, filename, revision,
2766
name_from_revision, filters)
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)
2770
2929
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2772
2931
if tree is None:
2773
2932
tree = b.basis_tree()
2774
2933
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2934
self.add_cleanup(rev_tree.lock_read().unlock)
2776
2936
old_file_id = rev_tree.path2id(relpath)
3002
3175
if local and not tree.branch.get_bound_location():
3003
3176
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")
3005
3199
def get_message(commit_obj):
3006
3200
"""Callback to get commit message"""
3007
my_message = message
3008
if my_message is None and not file:
3009
t = make_commit_message_template_encoded(tree,
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,
3010
3213
selected_list, diff=show_diff,
3011
3214
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
3012
3220
start_message = generate_commit_message_template(commit_obj)
3013
my_message = edit_commit_message_encoded(t,
3221
my_message = edit_commit_message_encoded(text,
3014
3222
start_message=start_message)
3015
3223
if my_message is None:
3016
3224
raise errors.BzrCommandError("please specify a commit"
3017
3225
" message with either --message or --file")
3018
elif my_message and file:
3019
raise errors.BzrCommandError(
3020
"please specify either --message or --file")
3022
my_message = codecs.open(file, 'rt',
3023
osutils.get_user_encoding()).read()
3024
3226
if my_message == "":
3025
3227
raise errors.BzrCommandError("empty commit message specified")
3026
3228
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
3029
3235
tree.commit(message_callback=get_message,
3030
3236
specific_files=selected_list,
3031
3237
allow_pointless=unchanged, strict=strict, local=local,
3032
3238
reporter=None, verbose=verbose, revprops=properties,
3034
exclude=safe_relpath_files(tree, exclude))
3239
authors=author, timestamp=commit_stamp,
3241
exclude=tree.safe_relpath_files(exclude))
3035
3242
except PointlessCommit:
3036
# FIXME: This should really happen before the file is read in;
3037
# perhaps prepare the commit; get the message; then actually commit
3038
3243
raise errors.BzrCommandError("No changes to commit."
3039
3244
" Use --unchanged to commit anyhow.")
3040
3245
except ConflictsInTree:
3124
3330
class cmd_upgrade(Command):
3125
"""Upgrade branch storage to current format.
3127
The check command or bzr developers may sometimes advise you to run
3128
this command. When the default format has changed you may also be warned
3129
during other operations to upgrade.
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/.
3132
_see_also = ['check']
3363
_see_also = ['check', 'reconcile', 'formats']
3133
3364
takes_args = ['url?']
3134
3365
takes_options = [
3135
RegistryOption('format',
3136
help='Upgrade to a specific format. See "bzr help'
3137
' formats" for details.',
3138
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3139
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3140
value_switches=True, title='Branch format'),
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."),
3143
def run(self, url='.', format=None):
3378
def run(self, url='.', format=None, clean=False, dry_run=False):
3144
3379
from bzrlib.upgrade import upgrade
3145
upgrade(url, format)
3380
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3382
if len(exceptions) == 1:
3383
# Compatibility with historical behavior
3148
3389
class cmd_whoami(Command):
3149
"""Show or set bzr user id.
3390
__doc__ = """Show or set bzr user id.
3152
3393
Show the email of the current user::
3408
3663
def run(self, testspecs_list=None, verbose=False, one=False,
3409
3664
transport=None, benchmark=None,
3410
lsprof_timed=None, cache_dir=None,
3411
3666
first=False, list_only=False,
3412
3667
randomize=None, exclude=None, strict=False,
3413
3668
load_list=None, debugflag=None, starting_with=None, subunit=False,
3415
from bzrlib.tests import selftest
3416
import bzrlib.benchmarks as benchmarks
3417
from bzrlib.benchmarks import tree_creator
3419
# Make deprecation warnings visible, unless -Werror is set
3420
symbol_versioning.activate_deprecation_warnings(override=False)
3422
if cache_dir is not None:
3423
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3669
parallel=None, lsprof_tests=False):
3670
from bzrlib import tests
3424
3672
if testspecs_list is not None:
3425
3673
pattern = '|'.join(testspecs_list)
3432
3680
raise errors.BzrCommandError("subunit not available. subunit "
3433
3681
"needs to be installed to use --subunit.")
3434
3682
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)
3436
3693
self.additional_selftest_args.setdefault(
3437
3694
'suite_decorators', []).append(parallel)
3439
test_suite_factory = benchmarks.test_suite
3440
# Unless user explicitly asks for quiet, be verbose in benchmarks
3441
verbose = not is_quiet()
3442
# TODO: should possibly lock the history file...
3443
benchfile = open(".perf_history", "at", buffering=1)
3445
test_suite_factory = None
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(
3448
selftest_kwargs = {"verbose": verbose,
3450
"stop_on_failure": one,
3451
"transport": transport,
3452
"test_suite_factory": test_suite_factory,
3453
"lsprof_timed": lsprof_timed,
3454
"bench_history": benchfile,
3455
"matching_tests_first": first,
3456
"list_only": list_only,
3457
"random_seed": randomize,
3458
"exclude_pattern": exclude,
3460
"load_list": load_list,
3461
"debug_flags": debugflag,
3462
"starting_with": starting_with
3464
selftest_kwargs.update(self.additional_selftest_args)
3465
result = selftest(**selftest_kwargs)
3722
result = tests.selftest(**selftest_kwargs)
3467
if benchfile is not None:
3469
3725
return int(not result)
3472
3728
class cmd_version(Command):
3473
"""Show version of bzr."""
3729
__doc__ = """Show version of bzr."""
3475
3731
encoding_type = 'replace'
3476
3732
takes_options = [
3510
3766
branch1 = Branch.open_containing(branch)[0]
3511
3767
branch2 = Branch.open_containing(other)[0]
3516
last1 = ensure_null(branch1.last_revision())
3517
last2 = ensure_null(branch2.last_revision())
3519
graph = branch1.repository.get_graph(branch2.repository)
3520
base_rev_id = graph.find_unique_lca(last1, last2)
3522
print 'merge base is revision %s' % base_rev_id
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)
3529
3779
class cmd_merge(Command):
3530
"""Perform a three-way merge.
3780
__doc__ = """Perform a three-way merge.
3532
3782
The source of the merge can be specified either in the form of a branch,
3533
3783
or in the form of a path to a file containing a merge directive generated
3534
3784
with bzr send. If neither is specified, the default is the upstream branch
3535
3785
or the branch most recently merged using --remember.
3537
When merging a branch, by default the tip will be merged. To pick a different
3538
revision, pass --revision. If you specify two values, the first will be used as
3539
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3540
available revisions, like this is commonly referred to as "cherrypicking".
3542
Revision numbers are always relative to the branch being merged.
3544
By default, bzr will try to merge in all new work from the other
3545
branch, automatically determining an appropriate base. If this
3546
fails, you may need to give an explicit base.
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.
3548
3802
Merge will do its best to combine the changes in two branches, but there
3549
3803
are some kinds of problems only a human can fix. When it encounters those,
3633
3896
verified = 'inapplicable'
3634
3897
tree = WorkingTree.open_containing(directory)[0]
3636
# die as quickly as possible if there are uncommitted changes
3638
3900
basis_tree = tree.revision_tree(tree.last_revision())
3639
3901
except errors.NoSuchRevision:
3640
3902
basis_tree = tree.basis_tree()
3904
# die as quickly as possible if there are uncommitted changes
3642
if tree.has_changes(basis_tree):
3906
if tree.has_changes():
3643
3907
raise errors.UncommittedChanges(tree)
3645
3909
view_info = _get_view_info_for_change_reporter(tree)
3646
3910
change_reporter = delta._ChangeReporter(
3647
3911
unversioned_filter=tree.is_ignored, view_info=view_info)
3650
pb = ui.ui_factory.nested_progress_bar()
3651
cleanups.append(pb.finished)
3653
cleanups.append(tree.unlock)
3654
if location is not None:
3656
mergeable = bundle.read_mergeable_from_url(location,
3657
possible_transports=possible_transports)
3658
except errors.NotABundle:
3662
raise errors.BzrCommandError('Cannot use --uncommitted'
3663
' with bundles or merge directives.')
3665
if revision is not None:
3666
raise errors.BzrCommandError(
3667
'Cannot use -r with merge directives or bundles')
3668
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3671
if merger is None and uncommitted:
3672
if revision is not None and len(revision) > 0:
3673
raise errors.BzrCommandError('Cannot use --uncommitted and'
3674
' --revision at the same time.')
3675
merger = self.get_merger_from_uncommitted(tree, location, pb,
3677
allow_pending = False
3680
merger, allow_pending = self._get_merger_from_branch(tree,
3681
location, revision, remember, possible_transports, pb)
3683
merger.merge_type = merge_type
3684
merger.reprocess = reprocess
3685
merger.show_base = show_base
3686
self.sanity_check_merger(merger)
3687
if (merger.base_rev_id == merger.other_rev_id and
3688
merger.other_rev_id is not None):
3689
note('Nothing to do.')
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:
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.')
3951
if pull and not preview:
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)
3692
if merger.interesting_files is not None:
3693
raise errors.BzrCommandError('Cannot pull individual files')
3694
if (merger.base_rev_id == tree.last_revision()):
3695
result = tree.pull(merger.other_branch, False,
3696
merger.other_rev_id)
3697
result.report(self.outf)
3699
merger.check_basis(False)
3701
return self._do_preview(merger, cleanups)
3703
return self._do_interactive(merger, cleanups)
3705
return self._do_merge(merger, change_reporter, allow_pending,
3708
for cleanup in reversed(cleanups):
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,
3711
def _get_preview(self, merger, cleanups):
3971
def _get_preview(self, merger):
3712
3972
tree_merger = merger.make_merger()
3713
3973
tt = tree_merger.make_preview_transform()
3714
cleanups.append(tt.finalize)
3974
self.add_cleanup(tt.finalize)
3715
3975
result_tree = tt.get_preview_tree()
3716
3976
return result_tree
3718
def _do_preview(self, merger, cleanups):
3978
def _do_preview(self, merger):
3719
3979
from bzrlib.diff import show_diff_trees
3720
result_tree = self._get_preview(merger, cleanups)
3980
result_tree = self._get_preview(merger)
3981
path_encoding = osutils.get_diff_header_encoding()
3721
3982
show_diff_trees(merger.this_tree, result_tree, self.outf,
3722
old_label='', new_label='')
3983
old_label='', new_label='',
3984
path_encoding=path_encoding)
3724
3986
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3725
3987
merger.change_reporter = change_reporter
3909
4174
def run(self, file_list=None, merge_type=None, show_base=False,
3910
4175
reprocess=False):
4176
from bzrlib.conflicts import restore
3911
4177
if merge_type is None:
3912
4178
merge_type = _mod_merge.Merge3Merger
3913
tree, file_list = tree_files(file_list)
3916
parents = tree.get_parent_ids()
3917
if len(parents) != 2:
3918
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3919
" merges. Not cherrypicking or"
3921
repository = tree.branch.repository
3922
interesting_ids = None
3924
conflicts = tree.conflicts()
3925
if file_list is not None:
3926
interesting_ids = set()
3927
for filename in file_list:
3928
file_id = tree.path2id(filename)
3930
raise errors.NotVersionedError(filename)
3931
interesting_ids.add(file_id)
3932
if tree.kind(file_id) != "directory":
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":
3935
for name, ie in tree.inventory.iter_entries(file_id):
3936
interesting_ids.add(ie.file_id)
3937
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3939
# Remerge only supports resolving contents conflicts
3940
allowed_conflicts = ('text conflict', 'contents conflict')
3941
restore_files = [c.path for c in conflicts
3942
if c.typestring in allowed_conflicts]
3943
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3944
tree.set_conflicts(ConflictList(new_conflicts))
3945
if file_list is not None:
3946
restore_files = file_list
3947
for filename in restore_files:
3949
restore(tree.abspath(filename))
3950
except errors.NotConflicted:
3952
# Disable pending merges, because the file texts we are remerging
3953
# have not had those merges performed. If we use the wrong parents
3954
# list, we imply that the working tree text has seen and rejected
3955
# all the changes from the other tree, when in fact those changes
3956
# have not yet been seen.
3957
pb = ui.ui_factory.nested_progress_bar()
3958
tree.set_parent_ids(parents[:1])
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:
3960
merger = _mod_merge.Merger.from_revision_ids(pb,
3962
merger.interesting_ids = interesting_ids
3963
merger.merge_type = merge_type
3964
merger.show_base = show_base
3965
merger.reprocess = reprocess
3966
conflicts = merger.do_merge()
3968
tree.set_parent_ids(parents)
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()
4231
tree.set_parent_ids(parents)
3972
4232
if conflicts > 0:
3996
4257
name. If you name a directory, all the contents of that directory will be
3999
Any files that have been newly added since that revision will be deleted,
4000
with a backup kept if appropriate. Directories containing unknown files
4001
will not be deleted.
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
4003
The working tree contains a list of pending merged revisions, which will
4004
be included as parents in the next commit. Normally, revert clears that
4005
list as well as reverting the files. If any files are specified, revert
4006
leaves the pending merge list alone and reverts only the files. Use "bzr
4007
revert ." in the tree root to revert all files but keep the merge record,
4008
and "bzr revert --forget-merges" to clear the pending merge list without
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
4009
4272
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
4012
_see_also = ['cat', 'export']
4285
_see_also = ['cat', 'export', 'merge', 'shelve']
4013
4286
takes_options = [
4015
4288
Option('no-backup', "Do not save backups of reverted files."),
4021
4294
def run(self, revision=None, no_backup=False, file_list=None,
4022
4295
forget_merges=None):
4023
tree, file_list = tree_files(file_list)
4027
tree.set_parent_ids(tree.get_parent_ids()[:1])
4029
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
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)
4034
4304
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4035
4305
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4036
pb = ui.ui_factory.nested_progress_bar()
4038
tree.revert(file_list, rev_tree, not no_backup, pb,
4039
report_changes=True)
4306
tree.revert(file_list, rev_tree, not no_backup, None,
4307
report_changes=True)
4044
4310
class cmd_assert_fail(Command):
4045
"""Test reporting of assertion failures"""
4311
__doc__ = """Test reporting of assertion failures"""
4046
4312
# intended just for use in testing
4189
4465
_get_revision_range(revision,
4190
4466
remote_branch, self.name()))
4192
local_branch.lock_read()
4194
remote_branch.lock_read()
4196
local_extra, remote_extra = find_unmerged(
4197
local_branch, remote_branch, restrict,
4198
backward=not reverse,
4199
include_merges=include_merges,
4200
local_revid_range=local_revid_range,
4201
remote_revid_range=remote_revid_range)
4203
if log_format is None:
4204
registry = log.log_formatter_registry
4205
log_format = registry.get_default(local_branch)
4206
lf = log_format(to_file=self.outf,
4208
show_timezone='original')
4211
if local_extra and not theirs_only:
4212
message("You have %d extra revision(s):\n" %
4214
for revision in iter_log_revisions(local_extra,
4215
local_branch.repository,
4217
lf.log_revision(revision)
4218
printed_local = True
4221
printed_local = False
4223
if remote_extra and not mine_only:
4224
if printed_local is True:
4226
message("You are missing %d revision(s):\n" %
4228
for revision in iter_log_revisions(remote_extra,
4229
remote_branch.repository,
4231
lf.log_revision(revision)
4234
if mine_only and not local_extra:
4235
# We checked local, and found nothing extra
4236
message('This branch is up to date.\n')
4237
elif theirs_only and not remote_extra:
4238
# We checked remote, and found nothing extra
4239
message('Other branch is up to date.\n')
4240
elif not (mine_only or theirs_only or local_extra or
4242
# We checked both branches, and neither one had extra
4244
message("Branches are up to date.\n")
4246
remote_branch.unlock()
4248
local_branch.unlock()
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")
4249
4518
if not status_code and parent is None and other_branch is not None:
4250
local_branch.lock_write()
4252
# handle race conditions - a parent might be set while we run.
4253
if local_branch.get_parent() is None:
4254
local_branch.set_parent(remote_branch.base)
4256
local_branch.unlock()
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)
4257
4523
return status_code
4260
4526
class cmd_pack(Command):
4261
"""Compress the data within a repository."""
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.
4263
4545
_see_also = ['repositories']
4264
4546
takes_args = ['branch_or_repo?']
4548
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4266
def run(self, branch_or_repo='.'):
4551
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4267
4552
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4269
4554
branch = dir.open_branch()
4270
4555
repository = branch.repository
4271
4556
except errors.NotBranchError:
4272
4557
repository = dir.open_repository()
4558
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4276
4561
class cmd_plugins(Command):
4277
"""List the installed plugins.
4562
__doc__ = """List the installed plugins.
4279
4564
This command displays the list of installed plugins including
4280
4565
version of plugin and a short description of each.
4370
4652
Option('long', help='Show commit date in annotations.'),
4374
4657
encoding_type = 'exact'
4376
4659
@display_command
4377
4660
def run(self, filename, all=False, long=False, revision=None,
4661
show_ids=False, directory=None):
4379
4662
from bzrlib.annotate import annotate_file, annotate_file_tree
4380
4663
wt, branch, relpath = \
4381
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4387
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4389
file_id = wt.path2id(relpath)
4391
file_id = tree.path2id(relpath)
4393
raise errors.NotVersionedError(filename)
4394
file_version = tree.inventory[file_id].revision
4395
if wt is not None and revision is None:
4396
# If there is a tree and we're not annotating historical
4397
# versions, annotate the working tree's content.
4398
annotate_file_tree(wt, file_id, self.outf, long, all,
4401
annotate_file(branch, file_version, file_id, long, all, self.outf,
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,
4410
4688
class cmd_re_sign(Command):
4411
"""Create a digital signature for an existing revision."""
4689
__doc__ = """Create a digital signature for an existing revision."""
4412
4690
# TODO be able to replace existing ones.
4414
4692
hidden = True # is this right ?
4415
4693
takes_args = ['revision_id*']
4416
takes_options = ['revision']
4694
takes_options = ['directory', 'revision']
4418
def run(self, revision_id_list=None, revision=None):
4696
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4419
4697
if revision_id_list is not None and revision is not None:
4420
4698
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4421
4699
if revision_id_list is None and revision is None:
4422
4700
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4423
b = WorkingTree.open_containing(u'.')[0].branch
4426
return self._run(b, revision_id_list, revision)
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)
4430
4705
def _run(self, b, revision_id_list, revision):
4431
4706
import bzrlib.gpg as gpg
4624
4896
end_revision=last_revno)
4627
print 'Dry-run, pretending to remove the above revisions.'
4629
val = raw_input('Press <enter> to continue')
4899
self.outf.write('Dry-run, pretending to remove'
4900
' the above revisions.\n')
4631
print 'The above revision(s) will be removed.'
4633
val = raw_input('Are you sure [y/N]? ')
4634
if val.lower() not in ('y', 'yes'):
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')
4638
4912
mutter('Uncommitting from {%s} to {%s}',
4639
4913
last_rev_id, rev_id)
4640
4914
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4641
4915
revno=revno, local=local)
4642
note('You can restore the old tip by running:\n'
4643
' bzr pull . -r revid:%s', last_rev_id)
4916
self.outf.write('You can restore the old tip by running:\n'
4917
' bzr pull . -r revid:%s\n' % last_rev_id)
4646
4920
class cmd_break_lock(Command):
4647
"""Break a dead lock on a repository, branch or working directory.
4921
__doc__ = """Break a dead lock.
4923
This command breaks a lock on a repository, branch, working directory or
4649
4926
CAUTION: Locks should only be broken when you are sure that the process
4650
4927
holding the lock has been stopped.
4652
You can get information on what locks are open via the 'bzr info' command.
4929
You can get information on what locks are open via the 'bzr info
4930
[location]' command.
4934
bzr break-lock bzr+ssh://example.com/bzr/foo
4935
bzr break-lock --conf ~/.bazaar
4657
4938
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.'),
4659
def run(self, location=None, show=False):
4946
def run(self, location=None, config=False, force=False):
4660
4947
if location is None:
4661
4948
location = u'.'
4662
control, relpath = bzrdir.BzrDir.open_containing(location)
4664
control.break_lock()
4665
except NotImplementedError:
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:
4669
4964
class cmd_wait_until_signalled(Command):
4670
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4965
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4672
4967
This just prints a line to signal when it is ready, then blocks on stdin.
4926
5226
directly from the merge directive, without retrieving data from a
4929
If --no-bundle is specified, then public_branch is needed (and must be
4930
up-to-date), so that the receiver can perform the merge using the
4931
public_branch. The public_branch is always included if known, so that
4932
people can check it later.
4934
The submit branch defaults to the parent, but can be overridden. Both
4935
submit branch and public branch will be remembered if supplied.
4937
If a public_branch is known for the submit_branch, that public submit
4938
branch is used in the merge instructions. This means that a local mirror
4939
can be used as your actual submit branch, once you have set public_branch
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.
4942
5256
Mail is sent using your preferred mail program. This should be transparent
4943
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5257
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4944
5258
If the preferred client can't be found (or used), your editor will be used.
4946
5260
To use a specific mail program, set the mail_client configuration option.
4947
5261
(For Thunderbird 1.5, this works around some bugs.) Supported values for
4948
specific clients are "claws", "evolution", "kmail", "mutt", and
4949
"thunderbird"; generic options are "default", "editor", "emacsclient",
4950
"mapi", and "xdg-email". Plugins may also add supported clients.
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
4952
5267
If mail is being sent, a to address is required. This can be supplied
4953
5268
either on the commandline, by setting the submit_to configuration
5100
5419
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5101
5420
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
5104
5428
_see_also = ['commit', 'tags']
5105
takes_args = ['tag_name']
5429
takes_args = ['tag_name?']
5106
5430
takes_options = [
5107
5431
Option('delete',
5108
5432
help='Delete this tag rather than placing it.',
5111
help='Branch in which to place the tag.',
5434
custom_help('directory',
5435
help='Branch in which to place the tag.'),
5115
5436
Option('force',
5116
5437
help='Replace existing tags.',
5121
def run(self, tag_name,
5442
def run(self, tag_name=None,
5127
5448
branch, relpath = Branch.open_containing(directory)
5131
branch.tags.delete_tag(tag_name)
5132
self.outf.write('Deleted tag %s.\n' % tag_name)
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)
5135
if len(revision) != 1:
5136
raise errors.BzrCommandError(
5137
"Tags can only be placed on a single revision, "
5139
revision_id = revision[0].as_revision_id(branch)
5141
revision_id = branch.last_revision()
5142
if (not force) and branch.tags.has_tag(tag_name):
5143
raise errors.TagAlreadyExists(tag_name)
5144
branch.tags.set_tag(tag_name, revision_id)
5145
self.outf.write('Created 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)
5150
5475
class cmd_tags(Command):
5476
__doc__ = """List tags.
5153
5478
This command shows a table of tag names and the revisions they reference.
5156
5481
_see_also = ['tag']
5157
5482
takes_options = [
5159
help='Branch whose tags should be displayed.',
5163
RegistryOption.from_kwargs('sort',
5483
custom_help('directory',
5484
help='Branch whose tags should be displayed.'),
5485
RegistryOption('sort',
5164
5486
'Sort tags by different criteria.', title='Sorting',
5165
alpha='Sort tags lexicographically (default).',
5166
time='Sort tags chronologically.',
5487
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5172
5493
@display_command
5494
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5495
from bzrlib.tag import tag_sort_methods
5179
5496
branch, relpath = Branch.open_containing(directory)
5181
5498
tags = branch.tags.get_tag_dict().items()
5188
graph = branch.repository.get_graph()
5189
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5190
revid1, revid2 = rev1.rev_id, rev2.rev_id
5191
# only show revisions between revid1 and revid2 (inclusive)
5192
tags = [(tag, revid) for tag, revid in tags if
5193
graph.is_between(revid, revid1, revid2)]
5196
elif sort == 'time':
5198
for tag, revid in tags:
5200
revobj = branch.repository.get_revision(revid)
5201
except errors.NoSuchRevision:
5202
timestamp = sys.maxint # place them at the end
5204
timestamp = revobj.timestamp
5205
timestamps[revid] = timestamp
5206
tags.sort(key=lambda x: timestamps[x[1]])
5208
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5209
for index, (tag, revid) in enumerate(tags):
5211
revno = branch.revision_id_to_dotted_revno(revid)
5212
if isinstance(revno, tuple):
5213
revno = '.'.join(map(str, revno))
5214
except errors.NoSuchRevision:
5215
# Bad tag data/merges can lead to tagged revisions
5216
# which are not in this branch. Fail gracefully ...
5218
tags[index] = (tag, revno)
5502
self.add_cleanup(branch.lock_read().unlock)
5504
graph = branch.repository.get_graph()
5505
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5506
revid1, revid2 = rev1.rev_id, rev2.rev_id
5507
# only show revisions between revid1 and revid2 (inclusive)
5508
tags = [(tag, revid) for tag, revid in tags if
5509
graph.is_between(revid, revid1, revid2)]
5511
sort = tag_sort_methods.get()
5514
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5515
for index, (tag, revid) in enumerate(tags):
5517
revno = branch.revision_id_to_dotted_revno(revid)
5518
if isinstance(revno, tuple):
5519
revno = '.'.join(map(str, revno))
5520
except errors.NoSuchRevision:
5521
# Bad tag data/merges can lead to tagged revisions
5522
# which are not in this branch. Fail gracefully ...
5524
tags[index] = (tag, revno)
5221
5526
for tag, revspec in tags:
5222
5527
self.outf.write('%-20s %s\n' % (tag, revspec))
5225
5530
class cmd_reconfigure(Command):
5226
"""Reconfigure the type of a bzr directory.
5531
__doc__ = """Reconfigure the type of a bzr directory.
5228
5533
A target configuration must be specified.
5332
5637
/path/to/newbranch.
5334
5639
Bound branches use the nickname of its master branch unless it is set
5335
locally, in which case switching will update the the local nickname to be
5640
locally, in which case switching will update the local nickname to be
5336
5641
that of the master.
5339
takes_args = ['to_location']
5340
takes_options = [Option('force',
5644
takes_args = ['to_location?']
5645
takes_options = ['directory',
5341
5647
help='Switch even if local commits will be lost.'),
5342
5649
Option('create-branch', short_name='b',
5343
5650
help='Create the target branch from this one before'
5344
5651
' switching to it.'),
5347
def run(self, to_location, force=False, create_branch=False):
5654
def run(self, to_location=None, force=False, create_branch=False,
5655
revision=None, directory=u'.'):
5348
5656
from bzrlib import switch
5657
tree_location = directory
5658
revision = _get_one_revision('switch', revision)
5350
5659
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5660
if to_location is None:
5661
if revision is None:
5662
raise errors.BzrCommandError('You must supply either a'
5663
' revision or a location')
5664
to_location = tree_location
5352
5666
branch = control_dir.open_branch()
5353
5667
had_explicit_nick = branch.get_config().has_explicit_nickname()
5617
5967
Option('destroy',
5618
5968
help='Destroy removed changes instead of shelving them.'),
5620
_see_also = ['unshelve']
5970
_see_also = ['unshelve', 'configuration']
5622
5972
def run(self, revision=None, all=False, file_list=None, message=None,
5623
writer=None, list=False, destroy=False):
5973
writer=None, list=False, destroy=False, directory=None):
5625
return self.run_for_list()
5975
return self.run_for_list(directory=directory)
5626
5976
from bzrlib.shelf_ui import Shelver
5627
5977
if writer is None:
5628
5978
writer = bzrlib.option.diff_writer_registry.get()
5630
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5631
message, destroy=destroy).run()
5980
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5981
file_list, message, destroy=destroy, directory=directory)
5632
5986
except errors.UserAbort:
5635
def run_for_list(self):
5636
tree = WorkingTree.open_containing('.')[0]
5639
manager = tree.get_shelf_manager()
5640
shelves = manager.active_shelves()
5641
if len(shelves) == 0:
5642
note('No shelved changes.')
5644
for shelf_id in reversed(shelves):
5645
message = manager.get_metadata(shelf_id).get('message')
5647
message = '<no message>'
5648
self.outf.write('%3d: %s\n' % (shelf_id, message))
5989
def run_for_list(self, directory=None):
5990
if directory is None:
5992
tree = WorkingTree.open_containing(directory)[0]
5993
self.add_cleanup(tree.lock_read().unlock)
5994
manager = tree.get_shelf_manager()
5995
shelves = manager.active_shelves()
5996
if len(shelves) == 0:
5997
note('No shelved changes.')
5999
for shelf_id in reversed(shelves):
6000
message = manager.get_metadata(shelf_id).get('message')
6002
message = '<no message>'
6003
self.outf.write('%3d: %s\n' % (shelf_id, message))
5654
6007
class cmd_unshelve(Command):
5655
"""Restore shelved changes.
6008
__doc__ = """Restore shelved changes.
5657
6010
By default, the most recently shelved changes are restored. However if you
5658
6011
specify a shelf by id those changes will be restored instead. This works
5662
6015
takes_args = ['shelf_id?']
5663
6016
takes_options = [
5664
6018
RegistryOption.from_kwargs(
5665
6019
'action', help="The action to perform.",
5666
6020
enum_switch=False, value_switches=True,
5667
6021
apply="Apply changes and remove from the shelf.",
5668
6022
dry_run="Show changes, but do not apply or remove them.",
5669
delete_only="Delete changes without applying them."
6023
preview="Instead of unshelving the changes, show the diff that "
6024
"would result from unshelving.",
6025
delete_only="Delete changes without applying them.",
6026
keep="Apply changes but don't delete them.",
5672
6029
_see_also = ['shelve']
5674
def run(self, shelf_id=None, action='apply'):
6031
def run(self, shelf_id=None, action='apply', directory=u'.'):
5675
6032
from bzrlib.shelf_ui import Unshelver
5676
Unshelver.from_args(shelf_id, action).run()
6033
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
6037
unshelver.tree.unlock()
5679
6040
class cmd_clean_tree(Command):
5680
"""Remove unwanted files from working tree.
6041
__doc__ = """Remove unwanted files from working tree.
5682
6043
By default, only unknown files, not ignored files, are deleted. Versioned
5683
6044
files are never deleted.
5700
6062
' deleting them.'),
5701
6063
Option('force', help='Do not prompt before deleting.')]
5702
6064
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6065
force=False, directory=u'.'):
5704
6066
from bzrlib.clean_tree import clean_tree
5705
6067
if not (unknown or ignored or detritus):
5709
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5710
dry_run=dry_run, no_prompt=force)
6071
clean_tree(directory, unknown=unknown, ignored=ignored,
6072
detritus=detritus, dry_run=dry_run, no_prompt=force)
5713
6075
class cmd_reference(Command):
5714
"""list, view and set branch locations for nested trees.
6076
__doc__ = """list, view and set branch locations for nested trees.
5716
6078
If no arguments are provided, lists the branch locations for nested trees.
5717
6079
If one argument is provided, display the branch location for that tree.
5757
6119
self.outf.write('%s %s\n' % (path, location))
5760
# these get imported and then picked up by the scan for cmd_*
5761
# TODO: Some more consistent way to split command definitions across files;
5762
# we do need to load at least some information about them to know of
5763
# aliases. ideally we would avoid loading the implementation until the
5764
# details were needed.
5765
from bzrlib.cmd_version_info import cmd_version_info
5766
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5767
from bzrlib.bundle.commands import (
5770
from bzrlib.foreign import cmd_dpush
5771
from bzrlib.sign_my_commits import cmd_sign_my_commits
5772
from bzrlib.weave_commands import cmd_versionedfile_list, \
5773
cmd_weave_plan_merge, cmd_weave_merge_text
6122
def _register_lazy_builtins():
6123
# register lazy builtins from other modules; called at startup and should
6124
# be only called once.
6125
for (name, aliases, module_name) in [
6126
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6127
('cmd_config', [], 'bzrlib.config'),
6128
('cmd_dpush', [], 'bzrlib.foreign'),
6129
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6130
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6131
('cmd_conflicts', [], 'bzrlib.conflicts'),
6132
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6133
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6135
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
