174
155
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
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)
182
206
def _get_view_info_for_change_reporter(tree):
313
321
takes_args = ['revision_id?']
314
takes_options = ['directory', 'revision']
322
takes_options = ['revision']
315
323
# cat-revision is more for frontends so should be exact
316
324
encoding = 'strict'
318
def print_revision(self, revisions, revid):
319
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
320
record = stream.next()
321
if record.storage_kind == 'absent':
322
raise errors.NoSuchRevision(revisions, revid)
323
revtext = record.get_bytes_as('fulltext')
324
self.outf.write(revtext.decode('utf-8'))
327
def run(self, revision_id=None, revision=None, directory=u'.'):
327
def run(self, revision_id=None, revision=None):
328
328
if revision_id is not None and revision is not None:
329
329
raise errors.BzrCommandError('You can only supply one of'
330
330
' revision_id or --revision')
331
331
if revision_id is None and revision is None:
332
332
raise errors.BzrCommandError('You must supply either'
333
333
' --revision or a revision_id')
335
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
337
revisions = b.repository.revisions
338
if revisions is None:
339
raise errors.BzrCommandError('Repository %r does not support '
340
'access to raw revision texts')
342
b.repository.lock_read()
344
# TODO: jam 20060112 should cat-revision always output utf-8?
345
if revision_id is not None:
346
revision_id = osutils.safe_revision_id(revision_id, warn=False)
348
self.print_revision(revisions, revision_id)
349
except errors.NoSuchRevision:
350
msg = "The repository %s contains no revision %s." % (
351
b.repository.base, revision_id)
352
raise errors.BzrCommandError(msg)
353
elif revision is not None:
356
raise errors.BzrCommandError(
357
'You cannot specify a NULL revision.')
358
rev_id = rev.as_revision_id(b)
359
self.print_revision(revisions, rev_id)
361
b.repository.unlock()
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'))
364
354
class cmd_dump_btree(Command):
365
__doc__ = """Dump the contents of a btree index file to stdout.
355
"""Dump the contents of a btree index file to stdout.
367
357
PATH is a btree index file, it can be any URL. This includes things like
368
358
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
454
434
To re-create the working tree, use "bzr checkout".
456
436
_see_also = ['checkout', 'working-trees']
457
takes_args = ['location*']
437
takes_args = ['location?']
458
438
takes_options = [
460
440
help='Remove the working tree even if it has '
461
'uncommitted or shelved changes.'),
441
'uncommitted changes.'),
464
def run(self, location_list, force=False):
465
if not location_list:
468
for location in location_list:
469
d = bzrdir.BzrDir.open(location)
472
working = d.open_workingtree()
473
except errors.NoWorkingTree:
474
raise errors.BzrCommandError("No working tree to remove")
475
except errors.NotLocalUrl:
476
raise errors.BzrCommandError("You cannot remove the working tree"
479
if (working.has_changes()):
480
raise errors.UncommittedChanges(working)
481
if working.get_shelf_manager().last_shelf() is not None:
482
raise errors.ShelvedChanges(working)
484
if working.user_url != working.branch.user_url:
485
raise errors.BzrCommandError("You cannot remove the working tree"
486
" from a lightweight checkout")
488
d.destroy_workingtree()
491
class cmd_repair_workingtree(Command):
492
__doc__ = """Reset the working tree state file.
494
This is not meant to be used normally, but more as a way to recover from
495
filesystem corruption, etc. This rebuilds the working inventory back to a
496
'known good' state. Any new modifications (adding a file, renaming, etc)
497
will be lost, though modified files will still be detected as such.
499
Most users will want something more like "bzr revert" or "bzr update"
500
unless the state file has become corrupted.
502
By default this attempts to recover the current state by looking at the
503
headers of the state file. If the state file is too corrupted to even do
504
that, you can supply --revision to force the state of the tree.
507
takes_options = ['revision', 'directory',
509
help='Reset the tree even if it doesn\'t appear to be'
514
def run(self, revision=None, directory='.', force=False):
515
tree, _ = WorkingTree.open_containing(directory)
516
self.add_cleanup(tree.lock_tree_write().unlock)
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"
520
except errors.BzrError:
521
pass # There seems to be a real error here, so we'll reset
524
raise errors.BzrCommandError(
525
'The tree does not appear to be corrupt. You probably'
526
' want "bzr revert" instead. Use "--force" if you are'
527
' sure you want to reset the working tree.')
531
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
533
tree.reset_state(revision_ids)
534
except errors.BzrError, e:
535
if revision_ids is None:
536
extra = (', the header appears corrupt, try passing -r -1'
537
' to set the state to the last commit')
540
raise errors.BzrCommandError('failed to reset the tree state'
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()
544
468
class cmd_revno(Command):
545
__doc__ = """Show current revision number.
469
"""Show current revision number.
547
471
This is equal to the number of revisions on this branch.
560
484
wt = WorkingTree.open_containing(location)[0]
561
self.add_cleanup(wt.lock_read().unlock)
562
486
except (errors.NoWorkingTree, errors.NotLocalUrl):
563
487
raise errors.NoWorkingTree(location)
564
revid = wt.last_revision()
566
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
567
except errors.NoSuchRevision:
569
revno = ".".join(str(n) for n in revno_t)
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)
571
498
b = Branch.open_containing(location)[0]
572
self.add_cleanup(b.lock_read().unlock)
575
505
self.outf.write(str(revno) + '\n')
578
508
class cmd_revision_info(Command):
579
__doc__ = """Show revision number and revision id for a given revision identifier.
509
"""Show revision number and revision id for a given revision identifier.
582
512
takes_args = ['revision_info*']
583
513
takes_options = [
585
custom_help('directory',
586
516
help='Branch to examine, '
587
'rather than the one containing the working directory.'),
517
'rather than the one containing the working directory.',
588
521
Option('tree', help='Show revno of working tree'),
596
529
wt = WorkingTree.open_containing(directory)[0]
598
self.add_cleanup(wt.lock_read().unlock)
599
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
601
534
b = Branch.open_containing(directory)[0]
602
self.add_cleanup(b.lock_read().unlock)
604
if revision is not None:
605
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
606
if revision_info_list is not None:
607
for rev_str in revision_info_list:
608
rev_spec = RevisionSpec.from_string(rev_str)
609
revision_ids.append(rev_spec.as_revision_id(b))
610
# No arguments supplied, default to the last revision
611
if len(revision_ids) == 0:
614
raise errors.NoWorkingTree(directory)
615
revision_ids.append(wt.last_revision())
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])
617
revision_ids.append(b.last_revision())
621
for revision_id in revision_ids:
623
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
624
revno = '.'.join(str(i) for i in dotted_revno)
625
except errors.NoSuchRevision:
627
maxlen = max(maxlen, len(revno))
628
revinfos.append([revno, revision_id])
631
569
for ri in revinfos:
632
570
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
635
573
class cmd_add(Command):
636
__doc__ = """Add specified files or directories.
574
"""Add specified files or directories.
638
576
In non-recursive mode, all the named items are added, regardless
639
577
of whether they were previously ignored. A warning is given if
704
639
should_print=(not is_quiet()))
707
self.add_cleanup(base_tree.lock_read().unlock)
708
tree, file_list = tree_files_for_add(file_list)
709
added, ignored = tree.smart_add(file_list, not
710
no_recurse, action=action, save=not dry_run)
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:
712
651
if len(ignored) > 0:
714
653
for glob in sorted(ignored.keys()):
715
654
for path in ignored[glob]:
716
655
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")
720
667
class cmd_mkdir(Command):
721
__doc__ = """Create a new versioned directory.
668
"""Create a new versioned directory.
723
670
This is equivalent to creating the directory and then adding it.
781
723
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
783
725
revision = _get_one_revision('inventory', revision)
784
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
785
self.add_cleanup(work_tree.lock_read().unlock)
786
if revision is not None:
787
tree = revision.as_tree(work_tree.branch)
789
extra_trees = [work_tree]
790
self.add_cleanup(tree.lock_read().unlock)
795
if file_list is not None:
796
file_ids = tree.paths2ids(file_list, trees=extra_trees,
797
require_versioned=True)
798
# find_ids_across_trees may include some paths that don't
801
(tree.id2path(file_id), tree.inventory[file_id])
802
for file_id in file_ids if tree.has_id(file_id))
804
entries = tree.inventory.entries()
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:
807
752
for path, entry in entries:
808
753
if kind and kind != entry.kind:
946
895
dest = osutils.pathjoin(dest_parent, dest_tail)
947
896
mutter("attempting to move %s => %s", src, dest)
948
897
tree.rename_one(src, dest, after=after)
950
self.outf.write("%s => %s\n" % (src, dest))
898
self.outf.write("%s => %s\n" % (src, dest))
953
901
class cmd_pull(Command):
954
__doc__ = """Turn this branch into a mirror of another branch.
902
"""Turn this branch into a mirror of another branch.
956
By default, this command only works on branches that have not diverged.
957
Branches are considered diverged if the destination branch's most recent
958
commit is one that has not been merged (directly or indirectly) into the
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.
961
908
If branches have diverged, you can use 'bzr merge' to integrate the changes
962
909
from one into the other. Once one branch has merged, the other should
963
910
be able to pull it again.
965
If you want to replace your local changes and just want your branch to
966
match the remote one, use pull --overwrite. This will work even if the two
967
branches have diverged.
912
If you want to forget your local changes and just update your branch to
913
match the remote one, use pull --overwrite.
969
If there is no default location set, the first pull will set it (use
970
--no-remember to avoid settting it). After that, you can omit the
971
location to use the default. To change the default, use --remember. The
972
value will only be saved if the remote location can be accessed.
915
If there is no default location set, the first pull will set it. After
916
that, you can omit the location to use the default. To change the
917
default, use --remember. The value will only be saved if the remote
918
location can be accessed.
974
920
Note: The location can be specified either in the form of a branch,
975
921
or in the form of a path to a file containing a merge directive generated
980
926
takes_options = ['remember', 'overwrite', 'revision',
981
927
custom_help('verbose',
982
928
help='Show logs of pulled revisions.'),
983
custom_help('directory',
984
930
help='Branch to pull into, '
985
'rather than the one containing the working directory.'),
931
'rather than the one containing the working directory.',
987
936
help="Perform a local pull in a bound "
988
937
"branch. Local pulls are not applied to "
989
938
"the master branch."
992
help="Show base revision text in conflicts.")
994
941
takes_args = ['location?']
995
942
encoding_type = 'replace'
997
def run(self, location=None, remember=None, overwrite=False,
944
def run(self, location=None, remember=False, overwrite=False,
998
945
revision=None, verbose=False,
999
directory=None, local=False,
946
directory=None, local=False):
1001
947
# FIXME: too much stuff is in the command class
1002
948
revision_id = None
1003
949
mergeable = None
1051
992
branch_from = Branch.open(location,
1052
993
possible_transports=possible_transports)
1053
self.add_cleanup(branch_from.lock_read().unlock)
1054
# Remembers if asked explicitly or no previous location is set
1056
or (remember is None and branch_to.get_parent() is None)):
995
if branch_to.get_parent() is None or remember:
1057
996
branch_to.set_parent(branch_from.base)
1059
if revision is not None:
1060
revision_id = revision.as_revision_id(branch_from)
1062
if tree_to is not None:
1063
view_info = _get_view_info_for_change_reporter(tree_to)
1064
change_reporter = delta._ChangeReporter(
1065
unversioned_filter=tree_to.is_ignored,
1066
view_info=view_info)
1067
result = tree_to.pull(
1068
branch_from, overwrite, revision_id, change_reporter,
1069
possible_transports=possible_transports, local=local,
1070
show_base=show_base)
1072
result = branch_to.pull(
1073
branch_from, overwrite, revision_id, local=local)
1075
result.report(self.outf)
1076
if verbose and result.old_revid != result.new_revid:
1077
log.show_branch_change(
1078
branch_to, self.outf, result.old_revno,
1080
if getattr(result, 'tag_conflicts', None):
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()
1086
1030
class cmd_push(Command):
1087
__doc__ = """Update a mirror of this branch.
1031
"""Update a mirror of this branch.
1089
1033
The target branch will not have its working tree populated because this
1090
1034
is both expensive, and is not supported on remote file systems.
1151
1095
# Get the source branch
1152
1096
(tree, br_from,
1153
1097
_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
1154
1101
# Get the tip's revision_id
1155
1102
revision = _get_one_revision('push', revision)
1156
1103
if revision is not None:
1157
1104
revision_id = revision.in_history(br_from).rev_id
1159
1106
revision_id = None
1160
if tree is not None and revision_id is None:
1161
tree.check_changed_or_out_of_date(
1162
strict, 'push_strict',
1163
more_error='Use --no-strict to force the push.',
1164
more_warning='Uncommitted changes will not be pushed.')
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.')
1165
1119
# Get the stacked_on branch, if any
1166
1120
if stacked_on is not None:
1167
1121
stacked_on = urlutils.normalize_url(stacked_on)
1236
1183
' directory exists, but does not already'
1237
1184
' have a control directory. This flag will'
1238
1185
' allow branch to proceed.'),
1240
help="Bind new branch to from location."),
1242
1187
aliases = ['get', 'clone']
1244
1189
def run(self, from_location, to_location=None, revision=None,
1245
1190
hardlink=False, stacked=False, standalone=False, no_tree=False,
1246
use_existing_dir=False, switch=False, bind=False,
1248
from bzrlib import switch as _mod_switch
1191
use_existing_dir=False):
1249
1192
from bzrlib.tag import _merge_tags_if_possible
1250
if self.invoked_as in ['get', 'clone']:
1251
ui.ui_factory.show_user_warning(
1252
'deprecated_command',
1253
deprecated_name=self.invoked_as,
1254
recommended_name='branch',
1255
deprecated_in_version='2.4')
1256
1194
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1258
if not (hardlink or files_from):
1259
# accelerator_tree is usually slower because you have to read N
1260
# files (no readahead, lots of seeks, etc), but allow the user to
1261
# explicitly request it
1196
if (accelerator_tree is not None and
1197
accelerator_tree.supports_content_filtering()):
1262
1198
accelerator_tree = None
1263
if files_from is not None and files_from != from_location:
1264
accelerator_tree = WorkingTree.open(files_from)
1265
1199
revision = _get_one_revision('branch', revision)
1266
self.add_cleanup(br_from.lock_read().unlock)
1267
if revision is not None:
1268
revision_id = revision.as_revision_id(br_from)
1270
# FIXME - wt.last_revision, fallback to branch, fall back to
1271
# None or perhaps NULL_REVISION to mean copy nothing
1273
revision_id = br_from.last_revision()
1274
if to_location is None:
1275
to_location = urlutils.derive_to_location(from_location)
1276
to_transport = transport.get_transport(to_location)
1278
to_transport.mkdir('.')
1279
except errors.FileExists:
1280
if not use_existing_dir:
1281
raise errors.BzrCommandError('Target directory "%s" '
1282
'already exists.' % to_location)
1202
if revision is not None:
1203
revision_id = revision.as_revision_id(br_from)
1285
bzrdir.BzrDir.open_from_transport(to_transport)
1286
except errors.NotBranchError:
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)
1289
raise errors.AlreadyBranchError(to_location)
1290
except errors.NoSuchFile:
1291
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1294
# preserve whatever source format we have.
1295
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1296
possible_transports=[to_transport],
1297
accelerator_tree=accelerator_tree,
1298
hardlink=hardlink, stacked=stacked,
1299
force_new_repo=standalone,
1300
create_tree_if_local=not no_tree,
1301
source_branch=br_from)
1302
branch = dir.open_branch()
1303
except errors.NoSuchRevision:
1304
to_transport.delete_tree('.')
1305
msg = "The branch %s has no revision %s." % (from_location,
1307
raise errors.BzrCommandError(msg)
1308
_merge_tags_if_possible(br_from, branch)
1309
# If the source branch is stacked, the new branch may
1310
# be stacked whether we asked for that explicitly or not.
1311
# We therefore need a try/except here and not just 'if stacked:'
1313
note('Created new stacked branch referring to %s.' %
1314
branch.get_stacked_on_url())
1315
except (errors.NotStacked, errors.UnstackableBranchFormat,
1316
errors.UnstackableRepositoryFormat), e:
1317
note('Branched %d revision(s).' % branch.revno())
1319
# Bind to the parent
1320
parent_branch = Branch.open(from_location)
1321
branch.bind(parent_branch)
1322
note('New branch bound to %s' % from_location)
1324
# Switch to the new branch
1325
wt, _ = WorkingTree.open_containing('.')
1326
_mod_switch.switch(wt.bzrdir, branch)
1327
note('Switched to branch: %s',
1328
urlutils.unescape_for_display(branch.base, 'utf-8'))
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())
1331
1257
class cmd_checkout(Command):
1332
__doc__ = """Create a new checkout of an existing branch.
1258
"""Create a new checkout of an existing branch.
1334
1260
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1335
1261
the branch found in '.'. This is useful if you have removed the working tree
1414
1335
@display_command
1415
1336
def run(self, dir=u'.'):
1416
1337
tree = WorkingTree.open_containing(dir)[0]
1417
self.add_cleanup(tree.lock_read().unlock)
1418
new_inv = tree.inventory
1419
old_tree = tree.basis_tree()
1420
self.add_cleanup(old_tree.lock_read().unlock)
1421
old_inv = old_tree.inventory
1423
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1424
for f, paths, c, v, p, n, k, e in iterator:
1425
if paths[0] == paths[1]:
1429
renames.append(paths)
1431
for old_name, new_name in renames:
1432
self.outf.write("%s => %s\n" % (old_name, new_name))
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))
1435
1362
class cmd_update(Command):
1436
__doc__ = """Update a tree to have the latest code committed to its branch.
1363
"""Update a tree to have the latest code committed to its branch.
1438
1365
This will perform a merge into the working tree, and may generate
1439
1366
conflicts. If you have any local changes, you will still
1442
1369
If you want to discard your local changes, you can just do a
1443
1370
'bzr revert' instead of 'bzr commit' after the update.
1445
If you want to restore a file that has been removed locally, use
1446
'bzr revert' instead of 'bzr update'.
1448
If the tree's branch is bound to a master branch, it will also update
1449
the branch from the master.
1452
1373
_see_also = ['pull', 'working-trees', 'status-flags']
1453
1374
takes_args = ['dir?']
1454
takes_options = ['revision',
1456
help="Show base revision text in conflicts."),
1458
1375
aliases = ['up']
1460
def run(self, dir='.', revision=None, show_base=None):
1461
if revision is not None and len(revision) != 1:
1462
raise errors.BzrCommandError(
1463
"bzr update --revision takes exactly one revision")
1377
def run(self, dir='.'):
1464
1378
tree = WorkingTree.open_containing(dir)[0]
1465
branch = tree.branch
1466
1379
possible_transports = []
1467
master = branch.get_master_branch(
1380
master = tree.branch.get_master_branch(
1468
1381
possible_transports=possible_transports)
1469
1382
if master is not None:
1470
branch_location = master.base
1471
1383
tree.lock_write()
1473
branch_location = tree.branch.base
1474
1385
tree.lock_tree_write()
1475
self.add_cleanup(tree.unlock)
1476
# get rid of the final '/' and be ready for display
1477
branch_location = urlutils.unescape_for_display(
1478
branch_location.rstrip('/'),
1480
existing_pending_merges = tree.get_parent_ids()[1:]
1484
# may need to fetch data into a heavyweight checkout
1485
# XXX: this may take some time, maybe we should display a
1487
old_tip = branch.update(possible_transports)
1488
if revision is not None:
1489
revision_id = revision[0].as_revision_id(branch)
1491
revision_id = branch.last_revision()
1492
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1493
revno = branch.revision_id_to_dotted_revno(revision_id)
1494
note("Tree is up to date at revision %s of branch %s" %
1495
('.'.join(map(str, revno)), branch_location))
1497
view_info = _get_view_info_for_change_reporter(tree)
1498
change_reporter = delta._ChangeReporter(
1499
unversioned_filter=tree.is_ignored,
1500
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)
1502
1398
conflicts = tree.update(
1504
possible_transports=possible_transports,
1505
revision=revision_id,
1507
show_base=show_base)
1508
except errors.NoSuchRevision, e:
1509
raise errors.BzrCommandError(
1510
"branch has no revision %s\n"
1511
"bzr update --revision only works"
1512
" for a revision in the branch history"
1514
revno = tree.branch.revision_id_to_dotted_revno(
1515
_mod_revision.ensure_null(tree.last_revision()))
1516
note('Updated to revision %s of branch %s' %
1517
('.'.join(map(str, revno)), branch_location))
1518
parent_ids = tree.get_parent_ids()
1519
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1520
note('Your local commits will now show as pending merges with '
1521
"'bzr status', and can be committed with 'bzr commit'.")
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'.")
1528
1415
class cmd_info(Command):
1529
__doc__ = """Show information about a working tree, branch or repository.
1416
"""Show information about a working tree, branch or repository.
1531
1418
This command will show all known locations and formats associated to the
1532
1419
tree, branch or repository.
1584
1470
RegistryOption.from_kwargs('file-deletion-strategy',
1585
1471
'The file deletion mode to be used.',
1586
1472
title='Deletion Strategy', value_switches=True, enum_switch=False,
1587
safe='Backup changed files (default).',
1473
safe='Only delete files if they can be'
1474
' safely recovered (default).',
1588
1475
keep='Delete from bzr but leave the working copy.',
1589
no_backup='Don\'t backup changed files.',
1590
1476
force='Delete all the specified files, even if they can not be '
1591
'recovered and even if they are non-empty directories. '
1592
'(deprecated, use no-backup)')]
1477
'recovered and even if they are non-empty directories.')]
1593
1478
aliases = ['rm', 'del']
1594
1479
encoding_type = 'replace'
1596
1481
def run(self, file_list, verbose=False, new=False,
1597
1482
file_deletion_strategy='safe'):
1598
if file_deletion_strategy == 'force':
1599
note("(The --force option is deprecated, rather use --no-backup "
1601
file_deletion_strategy = 'no-backup'
1603
tree, file_list = WorkingTree.open_containing_paths(file_list)
1483
tree, file_list = tree_files(file_list)
1605
1485
if file_list is not None:
1606
1486
file_list = [f for f in file_list]
1608
self.add_cleanup(tree.lock_write().unlock)
1609
# Heuristics should probably all move into tree.remove_smart or
1612
added = tree.changes_from(tree.basis_tree(),
1613
specific_files=file_list).added
1614
file_list = sorted([f[0] for f in added], reverse=True)
1615
if len(file_list) == 0:
1616
raise errors.BzrCommandError('No matching files.')
1617
elif file_list is None:
1618
# missing files show up in iter_changes(basis) as
1619
# versioned-with-no-kind.
1621
for change in tree.iter_changes(tree.basis_tree()):
1622
# Find paths in the working tree that have no kind:
1623
if change[1][1] is not None and change[6][1] is None:
1624
missing.append(change[1][1])
1625
file_list = sorted(missing, reverse=True)
1626
file_deletion_strategy = 'keep'
1627
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1628
keep_files=file_deletion_strategy=='keep',
1629
force=(file_deletion_strategy=='no-backup'))
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')
1632
1515
class cmd_file_id(Command):
1633
__doc__ = """Print file_id of a particular file or directory.
1516
"""Print file_id of a particular file or directory.
1635
1518
The file_id is assigned when the file is first added and remains the
1636
1519
same through all revisions where the file exists, even when it is
2071
1894
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2072
1895
' one or two revision specifiers')
2074
if using is not None and format is not None:
2075
raise errors.BzrCommandError('--using and --format are mutually '
2078
(old_tree, new_tree,
2079
old_branch, new_branch,
2080
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2081
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2082
# GNU diff on Windows uses ANSI encoding for filenames
2083
path_encoding = osutils.get_diff_header_encoding()
1897
old_tree, new_tree, specific_files, extra_trees = \
1898
_get_trees_to_diff(file_list, revision, old, new,
2084
1900
return show_diff_trees(old_tree, new_tree, sys.stdout,
2085
1901
specific_files=specific_files,
2086
1902
external_diff_options=diff_options,
2087
1903
old_label=old_label, new_label=new_label,
2088
extra_trees=extra_trees,
2089
path_encoding=path_encoding,
1904
extra_trees=extra_trees, using=using)
2094
1907
class cmd_deleted(Command):
2095
__doc__ = """List files deleted in the working tree.
1908
"""List files deleted in the working tree.
2097
1910
# TODO: Show files deleted since a previous revision, or
2098
1911
# between two revisions.
2101
1914
# level of effort but possibly much less IO. (Or possibly not,
2102
1915
# if the directories are very large...)
2103
1916
_see_also = ['status', 'ls']
2104
takes_options = ['directory', 'show-ids']
1917
takes_options = ['show-ids']
2106
1919
@display_command
2107
def run(self, show_ids=False, directory=u'.'):
2108
tree = WorkingTree.open_containing(directory)[0]
2109
self.add_cleanup(tree.lock_read().unlock)
2110
old = tree.basis_tree()
2111
self.add_cleanup(old.lock_read().unlock)
2112
for path, ie in old.inventory.iter_entries():
2113
if not tree.has_id(ie.file_id):
2114
self.outf.write(path)
2116
self.outf.write(' ')
2117
self.outf.write(ie.file_id)
2118
self.outf.write('\n')
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')
2121
1940
class cmd_modified(Command):
2122
__doc__ = """List files modified in working tree.
1941
"""List files modified in working tree.
2126
1945
_see_also = ['status', 'ls']
2127
takes_options = ['directory', 'null']
1948
help='Write an ascii NUL (\\0) separator '
1949
'between files rather than a newline.')
2129
1952
@display_command
2130
def run(self, null=False, directory=u'.'):
2131
tree = WorkingTree.open_containing(directory)[0]
2132
self.add_cleanup(tree.lock_read().unlock)
1953
def run(self, null=False):
1954
tree = WorkingTree.open_containing(u'.')[0]
2133
1955
td = tree.changes_from(tree.basis_tree())
2135
1956
for path, id, kind, text_modified, meta_modified in td.modified:
2137
1958
self.outf.write(path + '\0')
2142
1963
class cmd_added(Command):
2143
__doc__ = """List files added in working tree.
1964
"""List files added in working tree.
2147
1968
_see_also = ['status', 'ls']
2148
takes_options = ['directory', 'null']
1971
help='Write an ascii NUL (\\0) separator '
1972
'between files rather than a newline.')
2150
1975
@display_command
2151
def run(self, null=False, directory=u'.'):
2152
wt = WorkingTree.open_containing(directory)[0]
2153
self.add_cleanup(wt.lock_read().unlock)
2154
basis = wt.basis_tree()
2155
self.add_cleanup(basis.lock_read().unlock)
2156
basis_inv = basis.inventory
2159
if basis_inv.has_id(file_id):
2161
if inv.is_root(file_id) and len(basis_inv) == 0:
2163
path = inv.id2path(file_id)
2164
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2167
self.outf.write(path + '\0')
2169
self.outf.write(osutils.quotefn(path) + '\n')
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')
2172
2003
class cmd_root(Command):
2173
__doc__ = """Show the tree root directory.
2004
"""Show the tree root directory.
2175
2006
The root is the nearest enclosing directory with a .bzr control
2497
2304
diff_type = 'full'
2499
# Build the log formatter
2500
if log_format is None:
2501
log_format = log.log_formatter_registry.get_default(b)
2502
# Make a non-encoding output to include the diffs - bug 328007
2503
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2504
lf = log_format(show_ids=show_ids, to_file=self.outf,
2505
to_exact_file=unencoded_output,
2506
show_timezone=timezone,
2507
delta_format=get_verbosity_level(),
2509
show_advice=levels is None,
2510
author_list_handler=authors)
2512
# Choose the algorithm for doing the logging. It's annoying
2513
# having multiple code paths like this but necessary until
2514
# the underlying repository format is faster at generating
2515
# deltas or can provide everything we need from the indices.
2516
# The default algorithm - match-using-deltas - works for
2517
# multiple files and directories and is faster for small
2518
# amounts of history (200 revisions say). However, it's too
2519
# slow for logging a single file in a repository with deep
2520
# history, i.e. > 10K revisions. In the spirit of "do no
2521
# evil when adding features", we continue to use the
2522
# original algorithm - per-file-graph - for the "single
2523
# file that isn't a directory without showing a delta" case.
2524
partial_history = revision and b.repository._format.supports_chks
2525
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2526
or delta_type or partial_history)
2528
# Build the LogRequest and execute it
2529
if len(file_ids) == 0:
2531
rqst = make_log_request_dict(
2532
direction=direction, specific_fileids=file_ids,
2533
start_revision=rev1, end_revision=rev2, limit=limit,
2534
message_search=message, delta_type=delta_type,
2535
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2536
exclude_common_ancestry=exclude_common_ancestry,
2537
signature=signatures
2539
Logger(b, rqst).show(lf)
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)
2542
2346
def _get_revision_range(revisionspec_list, branch, command_name):
2631
2429
help='Recurse into subdirectories.'),
2632
2430
Option('from-root',
2633
2431
help='Print paths relative to the root of the branch.'),
2634
Option('unknown', short_name='u',
2635
help='Print unknown files.'),
2432
Option('unknown', help='Print unknown files.'),
2636
2433
Option('versioned', help='Print versioned files.',
2637
2434
short_name='V'),
2638
Option('ignored', short_name='i',
2639
help='Print ignored files.'),
2640
Option('kind', short_name='k',
2435
Option('ignored', help='Print ignored files.'),
2437
help='Write an ascii NUL (\\0) separator '
2438
'between files rather than a newline.'),
2641
2440
help='List entries of a particular kind: file, directory, symlink.',
2647
2444
@display_command
2648
2445
def run(self, revision=None, verbose=False,
2649
2446
recursive=False, from_root=False,
2650
2447
unknown=False, versioned=False, ignored=False,
2651
null=False, kind=None, show_ids=False, path=None, directory=None):
2448
null=False, kind=None, show_ids=False, path=None):
2653
2450
if kind and kind not in ('file', 'directory', 'symlink'):
2654
2451
raise errors.BzrCommandError('invalid kind specified')
2688
2485
view_str = views.view_display_str(view_files)
2689
2486
note("Ignoring files outside view. View is %s" % view_str)
2691
self.add_cleanup(tree.lock_read().unlock)
2692
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2693
from_dir=relpath, recursive=recursive):
2694
# Apply additional masking
2695
if not all and not selection[fc]:
2697
if kind is not None and fkind != kind:
2702
fullpath = osutils.pathjoin(relpath, fp)
2705
views.check_path_in_view(tree, fullpath)
2706
except errors.FileOutsideView:
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:
2711
fp = osutils.pathjoin(prefix, fp)
2712
kindch = entry.kind_character()
2713
outstring = fp + kindch
2714
ui.ui_factory.clear_term()
2716
outstring = '%-8s %s' % (fc, outstring)
2717
if show_ids and fid is not None:
2718
outstring = "%-50s %s" % (outstring, fid)
2719
self.outf.write(outstring + '\n')
2721
self.outf.write(fp + '\0')
2724
self.outf.write(fid)
2725
self.outf.write('\0')
2733
self.outf.write('%-50s %s\n' % (outstring, my_id))
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)
2735
2517
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')
2738
2538
class cmd_unknowns(Command):
2739
__doc__ = """List unknown files.
2539
"""List unknown files.
2743
2543
_see_also = ['ls']
2744
takes_options = ['directory']
2746
2545
@display_command
2747
def run(self, directory=u'.'):
2748
for f in WorkingTree.open_containing(directory)[0].unknowns():
2547
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2749
2548
self.outf.write(osutils.quotefn(f) + '\n')
2752
2551
class cmd_ignore(Command):
2753
__doc__ = """Ignore specified files or patterns.
2552
"""Ignore specified files or patterns.
2755
2554
See ``bzr help patterns`` for details on the syntax of patterns.
2757
If a .bzrignore file does not exist, the ignore command
2758
will create one and add the specified files or patterns to the newly
2759
created file. The ignore command will also automatically add the
2760
.bzrignore file to be versioned. Creating a .bzrignore file without
2761
the use of the ignore command will require an explicit add command.
2763
2556
To remove patterns from the ignore list, edit the .bzrignore file.
2764
2557
After adding, editing or deleting that file either indirectly by
2765
2558
using this command or directly by using an editor, be sure to commit
2768
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2769
the global ignore file can be found in the application data directory as
2770
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2771
Global ignores are not touched by this command. The global ignore file
2772
can be edited directly using an editor.
2774
Patterns prefixed with '!' are exceptions to ignore patterns and take
2775
precedence over regular ignores. Such exceptions are used to specify
2776
files that should be versioned which would otherwise be ignored.
2778
Patterns prefixed with '!!' act as regular ignore patterns, but have
2779
precedence over the '!' exception patterns.
2783
* Ignore patterns containing shell wildcards must be quoted from
2786
* Ignore patterns starting with "#" act as comments in the ignore file.
2787
To ignore patterns that begin with that character, use the "RE:" prefix.
2561
Note: ignore patterns containing shell wildcards must be quoted from
2790
2565
Ignore the top level Makefile::
2792
2567
bzr ignore ./Makefile
2794
Ignore .class files in all directories...::
2569
Ignore class files in all directories::
2796
2571
bzr ignore "*.class"
2798
...but do not ignore "special.class"::
2800
bzr ignore "!special.class"
2802
Ignore files whose name begins with the "#" character::
2806
2573
Ignore .o files under the lib directory::
2808
2575
bzr ignore "lib/**/*.o"
2814
2581
Ignore everything but the "debian" toplevel directory::
2816
2583
bzr ignore "RE:(?!debian/).*"
2818
Ignore everything except the "local" toplevel directory,
2819
but always ignore autosave files ending in ~, even under local/::
2822
bzr ignore "!./local"
2826
2586
_see_also = ['status', 'ignored', 'patterns']
2827
2587
takes_args = ['name_pattern*']
2828
takes_options = ['directory',
2829
Option('default-rules',
2830
help='Display the default ignore rules that bzr uses.')
2589
Option('old-default-rules',
2590
help='Write out the ignore rules bzr < 0.9 always used.')
2833
def run(self, name_pattern_list=None, default_rules=None,
2593
def run(self, name_pattern_list=None, old_default_rules=None):
2835
2594
from bzrlib import ignores
2836
if default_rules is not None:
2837
# dump the default rules and exit
2838
for pattern in ignores.USER_DEFAULTS:
2839
self.outf.write("%s\n" % pattern)
2595
if old_default_rules is not None:
2596
# dump the rules and exit
2597
for pattern in ignores.OLD_DEFAULTS:
2841
2600
if not name_pattern_list:
2842
2601
raise errors.BzrCommandError("ignore requires at least one "
2843
"NAME_PATTERN or --default-rules.")
2602
"NAME_PATTERN or --old-default-rules")
2844
2603
name_pattern_list = [globbing.normalize_pattern(p)
2845
2604
for p in name_pattern_list]
2847
for p in name_pattern_list:
2848
if not globbing.Globster.is_pattern_valid(p):
2849
bad_patterns += ('\n %s' % p)
2851
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2852
ui.ui_factory.show_error(msg)
2853
raise errors.InvalidPattern('')
2854
2605
for name_pattern in name_pattern_list:
2855
2606
if (name_pattern[0] == '/' or
2856
2607
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2857
2608
raise errors.BzrCommandError(
2858
2609
"NAME_PATTERN should not be an absolute path")
2859
tree, relpath = WorkingTree.open_containing(directory)
2610
tree, relpath = WorkingTree.open_containing(u'.')
2860
2611
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2861
2612
ignored = globbing.Globster(name_pattern_list)
2863
self.add_cleanup(tree.lock_read().unlock)
2864
2615
for entry in tree.list_files():
2866
2617
if id is not None:
2867
2618
filename = entry[0]
2868
2619
if ignored.match(filename):
2869
matches.append(filename)
2620
matches.append(filename.encode('utf-8'))
2870
2622
if len(matches) > 0:
2871
self.outf.write("Warning: the following files are version controlled and"
2872
" match your ignore pattern:\n%s"
2873
"\nThese files will continue to be version controlled"
2874
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
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),)
2877
2629
class cmd_ignored(Command):
2878
__doc__ = """List ignored files and the patterns that matched them.
2630
"""List ignored files and the patterns that matched them.
2880
2632
List all the ignored files and the ignore pattern that caused the file to
2888
2640
encoding_type = 'replace'
2889
2641
_see_also = ['ignore', 'ls']
2890
takes_options = ['directory']
2892
2643
@display_command
2893
def run(self, directory=u'.'):
2894
tree = WorkingTree.open_containing(directory)[0]
2895
self.add_cleanup(tree.lock_read().unlock)
2896
for path, file_class, kind, file_id, entry in tree.list_files():
2897
if file_class != 'I':
2899
## XXX: Slightly inefficient since this was already calculated
2900
pat = tree.is_ignored(path)
2901
self.outf.write('%-50s %s\n' % (path, pat))
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))
2904
2658
class cmd_lookup_revision(Command):
2905
__doc__ = """Lookup the revision-id from a revision-number
2659
"""Lookup the revision-id from a revision-number
2908
2662
bzr lookup-revision 33
2911
2665
takes_args = ['revno']
2912
takes_options = ['directory']
2914
2667
@display_command
2915
def run(self, revno, directory=u'.'):
2668
def run(self, revno):
2917
2670
revno = int(revno)
2918
2671
except ValueError:
2919
raise errors.BzrCommandError("not a valid revision-number: %r"
2921
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2922
self.outf.write("%s\n" % revid)
2672
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2674
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2925
2677
class cmd_export(Command):
2926
__doc__ = """Export current or past revision to a destination directory or archive.
2678
"""Export current or past revision to a destination directory or archive.
2928
2680
If no revision is specified this exports the last committed revision.
3008
2755
@display_command
3009
2756
def run(self, filename, revision=None, name_from_revision=False,
3010
filters=False, directory=None):
3011
2758
if revision is not None and len(revision) != 1:
3012
2759
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3013
2760
" one revision specifier")
3014
2761
tree, branch, relpath = \
3015
_open_directory_or_containing_tree_or_branch(filename, directory)
3016
self.add_cleanup(branch.lock_read().unlock)
3017
return self._run(tree, branch, relpath, filename, revision,
3018
name_from_revision, filters)
2762
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2765
return self._run(tree, branch, relpath, filename, revision,
2766
name_from_revision, filters)
3020
2770
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3022
2772
if tree is None:
3023
2773
tree = b.basis_tree()
3024
2774
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3025
self.add_cleanup(rev_tree.lock_read().unlock)
3027
2776
old_file_id = rev_tree.path2id(relpath)
3134
2881
to trigger updates to external systems like bug trackers. The --fixes
3135
2882
option can be used to record the association between a revision and
3136
2883
one or more bugs. See ``bzr help bugs`` for details.
2885
A selective commit may fail in some cases where the committed
2886
tree would be invalid. Consider::
2891
bzr commit foo -m "committing foo"
2892
bzr mv foo/bar foo/baz
2895
bzr commit foo/bar -m "committing bar but not baz"
2897
In the example above, the last commit will fail by design. This gives
2898
the user the opportunity to decide whether they want to commit the
2899
rename at the same time, separately first, or not at all. (As a general
2900
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2902
# TODO: Run hooks on tree to-be-committed, and after commit.
2904
# TODO: Strict commit that fails if there are deleted files.
2905
# (what does "deleted files" mean ??)
2907
# TODO: Give better message for -s, --summary, used by tla people
2909
# XXX: verbose currently does nothing
3139
2911
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3140
2912
takes_args = ['selected*']
3241
3002
if local and not tree.branch.get_bound_location():
3242
3003
raise errors.LocalRequiresBoundBranch()
3244
if message is not None:
3246
file_exists = osutils.lexists(message)
3247
except UnicodeError:
3248
# The commit message contains unicode characters that can't be
3249
# represented in the filesystem encoding, so that can't be a
3254
'The commit message is a file name: "%(f)s".\n'
3255
'(use --file "%(f)s" to take commit message from that file)'
3257
ui.ui_factory.show_warning(warning_msg)
3259
message = message.replace('\r\n', '\n')
3260
message = message.replace('\r', '\n')
3262
raise errors.BzrCommandError(
3263
"please specify either --message or --file")
3265
3005
def get_message(commit_obj):
3266
3006
"""Callback to get commit message"""
3270
my_message = f.read().decode(osutils.get_user_encoding())
3273
elif message is not None:
3274
my_message = message
3276
# No message supplied: make one up.
3277
# text is the status of the tree
3278
text = make_commit_message_template_encoded(tree,
3007
my_message = message
3008
if my_message is None and not file:
3009
t = make_commit_message_template_encoded(tree,
3279
3010
selected_list, diff=show_diff,
3280
3011
output_encoding=osutils.get_user_encoding())
3281
# start_message is the template generated from hooks
3282
# XXX: Warning - looks like hooks return unicode,
3283
# make_commit_message_template_encoded returns user encoding.
3284
# We probably want to be using edit_commit_message instead to
3286
my_message = set_commit_message(commit_obj)
3287
if my_message is None:
3288
start_message = generate_commit_message_template(commit_obj)
3289
my_message = edit_commit_message_encoded(text,
3290
start_message=start_message)
3012
start_message = generate_commit_message_template(commit_obj)
3013
my_message = edit_commit_message_encoded(t,
3014
start_message=start_message)
3291
3015
if my_message is None:
3292
3016
raise errors.BzrCommandError("please specify a commit"
3293
3017
" 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()
3294
3024
if my_message == "":
3295
3025
raise errors.BzrCommandError("empty commit message specified")
3296
3026
return my_message
3298
# The API permits a commit with a filter of [] to mean 'select nothing'
3299
# but the command line should not do that.
3300
if not selected_list:
3301
selected_list = None
3303
3029
tree.commit(message_callback=get_message,
3304
3030
specific_files=selected_list,
3305
3031
allow_pointless=unchanged, strict=strict, local=local,
3306
3032
reporter=None, verbose=verbose, revprops=properties,
3307
authors=author, timestamp=commit_stamp,
3309
exclude=tree.safe_relpath_files(exclude),
3034
exclude=safe_relpath_files(tree, exclude))
3311
3035
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
3312
3038
raise errors.BzrCommandError("No changes to commit."
3313
" Please 'bzr add' the files you want to commit, or use"
3314
" --unchanged to force an empty commit.")
3039
" Use --unchanged to commit anyhow.")
3315
3040
except ConflictsInTree:
3316
3041
raise errors.BzrCommandError('Conflicts detected in working '
3317
3042
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3400
3124
class cmd_upgrade(Command):
3401
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3403
When the default format has changed after a major new release of
3404
Bazaar, you may be informed during certain operations that you
3405
should upgrade. Upgrading to a newer format may improve performance
3406
or make new features available. It may however limit interoperability
3407
with older repositories or with older versions of Bazaar.
3409
If you wish to upgrade to a particular format rather than the
3410
current default, that can be specified using the --format option.
3411
As a consequence, you can use the upgrade command this way to
3412
"downgrade" to an earlier format, though some conversions are
3413
a one way process (e.g. changing from the 1.x default to the
3414
2.x default) so downgrading is not always possible.
3416
A backup.bzr.~#~ directory is created at the start of the conversion
3417
process (where # is a number). By default, this is left there on
3418
completion. If the conversion fails, delete the new .bzr directory
3419
and rename this one back in its place. Use the --clean option to ask
3420
for the backup.bzr directory to be removed on successful conversion.
3421
Alternatively, you can delete it by hand if everything looks good
3424
If the location given is a shared repository, dependent branches
3425
are also converted provided the repository converts successfully.
3426
If the conversion of a branch fails, remaining branches are still
3429
For more information on upgrades, see the Bazaar Upgrade Guide,
3430
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
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.
3433
_see_also = ['check', 'reconcile', 'formats']
3132
_see_also = ['check']
3434
3133
takes_args = ['url?']
3435
3134
takes_options = [
3436
RegistryOption('format',
3437
help='Upgrade to a specific format. See "bzr help'
3438
' formats" for details.',
3439
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3440
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3441
value_switches=True, title='Branch format'),
3443
help='Remove the backup.bzr directory if successful.'),
3445
help="Show what would be done, but don't actually do anything."),
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'),
3448
def run(self, url='.', format=None, clean=False, dry_run=False):
3143
def run(self, url='.', format=None):
3449
3144
from bzrlib.upgrade import upgrade
3450
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3452
if len(exceptions) == 1:
3453
# Compatibility with historical behavior
3145
upgrade(url, format)
3459
3148
class cmd_whoami(Command):
3460
__doc__ = """Show or set bzr user id.
3149
"""Show or set bzr user id.
3463
3152
Show the email of the current user::
3479
3167
encoding_type = 'replace'
3481
3169
@display_command
3482
def run(self, email=False, branch=False, name=None, directory=None):
3170
def run(self, email=False, branch=False, name=None):
3483
3171
if name is None:
3484
if directory is None:
3485
# use branch if we're inside one; otherwise global config
3487
c = Branch.open_containing(u'.')[0].get_config()
3488
except errors.NotBranchError:
3489
c = _mod_config.GlobalConfig()
3491
c = Branch.open(directory).get_config()
3172
# use branch if we're inside one; otherwise global config
3174
c = Branch.open_containing('.')[0].get_config()
3175
except errors.NotBranchError:
3176
c = config.GlobalConfig()
3493
3178
self.outf.write(c.user_email() + '\n')
3495
3180
self.outf.write(c.username() + '\n')
3499
raise errors.BzrCommandError("--email can only be used to display existing "
3502
3183
# display a warning if an email address isn't included in the given name.
3504
_mod_config.extract_email_address(name)
3185
config.extract_email_address(name)
3505
3186
except errors.NoEmailInUsername, e:
3506
3187
warning('"%s" does not seem to contain an email address. '
3507
3188
'This is allowed, but not recommended.', name)
3509
3190
# use global config unless --branch given
3511
if directory is None:
3512
c = Branch.open_containing(u'.')[0].get_config()
3514
c = Branch.open(directory).get_config()
3192
c = Branch.open_containing('.')[0].get_config()
3516
c = _mod_config.GlobalConfig()
3194
c = config.GlobalConfig()
3517
3195
c.set_user_option('email', name)
3520
3198
class cmd_nick(Command):
3521
__doc__ = """Print or set the branch nickname.
3199
"""Print or set the branch nickname.
3523
3201
If unset, the tree root directory name is used as the nickname.
3524
3202
To print the current nickname, execute with no argument.
3737
3408
def run(self, testspecs_list=None, verbose=False, one=False,
3738
3409
transport=None, benchmark=None,
3410
lsprof_timed=None, cache_dir=None,
3740
3411
first=False, list_only=False,
3741
3412
randomize=None, exclude=None, strict=False,
3742
3413
load_list=None, debugflag=None, starting_with=None, subunit=False,
3743
parallel=None, lsprof_tests=False):
3744
from bzrlib import tests
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)
3746
3424
if testspecs_list is not None:
3747
3425
pattern = '|'.join(testspecs_list)
3754
3432
raise errors.BzrCommandError("subunit not available. subunit "
3755
3433
"needs to be installed to use --subunit.")
3756
3434
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3757
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3758
# stdout, which would corrupt the subunit stream.
3759
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3760
# following code can be deleted when it's sufficiently deployed
3761
# -- vila/mgz 20100514
3762
if (sys.platform == "win32"
3763
and getattr(sys.stdout, 'fileno', None) is not None):
3765
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3767
3436
self.additional_selftest_args.setdefault(
3768
3437
'suite_decorators', []).append(parallel)
3770
raise errors.BzrCommandError(
3771
"--benchmark is no longer supported from bzr 2.2; "
3772
"use bzr-usertest instead")
3773
test_suite_factory = None
3775
exclude_pattern = None
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)
3777
exclude_pattern = '(' + '|'.join(exclude) + ')'
3778
selftest_kwargs = {"verbose": verbose,
3780
"stop_on_failure": one,
3781
"transport": transport,
3782
"test_suite_factory": test_suite_factory,
3783
"lsprof_timed": lsprof_timed,
3784
"lsprof_tests": lsprof_tests,
3785
"matching_tests_first": first,
3786
"list_only": list_only,
3787
"random_seed": randomize,
3788
"exclude_pattern": exclude_pattern,
3790
"load_list": load_list,
3791
"debug_flags": debugflag,
3792
"starting_with": starting_with
3794
selftest_kwargs.update(self.additional_selftest_args)
3796
# Make deprecation warnings visible, unless -Werror is set
3797
cleanup = symbol_versioning.activate_deprecation_warnings(
3445
test_suite_factory = None
3800
result = tests.selftest(**selftest_kwargs)
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)
3467
if benchfile is not None:
3803
3469
return int(not result)
3806
3472
class cmd_version(Command):
3807
__doc__ = """Show version of bzr."""
3473
"""Show version of bzr."""
3809
3475
encoding_type = 'replace'
3810
3476
takes_options = [
3844
3510
branch1 = Branch.open_containing(branch)[0]
3845
3511
branch2 = Branch.open_containing(other)[0]
3846
self.add_cleanup(branch1.lock_read().unlock)
3847
self.add_cleanup(branch2.lock_read().unlock)
3848
last1 = ensure_null(branch1.last_revision())
3849
last2 = ensure_null(branch2.last_revision())
3851
graph = branch1.repository.get_graph(branch2.repository)
3852
base_rev_id = graph.find_unique_lca(last1, last2)
3854
self.outf.write('merge base is revision %s\n' % base_rev_id)
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
3857
3529
class cmd_merge(Command):
3858
__doc__ = """Perform a three-way merge.
3530
"""Perform a three-way merge.
3860
3532
The source of the merge can be specified either in the form of a branch,
3861
3533
or in the form of a path to a file containing a merge directive generated
3862
3534
with bzr send. If neither is specified, the default is the upstream branch
3863
or the branch most recently merged using --remember. The source of the
3864
merge may also be specified in the form of a path to a file in another
3865
branch: in this case, only the modifications to that file are merged into
3866
the current working tree.
3868
When merging from a branch, by default bzr will try to merge in all new
3869
work from the other branch, automatically determining an appropriate base
3870
revision. If this fails, you may need to give an explicit base.
3872
To pick a different ending revision, pass "--revision OTHER". bzr will
3873
try to merge in all new work up to and including revision OTHER.
3875
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3876
through OTHER, excluding BASE but including OTHER, will be merged. If this
3877
causes some revisions to be skipped, i.e. if the destination branch does
3878
not already contain revision BASE, such a merge is commonly referred to as
3879
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3880
cherrypicks. The changes look like a normal commit, and the history of the
3881
changes from the other branch is not stored in the commit.
3883
Revision numbers are always relative to the source branch.
3535
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.
3885
3548
Merge will do its best to combine the changes in two branches, but there
3886
3549
are some kinds of problems only a human can fix. When it encounters those,
3890
3553
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3892
If there is no default branch set, the first merge will set it (use
3893
--no-remember to avoid settting it). After that, you can omit the branch
3894
to use the default. To change the default, use --remember. The value will
3895
only be saved if the remote location can be accessed.
3555
If there is no default branch set, the first merge will set it. After
3556
that, you can omit the branch to use the default. To change the
3557
default, use --remember. The value will only be saved if the remote
3558
location can be accessed.
3897
3560
The results of the merge are placed into the destination working
3898
3561
directory, where they can be reviewed (with bzr diff), tested, and then
3899
3562
committed to record the result of the merge.
3901
3564
merge refuses to run if there are any uncommitted changes, unless
3902
--force is given. If --force is given, then the changes from the source
3903
will be merged with the current working tree, including any uncommitted
3904
changes in the tree. The --force option can also be used to create a
3905
merge revision which has more than two parents.
3907
If one would like to merge changes from the working tree of the other
3908
branch without merging any committed revisions, the --uncommitted option
3911
3567
To select only some changes to merge, use "merge -i", which will prompt
3912
3568
you to apply each diff hunk and file change, similar to "shelve".
3915
To merge all new revisions from bzr.dev::
3571
To merge the latest revision from bzr.dev::
3917
3573
bzr merge ../bzr.dev
3980
3632
allow_pending = True
3981
3633
verified = 'inapplicable'
3983
3634
tree = WorkingTree.open_containing(directory)[0]
3984
if tree.branch.revno() == 0:
3985
raise errors.BzrCommandError('Merging into empty branches not currently supported, '
3986
'https://bugs.launchpad.net/bzr/+bug/308562')
3636
# die as quickly as possible if there are uncommitted changes
3989
3638
basis_tree = tree.revision_tree(tree.last_revision())
3990
3639
except errors.NoSuchRevision:
3991
3640
basis_tree = tree.basis_tree()
3993
# die as quickly as possible if there are uncommitted changes
3995
if tree.has_changes():
3642
if tree.has_changes(basis_tree):
3996
3643
raise errors.UncommittedChanges(tree)
3998
3645
view_info = _get_view_info_for_change_reporter(tree)
3999
3646
change_reporter = delta._ChangeReporter(
4000
3647
unversioned_filter=tree.is_ignored, view_info=view_info)
4001
pb = ui.ui_factory.nested_progress_bar()
4002
self.add_cleanup(pb.finished)
4003
self.add_cleanup(tree.lock_write().unlock)
4004
if location is not None:
4006
mergeable = bundle.read_mergeable_from_url(location,
4007
possible_transports=possible_transports)
4008
except errors.NotABundle:
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.')
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)
4012
raise errors.BzrCommandError('Cannot use --uncommitted'
4013
' with bundles or merge directives.')
4015
if revision is not None:
4016
raise errors.BzrCommandError(
4017
'Cannot use -r with merge directives or bundles')
4018
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4021
if merger is None and uncommitted:
4022
if revision is not None and len(revision) > 0:
4023
raise errors.BzrCommandError('Cannot use --uncommitted and'
4024
' --revision at the same time.')
4025
merger = self.get_merger_from_uncommitted(tree, location, None)
4026
allow_pending = False
4029
merger, allow_pending = self._get_merger_from_branch(tree,
4030
location, revision, remember, possible_transports, None)
4032
merger.merge_type = merge_type
4033
merger.reprocess = reprocess
4034
merger.show_base = show_base
4035
self.sanity_check_merger(merger)
4036
if (merger.base_rev_id == merger.other_rev_id and
4037
merger.other_rev_id is not None):
4038
# check if location is a nonexistent file (and not a branch) to
4039
# disambiguate the 'Nothing to do'
4040
if merger.interesting_files:
4041
if not merger.other_tree.has_filename(
4042
merger.interesting_files[0]):
4043
note("merger: " + str(merger))
4044
raise errors.PathsDoNotExist([location])
4045
note('Nothing to do.')
4047
if pull and not preview:
4048
if merger.interesting_files is not None:
4049
raise errors.BzrCommandError('Cannot pull individual files')
4050
if (merger.base_rev_id == tree.last_revision()):
4051
result = tree.pull(merger.other_branch, False,
4052
merger.other_rev_id)
4053
result.report(self.outf)
4055
if merger.this_basis is None:
4056
raise errors.BzrCommandError(
4057
"This branch has no commits."
4058
" (perhaps you would prefer 'bzr pull')")
4060
return self._do_preview(merger)
4062
return self._do_interactive(merger)
4064
return self._do_merge(merger, change_reporter, allow_pending,
4067
def _get_preview(self, merger):
3705
return self._do_merge(merger, change_reporter, allow_pending,
3708
for cleanup in reversed(cleanups):
3711
def _get_preview(self, merger, cleanups):
4068
3712
tree_merger = merger.make_merger()
4069
3713
tt = tree_merger.make_preview_transform()
4070
self.add_cleanup(tt.finalize)
3714
cleanups.append(tt.finalize)
4071
3715
result_tree = tt.get_preview_tree()
4072
3716
return result_tree
4074
def _do_preview(self, merger):
3718
def _do_preview(self, merger, cleanups):
4075
3719
from bzrlib.diff import show_diff_trees
4076
result_tree = self._get_preview(merger)
4077
path_encoding = osutils.get_diff_header_encoding()
3720
result_tree = self._get_preview(merger, cleanups)
4078
3721
show_diff_trees(merger.this_tree, result_tree, self.outf,
4079
old_label='', new_label='',
4080
path_encoding=path_encoding)
3722
old_label='', new_label='')
4082
3724
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4083
3725
merger.change_reporter = change_reporter
4276
3909
def run(self, file_list=None, merge_type=None, show_base=False,
4277
3910
reprocess=False):
4278
from bzrlib.conflicts import restore
4279
3911
if merge_type is None:
4280
3912
merge_type = _mod_merge.Merge3Merger
4281
tree, file_list = WorkingTree.open_containing_paths(file_list)
4282
self.add_cleanup(tree.lock_write().unlock)
4283
parents = tree.get_parent_ids()
4284
if len(parents) != 2:
4285
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4286
" merges. Not cherrypicking or"
4288
repository = tree.branch.repository
4289
interesting_ids = None
4291
conflicts = tree.conflicts()
4292
if file_list is not None:
4293
interesting_ids = set()
4294
for filename in file_list:
4295
file_id = tree.path2id(filename)
4297
raise errors.NotVersionedError(filename)
4298
interesting_ids.add(file_id)
4299
if tree.kind(file_id) != "directory":
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":
4302
for name, ie in tree.inventory.iter_entries(file_id):
4303
interesting_ids.add(ie.file_id)
4304
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4306
# Remerge only supports resolving contents conflicts
4307
allowed_conflicts = ('text conflict', 'contents conflict')
4308
restore_files = [c.path for c in conflicts
4309
if c.typestring in allowed_conflicts]
4310
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4311
tree.set_conflicts(ConflictList(new_conflicts))
4312
if file_list is not None:
4313
restore_files = file_list
4314
for filename in restore_files:
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])
4316
restore(tree.abspath(filename))
4317
except errors.NotConflicted:
4319
# Disable pending merges, because the file texts we are remerging
4320
# have not had those merges performed. If we use the wrong parents
4321
# list, we imply that the working tree text has seen and rejected
4322
# all the changes from the other tree, when in fact those changes
4323
# have not yet been seen.
4324
tree.set_parent_ids(parents[:1])
4326
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4327
merger.interesting_ids = interesting_ids
4328
merger.merge_type = merge_type
4329
merger.show_base = show_base
4330
merger.reprocess = reprocess
4331
conflicts = merger.do_merge()
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)
4333
tree.set_parent_ids(parents)
4334
3972
if conflicts > 0:
4359
3996
name. If you name a directory, all the contents of that directory will be
4362
If you have newly added files since the target revision, they will be
4363
removed. If the files to be removed have been changed, backups will be
4364
created as above. Directories containing unknown files will not 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.
4367
The working tree contains a list of revisions that have been merged but
4368
not yet committed. These revisions will be included as additional parents
4369
of the next commit. Normally, using revert clears that list as well as
4370
reverting the files. If any files are specified, revert leaves the list
4371
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4372
.`` in the tree root to revert all files but keep the recorded merges,
4373
and ``bzr revert --forget-merges`` to clear the pending merge list without
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
4374
4009
reverting any files.
4376
Using "bzr revert --forget-merges", it is possible to apply all of the
4377
changes from a branch in a single revision. To do this, perform the merge
4378
as desired. Then doing revert with the "--forget-merges" option will keep
4379
the content of the tree as it was, but it will clear the list of pending
4380
merges. The next commit will then contain all of the changes that are
4381
present in the other branch, but without any other parent revisions.
4382
Because this technique forgets where these changes originated, it may
4383
cause additional conflicts on later merges involving the same source and
4387
_see_also = ['cat', 'export', 'merge', 'shelve']
4012
_see_also = ['cat', 'export']
4388
4013
takes_options = [
4390
4015
Option('no-backup', "Do not save backups of reverted files."),
4396
4021
def run(self, revision=None, no_backup=False, file_list=None,
4397
4022
forget_merges=None):
4398
tree, file_list = WorkingTree.open_containing_paths(file_list)
4399
self.add_cleanup(tree.lock_tree_write().unlock)
4401
tree.set_parent_ids(tree.get_parent_ids()[:1])
4403
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
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)
4406
4034
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4407
4035
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4408
tree.revert(file_list, rev_tree, not no_backup, None,
4409
report_changes=True)
4036
pb = ui.ui_factory.nested_progress_bar()
4038
tree.revert(file_list, rev_tree, not no_backup, pb,
4039
report_changes=True)
4412
4044
class cmd_assert_fail(Command):
4413
__doc__ = """Test reporting of assertion failures"""
4045
"""Test reporting of assertion failures"""
4414
4046
# intended just for use in testing
4567
4189
_get_revision_range(revision,
4568
4190
remote_branch, self.name()))
4570
local_extra, remote_extra = find_unmerged(
4571
local_branch, remote_branch, restrict,
4572
backward=not reverse,
4573
include_merges=include_merges,
4574
local_revid_range=local_revid_range,
4575
remote_revid_range=remote_revid_range)
4577
if log_format is None:
4578
registry = log.log_formatter_registry
4579
log_format = registry.get_default(local_branch)
4580
lf = log_format(to_file=self.outf,
4582
show_timezone='original')
4585
if local_extra and not theirs_only:
4586
message("You have %d extra revision(s):\n" %
4588
for revision in iter_log_revisions(local_extra,
4589
local_branch.repository,
4591
lf.log_revision(revision)
4592
printed_local = True
4595
printed_local = False
4597
if remote_extra and not mine_only:
4598
if printed_local is True:
4600
message("You are missing %d revision(s):\n" %
4602
for revision in iter_log_revisions(remote_extra,
4603
remote_branch.repository,
4605
lf.log_revision(revision)
4608
if mine_only and not local_extra:
4609
# We checked local, and found nothing extra
4610
message('This branch is up to date.\n')
4611
elif theirs_only and not remote_extra:
4612
# We checked remote, and found nothing extra
4613
message('Other branch is up to date.\n')
4614
elif not (mine_only or theirs_only or local_extra or
4616
# We checked both branches, and neither one had extra
4618
message("Branches are up to date.\n")
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()
4620
4249
if not status_code and parent is None and other_branch is not None:
4621
self.add_cleanup(local_branch.lock_write().unlock)
4622
# handle race conditions - a parent might be set while we run.
4623
if local_branch.get_parent() is None:
4624
local_branch.set_parent(remote_branch.base)
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()
4625
4257
return status_code
4628
4260
class cmd_pack(Command):
4629
__doc__ = """Compress the data within a repository.
4631
This operation compresses the data within a bazaar repository. As
4632
bazaar supports automatic packing of repository, this operation is
4633
normally not required to be done manually.
4635
During the pack operation, bazaar takes a backup of existing repository
4636
data, i.e. pack files. This backup is eventually removed by bazaar
4637
automatically when it is safe to do so. To save disk space by removing
4638
the backed up pack files, the --clean-obsolete-packs option may be
4641
Warning: If you use --clean-obsolete-packs and your machine crashes
4642
during or immediately after repacking, you may be left with a state
4643
where the deletion has been written to disk but the new packs have not
4644
been. In this case the repository may be unusable.
4261
"""Compress the data within a repository."""
4647
4263
_see_also = ['repositories']
4648
4264
takes_args = ['branch_or_repo?']
4650
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4653
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4266
def run(self, branch_or_repo='.'):
4654
4267
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4656
4269
branch = dir.open_branch()
4657
4270
repository = branch.repository
4658
4271
except errors.NotBranchError:
4659
4272
repository = dir.open_repository()
4660
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4663
4276
class cmd_plugins(Command):
4664
__doc__ = """List the installed plugins.
4277
"""List the installed plugins.
4666
4279
This command displays the list of installed plugins including
4667
4280
version of plugin and a short description of each.
4674
4287
adding new commands, providing additional network transports and
4675
4288
customizing log output.
4677
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4678
for further information on plugins including where to find them and how to
4679
install them. Instructions are also provided there on how to write new
4680
plugins using the Python programming language.
4290
See the Bazaar web site, http://bazaar-vcs.org, for further
4291
information on plugins including where to find them and how to
4292
install them. Instructions are also provided there on how to
4293
write new plugins using the Python programming language.
4682
4295
takes_options = ['verbose']
4684
4297
@display_command
4685
4298
def run(self, verbose=False):
4686
from bzrlib import plugin
4687
# Don't give writelines a generator as some codecs don't like that
4688
self.outf.writelines(
4689
list(plugin.describe_plugins(show_paths=verbose)))
4299
import bzrlib.plugin
4300
from inspect import getdoc
4302
for name, plugin in bzrlib.plugin.plugins().items():
4303
version = plugin.__version__
4304
if version == 'unknown':
4306
name_ver = '%s %s' % (name, version)
4307
d = getdoc(plugin.module)
4309
doc = d.split('\n')[0]
4311
doc = '(no description)'
4312
result.append((name_ver, doc, plugin.path()))
4313
for name_ver, doc, path in sorted(result):
4692
4321
class cmd_testament(Command):
4693
__doc__ = """Show testament (signing-form) of a revision."""
4322
"""Show testament (signing-form) of a revision."""
4694
4323
takes_options = [
4696
4325
Option('long', help='Produce long-format testament.'),
4738
4370
Option('long', help='Show commit date in annotations.'),
4743
4374
encoding_type = 'exact'
4745
4376
@display_command
4746
4377
def run(self, filename, all=False, long=False, revision=None,
4747
show_ids=False, directory=None):
4748
from bzrlib.annotate import (
4379
from bzrlib.annotate import annotate_file, annotate_file_tree
4751
4380
wt, branch, relpath = \
4752
_open_directory_or_containing_tree_or_branch(filename, directory)
4381
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4753
4382
if wt is not None:
4754
self.add_cleanup(wt.lock_read().unlock)
4756
self.add_cleanup(branch.lock_read().unlock)
4757
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4758
self.add_cleanup(tree.lock_read().unlock)
4759
if wt is not None and revision is None:
4760
file_id = wt.path2id(relpath)
4762
file_id = tree.path2id(relpath)
4764
raise errors.NotVersionedError(filename)
4765
if wt is not None and revision is None:
4766
# If there is a tree and we're not annotating historical
4767
# versions, annotate the working tree's content.
4768
annotate_file_tree(wt, file_id, self.outf, long, all,
4771
annotate_file_tree(tree, file_id, self.outf, long, all,
4772
show_ids=show_ids, branch=branch)
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,
4775
4410
class cmd_re_sign(Command):
4776
__doc__ = """Create a digital signature for an existing revision."""
4411
"""Create a digital signature for an existing revision."""
4777
4412
# TODO be able to replace existing ones.
4779
4414
hidden = True # is this right ?
4780
4415
takes_args = ['revision_id*']
4781
takes_options = ['directory', 'revision']
4416
takes_options = ['revision']
4783
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4418
def run(self, revision_id_list=None, revision=None):
4784
4419
if revision_id_list is not None and revision is not None:
4785
4420
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4786
4421
if revision_id_list is None and revision is None:
4787
4422
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4788
b = WorkingTree.open_containing(directory)[0].branch
4789
self.add_cleanup(b.lock_write().unlock)
4790
return self._run(b, revision_id_list, revision)
4423
b = WorkingTree.open_containing(u'.')[0].branch
4426
return self._run(b, revision_id_list, revision)
4792
4430
def _run(self, b, revision_id_list, revision):
4793
4431
import bzrlib.gpg as gpg
4983
4624
end_revision=last_revno)
4986
self.outf.write('Dry-run, pretending to remove'
4987
' the above revisions.\n')
4627
print 'Dry-run, pretending to remove the above revisions.'
4629
val = raw_input('Press <enter> to continue')
4989
self.outf.write('The above revision(s) will be removed.\n')
4992
if not ui.ui_factory.confirm_action(
4993
u'Uncommit these revisions',
4994
'bzrlib.builtins.uncommit',
4996
self.outf.write('Canceled\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'):
4999
4638
mutter('Uncommitting from {%s} to {%s}',
5000
4639
last_rev_id, rev_id)
5001
4640
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5002
4641
revno=revno, local=local)
5003
self.outf.write('You can restore the old tip by running:\n'
5004
' bzr pull . -r revid:%s\n' % last_rev_id)
4642
note('You can restore the old tip by running:\n'
4643
' bzr pull . -r revid:%s', last_rev_id)
5007
4646
class cmd_break_lock(Command):
5008
__doc__ = """Break a dead lock.
5010
This command breaks a lock on a repository, branch, working directory or
4647
"""Break a dead lock on a repository, branch or working directory.
5013
4649
CAUTION: Locks should only be broken when you are sure that the process
5014
4650
holding the lock has been stopped.
5016
You can get information on what locks are open via the 'bzr info
5017
[location]' command.
4652
You can get information on what locks are open via the 'bzr info' command.
5021
bzr break-lock bzr+ssh://example.com/bzr/foo
5022
bzr break-lock --conf ~/.bazaar
5025
4657
takes_args = ['location?']
5028
help='LOCATION is the directory where the config lock is.'),
5030
help='Do not ask for confirmation before breaking the lock.'),
5033
def run(self, location=None, config=False, force=False):
4659
def run(self, location=None, show=False):
5034
4660
if location is None:
5035
4661
location = u'.'
5037
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5039
{'bzrlib.lockdir.break': True})
5041
conf = _mod_config.LockableConfig(file_name=location)
5044
control, relpath = bzrdir.BzrDir.open_containing(location)
5046
control.break_lock()
5047
except NotImplementedError:
4662
control, relpath = bzrdir.BzrDir.open_containing(location)
4664
control.break_lock()
4665
except NotImplementedError:
5051
4669
class cmd_wait_until_signalled(Command):
5052
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4670
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5054
4672
This just prints a line to signal when it is ready, then blocks on stdin.
5313
4926
directly from the merge directive, without retrieving data from a
5316
`bzr send` creates a compact data set that, when applied using bzr
5317
merge, has the same effect as merging from the source branch.
5319
By default the merge directive is self-contained and can be applied to any
5320
branch containing submit_branch in its ancestory without needing access to
5323
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5324
revisions, but only a structured request to merge from the
5325
public_location. In that case the public_branch is needed and it must be
5326
up-to-date and accessible to the recipient. The public_branch is always
5327
included if known, so that people can check it later.
5329
The submit branch defaults to the parent of the source branch, but can be
5330
overridden. Both submit branch and public branch will be remembered in
5331
branch.conf the first time they are used for a particular branch. The
5332
source branch defaults to that containing the working directory, but can
5333
be changed using --from.
5335
Both the submit branch and the public branch follow the usual behavior with
5336
respect to --remember: If there is no default location set, the first send
5337
will set it (use --no-remember to avoid settting it). After that, you can
5338
omit the location to use the default. To change the default, use
5339
--remember. The value will only be saved if the location can be accessed.
5341
In order to calculate those changes, bzr must analyse the submit branch.
5342
Therefore it is most efficient for the submit branch to be a local mirror.
5343
If a public location is known for the submit_branch, that location is used
5344
in the merge directive.
5346
The default behaviour is to send the merge directive by mail, unless -o is
5347
given, in which case it is sent to a file.
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
5349
4942
Mail is sent using your preferred mail program. This should be transparent
5350
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4943
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5351
4944
If the preferred client can't be found (or used), your editor will be used.
5353
4946
To use a specific mail program, set the mail_client configuration option.
5354
4947
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5355
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5356
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5357
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
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.
5360
4952
If mail is being sent, a to address is required. This can be supplied
5361
4953
either on the commandline, by setting the submit_to configuration
5512
5100
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5513
5101
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5515
If no tag name is specified it will be determined through the
5516
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5517
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5521
5104
_see_also = ['commit', 'tags']
5522
takes_args = ['tag_name?']
5105
takes_args = ['tag_name']
5523
5106
takes_options = [
5524
5107
Option('delete',
5525
5108
help='Delete this tag rather than placing it.',
5527
custom_help('directory',
5528
help='Branch in which to place the tag.'),
5111
help='Branch in which to place the tag.',
5529
5115
Option('force',
5530
5116
help='Replace existing tags.',
5535
def run(self, tag_name=None,
5121
def run(self, tag_name,
5541
5127
branch, relpath = Branch.open_containing(directory)
5542
self.add_cleanup(branch.lock_write().unlock)
5544
if tag_name is None:
5545
raise errors.BzrCommandError("No tag specified to delete.")
5546
branch.tags.delete_tag(tag_name)
5547
note('Deleted tag %s.' % tag_name)
5550
if len(revision) != 1:
5551
raise errors.BzrCommandError(
5552
"Tags can only be placed on a single revision, "
5554
revision_id = revision[0].as_revision_id(branch)
5131
branch.tags.delete_tag(tag_name)
5132
self.outf.write('Deleted tag %s.\n' % tag_name)
5556
revision_id = branch.last_revision()
5557
if tag_name is None:
5558
tag_name = branch.automatic_tag_name(revision_id)
5559
if tag_name is None:
5560
raise errors.BzrCommandError(
5561
"Please specify a tag name.")
5562
if (not force) and branch.tags.has_tag(tag_name):
5563
raise errors.TagAlreadyExists(tag_name)
5564
branch.tags.set_tag(tag_name, revision_id)
5565
note('Created tag %s.' % tag_name)
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)
5568
5150
class cmd_tags(Command):
5569
__doc__ = """List tags.
5571
5153
This command shows a table of tag names and the revisions they reference.
5574
5156
_see_also = ['tag']
5575
5157
takes_options = [
5576
custom_help('directory',
5577
help='Branch whose tags should be displayed.'),
5578
RegistryOption('sort',
5159
help='Branch whose tags should be displayed.',
5163
RegistryOption.from_kwargs('sort',
5579
5164
'Sort tags by different criteria.', title='Sorting',
5580
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5165
alpha='Sort tags lexicographically (default).',
5166
time='Sort tags chronologically.',
5586
5172
@display_command
5587
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5588
from bzrlib.tag import tag_sort_methods
5589
5179
branch, relpath = Branch.open_containing(directory)
5591
5181
tags = branch.tags.get_tag_dict().items()
5595
self.add_cleanup(branch.lock_read().unlock)
5597
graph = branch.repository.get_graph()
5598
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5599
revid1, revid2 = rev1.rev_id, rev2.rev_id
5600
# only show revisions between revid1 and revid2 (inclusive)
5601
tags = [(tag, revid) for tag, revid in tags if
5602
graph.is_between(revid, revid1, revid2)]
5604
sort = tag_sort_methods.get()
5607
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5608
for index, (tag, revid) in enumerate(tags):
5610
revno = branch.revision_id_to_dotted_revno(revid)
5611
if isinstance(revno, tuple):
5612
revno = '.'.join(map(str, revno))
5613
except (errors.NoSuchRevision, errors.GhostRevisionsHaveNoRevno):
5614
# Bad tag data/merges can lead to tagged revisions
5615
# which are not in this branch. Fail gracefully ...
5617
tags[index] = (tag, revno)
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)
5619
5221
for tag, revspec in tags:
5620
5222
self.outf.write('%-20s %s\n' % (tag, revspec))
5623
5225
class cmd_reconfigure(Command):
5624
__doc__ = """Reconfigure the type of a bzr directory.
5226
"""Reconfigure the type of a bzr directory.
5626
5228
A target configuration must be specified.
5730
5332
/path/to/newbranch.
5732
5334
Bound branches use the nickname of its master branch unless it is set
5733
locally, in which case switching will update the local nickname to be
5335
locally, in which case switching will update the the local nickname to be
5734
5336
that of the master.
5737
takes_args = ['to_location?']
5738
takes_options = ['directory',
5339
takes_args = ['to_location']
5340
takes_options = [Option('force',
5740
5341
help='Switch even if local commits will be lost.'),
5742
5342
Option('create-branch', short_name='b',
5743
5343
help='Create the target branch from this one before'
5744
5344
' switching to it.'),
5747
def run(self, to_location=None, force=False, create_branch=False,
5748
revision=None, directory=u'.'):
5347
def run(self, to_location, force=False, create_branch=False):
5749
5348
from bzrlib import switch
5750
tree_location = directory
5751
revision = _get_one_revision('switch', revision)
5752
5350
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5753
if to_location is None:
5754
if revision is None:
5755
raise errors.BzrCommandError('You must supply either a'
5756
' revision or a location')
5757
to_location = tree_location
5759
5352
branch = control_dir.open_branch()
5760
5353
had_explicit_nick = branch.get_config().has_explicit_nickname()
6060
5617
Option('destroy',
6061
5618
help='Destroy removed changes instead of shelving them.'),
6063
_see_also = ['unshelve', 'configuration']
5620
_see_also = ['unshelve']
6065
5622
def run(self, revision=None, all=False, file_list=None, message=None,
6066
writer=None, list=False, destroy=False, directory=None):
5623
writer=None, list=False, destroy=False):
6068
return self.run_for_list(directory=directory)
5625
return self.run_for_list()
6069
5626
from bzrlib.shelf_ui import Shelver
6070
5627
if writer is None:
6071
5628
writer = bzrlib.option.diff_writer_registry.get()
6073
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6074
file_list, message, destroy=destroy, directory=directory)
5630
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5631
message, destroy=destroy).run()
6079
5632
except errors.UserAbort:
6082
def run_for_list(self, directory=None):
6083
if directory is None:
6085
tree = WorkingTree.open_containing(directory)[0]
6086
self.add_cleanup(tree.lock_read().unlock)
6087
manager = tree.get_shelf_manager()
6088
shelves = manager.active_shelves()
6089
if len(shelves) == 0:
6090
note('No shelved changes.')
6092
for shelf_id in reversed(shelves):
6093
message = manager.get_metadata(shelf_id).get('message')
6095
message = '<no message>'
6096
self.outf.write('%3d: %s\n' % (shelf_id, message))
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))
6100
5654
class cmd_unshelve(Command):
6101
__doc__ = """Restore shelved changes.
5655
"""Restore shelved changes.
6103
5657
By default, the most recently shelved changes are restored. However if you
6104
5658
specify a shelf by id those changes will be restored instead. This works
6108
5662
takes_args = ['shelf_id?']
6109
5663
takes_options = [
6111
5664
RegistryOption.from_kwargs(
6112
5665
'action', help="The action to perform.",
6113
5666
enum_switch=False, value_switches=True,
6114
5667
apply="Apply changes and remove from the shelf.",
6115
5668
dry_run="Show changes, but do not apply or remove them.",
6116
preview="Instead of unshelving the changes, show the diff that "
6117
"would result from unshelving.",
6118
delete_only="Delete changes without applying them.",
6119
keep="Apply changes but don't delete them.",
5669
delete_only="Delete changes without applying them."
6122
5672
_see_also = ['shelve']
6124
def run(self, shelf_id=None, action='apply', directory=u'.'):
5674
def run(self, shelf_id=None, action='apply'):
6125
5675
from bzrlib.shelf_ui import Unshelver
6126
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
6130
unshelver.tree.unlock()
5676
Unshelver.from_args(shelf_id, action).run()
6133
5679
class cmd_clean_tree(Command):
6134
__doc__ = """Remove unwanted files from working tree.
5680
"""Remove unwanted files from working tree.
6136
5682
By default, only unknown files, not ignored files, are deleted. Versioned
6137
5683
files are never deleted.
6212
5757
self.outf.write('%s %s\n' % (path, location))
6215
class cmd_export_pot(Command):
6216
__doc__ = """Export command helps and error messages in po format."""
6221
from bzrlib.export_pot import export_pot
6222
export_pot(self.outf)
6225
def _register_lazy_builtins():
6226
# register lazy builtins from other modules; called at startup and should
6227
# be only called once.
6228
for (name, aliases, module_name) in [
6229
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6230
('cmd_config', [], 'bzrlib.config'),
6231
('cmd_dpush', [], 'bzrlib.foreign'),
6232
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6233
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6234
('cmd_conflicts', [], 'bzrlib.conflicts'),
6235
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6236
('cmd_verify_signatures', [],
6237
'bzrlib.commit_signature_commands'),
6238
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6240
builtin_command_registry.register_lazy(name, aliases, module_name)
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
added
removed
bzrlib/builtins.py
