72
73
_parse_revision_str,
74
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
81
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
83
return internal_tree_files(file_list, default_branch, canonicalize,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
87
88
def tree_files_for_add(file_list):
152
153
# XXX: Bad function name; should possibly also be a class method of
153
154
# WorkingTree rather than a function.
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
156
apply_view=True):
157
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
Deprecated: use WorkingTree.open_containing_paths instead.
161
159
This is typically used for command-line processors that take one or
162
160
more filenames, and infer the workingtree that contains them.
174
172
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
182
223
def _get_view_info_for_change_reporter(tree):
194
def _open_directory_or_containing_tree_or_branch(filename, directory):
195
"""Open the tree or branch containing the specified file, unless
196
the --directory option is used to specify a different branch."""
197
if directory is not None:
198
return (None, Branch.open(directory), filename)
199
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
202
235
# TODO: Make sure no commands unconditionally use the working directory as a
203
236
# branch. If a filename argument is used, the first of them should be used to
204
237
# specify the branch. (Perhaps this can be factored out into some kind of
233
266
Not versioned and not matching an ignore pattern.
235
Additionally for directories, symlinks and files with a changed
236
executable bit, Bazaar indicates their type using a trailing
237
character: '/', '@' or '*' respectively. These decorations can be
238
disabled using the '--no-classify' option.
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
240
272
To see ignored files use 'bzr ignored'. For details on the
241
273
changes to file texts, use 'bzr diff'.
254
286
To skip the display of pending merge information altogether, use
255
287
the no-pending option or specify a file/directory.
257
To compare the working directory to a specific revision, pass a
258
single revision to the revision argument.
260
To see which files have changed in a specific revision, or between
261
two revisions, pass a revision range to the revision argument.
262
This will produce the same results as calling 'bzr diff --summarize'.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
265
293
# TODO: --no-recurse, --recurse options
285
310
def run(self, show_ids=False, file_list=None, revision=None, short=False,
286
versioned=False, no_pending=False, verbose=False,
311
versioned=False, no_pending=False, verbose=False):
288
312
from bzrlib.status import show_tree_status
290
314
if revision and len(revision) > 2:
291
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
292
316
' one or two revision specifiers')
294
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
318
tree, relfile_list = tree_files(file_list)
295
319
# Avoid asking for specific files when that is not needed.
296
320
if relfile_list == ['']:
297
321
relfile_list = None
304
328
show_tree_status(tree, show_ids=show_ids,
305
329
specific_files=relfile_list, revision=revision,
306
330
to_file=self.outf, short=short, versioned=versioned,
307
show_pending=(not no_pending), verbose=verbose,
308
classify=not no_classify)
331
show_pending=(not no_pending), verbose=verbose)
311
334
class cmd_cat_revision(Command):
312
__doc__ = """Write out metadata for a revision.
335
"""Write out metadata for a revision.
314
337
The revision to print can either be specified by a specific
315
338
revision identifier, or you can use --revision.
330
353
self.outf.write(revtext.decode('utf-8'))
333
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
334
357
if revision_id is not None and revision is not None:
335
358
raise errors.BzrCommandError('You can only supply one of'
336
359
' revision_id or --revision')
337
360
if revision_id is None and revision is None:
338
361
raise errors.BzrCommandError('You must supply either'
339
362
' --revision or a revision_id')
341
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
363
b = WorkingTree.open_containing(u'.')[0].branch
343
365
revisions = b.repository.revisions
344
366
if revisions is None:
485
504
if (working.has_changes()):
486
505
raise errors.UncommittedChanges(working)
487
if working.get_shelf_manager().last_shelf() is not None:
488
raise errors.ShelvedChanges(working)
490
if working.user_url != working.branch.user_url:
507
working_path = working.bzrdir.root_transport.base
508
branch_path = working.branch.bzrdir.root_transport.base
509
if working_path != branch_path:
491
510
raise errors.BzrCommandError("You cannot remove the working tree"
492
511
" from a lightweight checkout")
494
513
d.destroy_workingtree()
497
class cmd_repair_workingtree(Command):
498
__doc__ = """Reset the working tree state file.
500
This is not meant to be used normally, but more as a way to recover from
501
filesystem corruption, etc. This rebuilds the working inventory back to a
502
'known good' state. Any new modifications (adding a file, renaming, etc)
503
will be lost, though modified files will still be detected as such.
505
Most users will want something more like "bzr revert" or "bzr update"
506
unless the state file has become corrupted.
508
By default this attempts to recover the current state by looking at the
509
headers of the state file. If the state file is too corrupted to even do
510
that, you can supply --revision to force the state of the tree.
513
takes_options = ['revision', 'directory',
515
help='Reset the tree even if it doesn\'t appear to be'
520
def run(self, revision=None, directory='.', force=False):
521
tree, _ = WorkingTree.open_containing(directory)
522
self.add_cleanup(tree.lock_tree_write().unlock)
526
except errors.BzrError:
527
pass # There seems to be a real error here, so we'll reset
530
raise errors.BzrCommandError(
531
'The tree does not appear to be corrupt. You probably'
532
' want "bzr revert" instead. Use "--force" if you are'
533
' sure you want to reset the working tree.')
537
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
539
tree.reset_state(revision_ids)
540
except errors.BzrError, e:
541
if revision_ids is None:
542
extra = (', the header appears corrupt, try passing -r -1'
543
' to set the state to the last commit')
546
raise errors.BzrCommandError('failed to reset the tree state'
550
516
class cmd_revno(Command):
551
__doc__ = """Show current revision number.
517
"""Show current revision number.
553
519
This is equal to the number of revisions on this branch.
575
542
revno = ".".join(str(n) for n in revno_t)
577
544
b = Branch.open_containing(location)[0]
578
self.add_cleanup(b.lock_read().unlock)
546
self.add_cleanup(b.unlock)
579
547
revno = b.revno()
580
548
self.cleanup_now()
581
549
self.outf.write(str(revno) + '\n')
584
552
class cmd_revision_info(Command):
585
__doc__ = """Show revision number and revision id for a given revision identifier.
553
"""Show revision number and revision id for a given revision identifier.
588
556
takes_args = ['revision_info*']
589
557
takes_options = [
591
custom_help('directory',
592
560
help='Branch to examine, '
593
'rather than the one containing the working directory.'),
561
'rather than the one containing the working directory.',
594
565
Option('tree', help='Show revno of working tree'),
787
761
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
789
763
revision = _get_one_revision('inventory', revision)
790
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
791
self.add_cleanup(work_tree.lock_read().unlock)
764
work_tree, file_list = tree_files(file_list)
765
work_tree.lock_read()
766
self.add_cleanup(work_tree.unlock)
792
767
if revision is not None:
793
768
tree = revision.as_tree(work_tree.branch)
795
770
extra_trees = [work_tree]
796
self.add_cleanup(tree.lock_read().unlock)
772
self.add_cleanup(tree.unlock)
860
835
if len(names_list) < 2:
861
836
raise errors.BzrCommandError("missing file argument")
862
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
863
self.add_cleanup(tree.lock_tree_write().unlock)
837
tree, rel_names = tree_files(names_list, canonicalize=False)
838
tree.lock_tree_write()
839
self.add_cleanup(tree.unlock)
864
840
self._run(tree, names_list, rel_names, after)
866
842
def run_auto(self, names_list, after, dry_run):
871
847
raise errors.BzrCommandError('--after cannot be specified with'
873
work_tree, file_list = WorkingTree.open_containing_paths(
874
names_list, default_directory='.')
875
self.add_cleanup(work_tree.lock_tree_write().unlock)
849
work_tree, file_list = tree_files(names_list, default_branch='.')
850
work_tree.lock_tree_write()
851
self.add_cleanup(work_tree.unlock)
876
852
rename_map.RenameMap.guess_renames(work_tree, dry_run)
878
854
def _run(self, tree, names_list, rel_names, after):
972
948
match the remote one, use pull --overwrite. This will work even if the two
973
949
branches have diverged.
975
If there is no default location set, the first pull will set it (use
976
--no-remember to avoid settting it). After that, you can omit the
977
location to use the default. To change the default, use --remember. The
978
value will only be saved if the remote location can be accessed.
951
If there is no default location set, the first pull will set it. After
952
that, you can omit the location to use the default. To change the
953
default, use --remember. The value will only be saved if the remote
954
location can be accessed.
980
956
Note: The location can be specified either in the form of a branch,
981
957
or in the form of a path to a file containing a merge directive generated
986
962
takes_options = ['remember', 'overwrite', 'revision',
987
963
custom_help('verbose',
988
964
help='Show logs of pulled revisions.'),
989
custom_help('directory',
990
966
help='Branch to pull into, '
991
'rather than the one containing the working directory.'),
967
'rather than the one containing the working directory.',
993
972
help="Perform a local pull in a bound "
994
973
"branch. Local pulls are not applied to "
995
974
"the master branch."
998
help="Show base revision text in conflicts.")
1000
977
takes_args = ['location?']
1001
978
encoding_type = 'replace'
1003
def run(self, location=None, remember=None, overwrite=False,
980
def run(self, location=None, remember=False, overwrite=False,
1004
981
revision=None, verbose=False,
1005
directory=None, local=False,
982
directory=None, local=False):
1007
983
# FIXME: too much stuff is in the command class
1008
984
revision_id = None
1009
985
mergeable = None
1057
1028
branch_from = Branch.open(location,
1058
1029
possible_transports=possible_transports)
1059
self.add_cleanup(branch_from.lock_read().unlock)
1060
# Remembers if asked explicitly or no previous location is set
1062
or (remember is None and branch_to.get_parent() is None)):
1031
if branch_to.get_parent() is None or remember:
1063
1032
branch_to.set_parent(branch_from.base)
1034
if branch_from is not branch_to:
1035
branch_from.lock_read()
1036
self.add_cleanup(branch_from.unlock)
1065
1037
if revision is not None:
1066
1038
revision_id = revision.as_revision_id(branch_from)
1040
branch_to.lock_write()
1041
self.add_cleanup(branch_to.unlock)
1068
1042
if tree_to is not None:
1069
1043
view_info = _get_view_info_for_change_reporter(tree_to)
1070
1044
change_reporter = delta._ChangeReporter(
1109
1078
do a merge (see bzr help merge) from the other branch, and commit that.
1110
1079
After that you will be able to do a push without '--overwrite'.
1112
If there is no default push location set, the first push will set it (use
1113
--no-remember to avoid settting it). After that, you can omit the
1114
location to use the default. To change the default, use --remember. The
1115
value will only be saved if the remote location can be accessed.
1081
If there is no default push location set, the first push will set it.
1082
After that, you can omit the location to use the default. To change the
1083
default, use --remember. The value will only be saved if the remote
1084
location can be accessed.
1118
1087
_see_also = ['pull', 'update', 'working-trees']
1120
1089
Option('create-prefix',
1121
1090
help='Create the path leading up to the branch '
1122
1091
'if it does not already exist.'),
1123
custom_help('directory',
1124
1093
help='Branch to push from, '
1125
'rather than the one containing the working directory.'),
1094
'rather than the one containing the working directory.',
1126
1098
Option('use-existing-dir',
1127
1099
help='By default push will fail if the target'
1128
1100
' directory exists, but does not already'
1139
1111
Option('strict',
1140
1112
help='Refuse to push if there are uncommitted changes in'
1141
1113
' the working tree, --no-strict disables the check.'),
1143
help="Don't populate the working tree, even for protocols"
1144
" that support it."),
1146
1115
takes_args = ['location?']
1147
1116
encoding_type = 'replace'
1149
def run(self, location=None, remember=None, overwrite=False,
1118
def run(self, location=None, remember=False, overwrite=False,
1150
1119
create_prefix=False, verbose=False, revision=None,
1151
1120
use_existing_dir=False, directory=None, stacked_on=None,
1152
stacked=False, strict=None, no_tree=False):
1121
stacked=False, strict=None):
1153
1122
from bzrlib.push import _show_push_branch
1155
1124
if directory is None:
1157
1126
# Get the source branch
1158
1127
(tree, br_from,
1159
1128
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1130
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1131
if strict is None: strict = True # default value
1160
1132
# Get the tip's revision_id
1161
1133
revision = _get_one_revision('push', revision)
1162
1134
if revision is not None:
1163
1135
revision_id = revision.in_history(br_from).rev_id
1165
1137
revision_id = None
1166
if tree is not None and revision_id is None:
1167
tree.check_changed_or_out_of_date(
1168
strict, 'push_strict',
1169
more_error='Use --no-strict to force the push.',
1170
more_warning='Uncommitted changes will not be pushed.')
1138
if strict and tree is not None and revision_id is None:
1139
if (tree.has_changes()):
1140
raise errors.UncommittedChanges(
1141
tree, more='Use --no-strict to force the push.')
1142
if tree.last_revision() != tree.branch.last_revision():
1143
# The tree has lost sync with its branch, there is little
1144
# chance that the user is aware of it but he can still force
1145
# the push with --no-strict
1146
raise errors.OutOfDateTree(
1147
tree, more='Use --no-strict to force the push.')
1171
1149
# Get the stacked_on branch, if any
1172
1150
if stacked_on is not None:
1173
1151
stacked_on = urlutils.normalize_url(stacked_on)
1201
1179
_show_push_branch(br_from, revision_id, location, self.outf,
1202
1180
verbose=verbose, overwrite=overwrite, remember=remember,
1203
1181
stacked_on=stacked_on, create_prefix=create_prefix,
1204
use_existing_dir=use_existing_dir, no_tree=no_tree)
1182
use_existing_dir=use_existing_dir)
1207
1185
class cmd_branch(Command):
1208
__doc__ = """Create a new branch that is a copy of an existing branch.
1186
"""Create a new branch that is a copy of an existing branch.
1210
1188
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1211
1189
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1217
1195
To retrieve the branch as of a particular revision, supply the --revision
1218
1196
parameter, as in "branch foo/bar -r 5".
1220
The synonyms 'clone' and 'get' for this command are deprecated.
1223
1199
_see_also = ['checkout']
1224
1200
takes_args = ['from_location', 'to_location?']
1225
takes_options = ['revision',
1226
Option('hardlink', help='Hard-link working tree files where possible.'),
1227
Option('files-from', type=str,
1228
help="Get file contents from this tree."),
1201
takes_options = ['revision', Option('hardlink',
1202
help='Hard-link working tree files where possible.'),
1229
1203
Option('no-tree',
1230
1204
help="Create a branch without a working-tree."),
1231
1205
Option('switch',
1250
1224
def run(self, from_location, to_location=None, revision=None,
1251
1225
hardlink=False, stacked=False, standalone=False, no_tree=False,
1252
use_existing_dir=False, switch=False, bind=False,
1226
use_existing_dir=False, switch=False, bind=False):
1254
1227
from bzrlib import switch as _mod_switch
1255
1228
from bzrlib.tag import _merge_tags_if_possible
1256
if self.invoked_as in ['get', 'clone']:
1257
ui.ui_factory.show_user_warning(
1258
'deprecated_command',
1259
deprecated_name=self.invoked_as,
1260
recommended_name='branch',
1261
deprecated_in_version='2.4')
1262
1229
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1264
if not (hardlink or files_from):
1265
# accelerator_tree is usually slower because you have to read N
1266
# files (no readahead, lots of seeks, etc), but allow the user to
1267
# explicitly request it
1268
accelerator_tree = None
1269
if files_from is not None and files_from != from_location:
1270
accelerator_tree = WorkingTree.open(files_from)
1271
1231
revision = _get_one_revision('branch', revision)
1272
self.add_cleanup(br_from.lock_read().unlock)
1233
self.add_cleanup(br_from.unlock)
1273
1234
if revision is not None:
1274
1235
revision_id = revision.as_revision_id(br_from)
1380
1341
to_location = branch_location
1381
1342
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1382
1343
branch_location)
1383
if not (hardlink or files_from):
1384
# accelerator_tree is usually slower because you have to read N
1385
# files (no readahead, lots of seeks, etc), but allow the user to
1386
# explicitly request it
1387
accelerator_tree = None
1388
1344
revision = _get_one_revision('checkout', revision)
1389
if files_from is not None and files_from != branch_location:
1345
if files_from is not None:
1390
1346
accelerator_tree = WorkingTree.open(files_from)
1391
1347
if revision is not None:
1392
1348
revision_id = revision.as_revision_id(source)
1448
1406
If you want to discard your local changes, you can just do a
1449
1407
'bzr revert' instead of 'bzr commit' after the update.
1451
If you want to restore a file that has been removed locally, use
1452
'bzr revert' instead of 'bzr update'.
1454
1409
If the tree's branch is bound to a master branch, it will also update
1455
1410
the branch from the master.
1458
1413
_see_also = ['pull', 'working-trees', 'status-flags']
1459
1414
takes_args = ['dir?']
1460
takes_options = ['revision',
1462
help="Show base revision text in conflicts."),
1415
takes_options = ['revision']
1464
1416
aliases = ['up']
1466
def run(self, dir='.', revision=None, show_base=None):
1418
def run(self, dir='.', revision=None):
1467
1419
if revision is not None and len(revision) != 1:
1468
1420
raise errors.BzrCommandError(
1469
1421
"bzr update --revision takes exactly one revision")
1578
1528
class cmd_remove(Command):
1579
__doc__ = """Remove files or directories.
1529
"""Remove files or directories.
1581
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1582
delete them if they can easily be recovered using revert otherwise they
1583
will be backed up (adding an extention of the form .~#~). If no options or
1584
parameters are given Bazaar will scan for files that are being tracked by
1585
Bazaar but missing in your tree and stop tracking them for you.
1531
This makes bzr stop tracking changes to the specified files. bzr will delete
1532
them if they can easily be recovered using revert. If no options or
1533
parameters are given bzr will scan for files that are being tracked by bzr
1534
but missing in your tree and stop tracking them for you.
1587
1536
takes_args = ['file*']
1588
1537
takes_options = ['verbose',
1590
1539
RegistryOption.from_kwargs('file-deletion-strategy',
1591
1540
'The file deletion mode to be used.',
1592
1541
title='Deletion Strategy', value_switches=True, enum_switch=False,
1593
safe='Backup changed files (default).',
1542
safe='Only delete files if they can be'
1543
' safely recovered (default).',
1594
1544
keep='Delete from bzr but leave the working copy.',
1595
no_backup='Don\'t backup changed files.',
1596
1545
force='Delete all the specified files, even if they can not be '
1597
'recovered and even if they are non-empty directories. '
1598
'(deprecated, use no-backup)')]
1546
'recovered and even if they are non-empty directories.')]
1599
1547
aliases = ['rm', 'del']
1600
1548
encoding_type = 'replace'
1602
1550
def run(self, file_list, verbose=False, new=False,
1603
1551
file_deletion_strategy='safe'):
1604
if file_deletion_strategy == 'force':
1605
note("(The --force option is deprecated, rather use --no-backup "
1607
file_deletion_strategy = 'no-backup'
1609
tree, file_list = WorkingTree.open_containing_paths(file_list)
1552
tree, file_list = tree_files(file_list)
1611
1554
if file_list is not None:
1612
1555
file_list = [f for f in file_list]
1614
self.add_cleanup(tree.lock_write().unlock)
1558
self.add_cleanup(tree.unlock)
1615
1559
# Heuristics should probably all move into tree.remove_smart or
1632
1576
file_deletion_strategy = 'keep'
1633
1577
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1634
1578
keep_files=file_deletion_strategy=='keep',
1635
force=(file_deletion_strategy=='no-backup'))
1579
force=file_deletion_strategy=='force')
1638
1582
class cmd_file_id(Command):
1639
__doc__ = """Print file_id of a particular file or directory.
1583
"""Print file_id of a particular file or directory.
1641
1585
The file_id is assigned when the file is first added and remains the
1642
1586
same through all revisions where the file exists, even when it is
1701
1645
_see_also = ['check']
1702
1646
takes_args = ['branch?']
1704
Option('canonicalize-chks',
1705
help='Make sure CHKs are in canonical form (repairs '
1710
def run(self, branch=".", canonicalize_chks=False):
1648
def run(self, branch="."):
1711
1649
from bzrlib.reconcile import reconcile
1712
1650
dir = bzrdir.BzrDir.open(branch)
1713
reconcile(dir, canonicalize_chks=canonicalize_chks)
1716
1654
class cmd_revision_history(Command):
1717
__doc__ = """Display the list of revision ids on a branch."""
1655
"""Display the list of revision ids on a branch."""
1719
1657
_see_also = ['log']
1720
1658
takes_args = ['location?']
1749
1687
last_revision = wt.last_revision()
1751
self.add_cleanup(b.repository.lock_read().unlock)
1752
graph = b.repository.get_graph()
1753
revisions = [revid for revid, parents in
1754
graph.iter_ancestry([last_revision])]
1755
for revision_id in reversed(revisions):
1756
if _mod_revision.is_null(revision_id):
1689
revision_ids = b.repository.get_ancestry(last_revision)
1691
for revision_id in revision_ids:
1758
1692
self.outf.write(revision_id + '\n')
1761
1695
class cmd_init(Command):
1762
__doc__ = """Make a directory into a versioned branch.
1696
"""Make a directory into a versioned branch.
1764
1698
Use this to create an empty branch, or before importing an
1765
1699
existing project.
1798
1732
Option('append-revisions-only',
1799
1733
help='Never change revnos or the existing log.'
1800
' Append revisions to it only.'),
1802
'Create a branch without a working tree.')
1734
' Append revisions to it only.')
1804
1736
def run(self, location=None, format=None, append_revisions_only=False,
1805
create_prefix=False, no_tree=False):
1737
create_prefix=False):
1806
1738
if format is None:
1807
1739
format = bzrdir.format_registry.make_bzrdir('default')
1808
1740
if location is None:
2084
1993
(old_tree, new_tree,
2085
1994
old_branch, new_branch,
2086
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2087
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2088
# GNU diff on Windows uses ANSI encoding for filenames
2089
path_encoding = osutils.get_diff_header_encoding()
1995
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1996
file_list, revision, old, new, apply_view=True)
2090
1997
return show_diff_trees(old_tree, new_tree, sys.stdout,
2091
1998
specific_files=specific_files,
2092
1999
external_diff_options=diff_options,
2093
2000
old_label=old_label, new_label=new_label,
2094
extra_trees=extra_trees,
2095
path_encoding=path_encoding,
2001
extra_trees=extra_trees, using=using,
2097
2002
format_cls=format)
2100
2005
class cmd_deleted(Command):
2101
__doc__ = """List files deleted in the working tree.
2006
"""List files deleted in the working tree.
2103
2008
# TODO: Show files deleted since a previous revision, or
2104
2009
# between two revisions.
2107
2012
# level of effort but possibly much less IO. (Or possibly not,
2108
2013
# if the directories are very large...)
2109
2014
_see_also = ['status', 'ls']
2110
takes_options = ['directory', 'show-ids']
2015
takes_options = ['show-ids']
2112
2017
@display_command
2113
def run(self, show_ids=False, directory=u'.'):
2114
tree = WorkingTree.open_containing(directory)[0]
2115
self.add_cleanup(tree.lock_read().unlock)
2018
def run(self, show_ids=False):
2019
tree = WorkingTree.open_containing(u'.')[0]
2021
self.add_cleanup(tree.unlock)
2116
2022
old = tree.basis_tree()
2117
self.add_cleanup(old.lock_read().unlock)
2024
self.add_cleanup(old.unlock)
2118
2025
for path, ie in old.inventory.iter_entries():
2119
2026
if not tree.has_id(ie.file_id):
2120
2027
self.outf.write(path)
2127
2034
class cmd_modified(Command):
2128
__doc__ = """List files modified in working tree.
2035
"""List files modified in working tree.
2132
2039
_see_also = ['status', 'ls']
2133
takes_options = ['directory', 'null']
2042
help='Write an ascii NUL (\\0) separator '
2043
'between files rather than a newline.')
2135
2046
@display_command
2136
def run(self, null=False, directory=u'.'):
2137
tree = WorkingTree.open_containing(directory)[0]
2138
self.add_cleanup(tree.lock_read().unlock)
2047
def run(self, null=False):
2048
tree = WorkingTree.open_containing(u'.')[0]
2139
2049
td = tree.changes_from(tree.basis_tree())
2141
2050
for path, id, kind, text_modified, meta_modified in td.modified:
2143
2052
self.outf.write(path + '\0')
2148
2057
class cmd_added(Command):
2149
__doc__ = """List files added in working tree.
2058
"""List files added in working tree.
2153
2062
_see_also = ['status', 'ls']
2154
takes_options = ['directory', 'null']
2065
help='Write an ascii NUL (\\0) separator '
2066
'between files rather than a newline.')
2156
2069
@display_command
2157
def run(self, null=False, directory=u'.'):
2158
wt = WorkingTree.open_containing(directory)[0]
2159
self.add_cleanup(wt.lock_read().unlock)
2070
def run(self, null=False):
2071
wt = WorkingTree.open_containing(u'.')[0]
2073
self.add_cleanup(wt.unlock)
2160
2074
basis = wt.basis_tree()
2161
self.add_cleanup(basis.lock_read().unlock)
2076
self.add_cleanup(basis.unlock)
2162
2077
basis_inv = basis.inventory
2163
2078
inv = wt.inventory
2164
2079
for file_id in inv:
2165
if basis_inv.has_id(file_id):
2080
if file_id in basis_inv:
2167
2082
if inv.is_root(file_id) and len(basis_inv) == 0:
2169
2084
path = inv.id2path(file_id)
2170
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2085
if not os.access(osutils.abspath(path), os.F_OK):
2173
2088
self.outf.write(path + '\0')
2480
2377
dir, relpath = bzrdir.BzrDir.open_containing(location)
2481
2378
b = dir.open_branch()
2482
self.add_cleanup(b.lock_read().unlock)
2380
self.add_cleanup(b.unlock)
2483
2381
rev1, rev2 = _get_revision_range(revision, b, self.name())
2485
if b.get_config().validate_signatures_in_log():
2489
if not gpg.GPGStrategy.verify_signatures_available():
2490
raise errors.GpgmeNotInstalled(None)
2492
2383
# Decide on the type of delta & diff filtering to use
2493
2384
# TODO: add an --all-files option to make this configurable & consistent
2494
2385
if not verbose:
2538
2428
direction=direction, specific_fileids=file_ids,
2539
2429
start_revision=rev1, end_revision=rev2, limit=limit,
2540
2430
message_search=message, delta_type=delta_type,
2541
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2542
exclude_common_ancestry=exclude_common_ancestry,
2543
signature=signatures
2431
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2545
2432
Logger(b, rqst).show(lf)
2618
2505
tree, relpath = WorkingTree.open_containing(filename)
2619
2506
file_id = tree.path2id(relpath)
2620
2507
b = tree.branch
2621
self.add_cleanup(b.lock_read().unlock)
2509
self.add_cleanup(b.unlock)
2622
2510
touching_revs = log.find_touching_revisions(b, file_id)
2623
2511
for revno, revision_id, what in touching_revs:
2624
2512
self.outf.write("%6d %s\n" % (revno, what))
2627
2515
class cmd_ls(Command):
2628
__doc__ = """List files in a tree.
2516
"""List files in a tree.
2631
2519
_see_also = ['status', 'cat']
2637
2525
help='Recurse into subdirectories.'),
2638
2526
Option('from-root',
2639
2527
help='Print paths relative to the root of the branch.'),
2640
Option('unknown', short_name='u',
2641
help='Print unknown files.'),
2528
Option('unknown', help='Print unknown files.'),
2642
2529
Option('versioned', help='Print versioned files.',
2643
2530
short_name='V'),
2644
Option('ignored', short_name='i',
2645
help='Print ignored files.'),
2646
Option('kind', short_name='k',
2531
Option('ignored', help='Print ignored files.'),
2533
help='Write an ascii NUL (\\0) separator '
2534
'between files rather than a newline.'),
2647
2536
help='List entries of a particular kind: file, directory, symlink.',
2653
2540
@display_command
2654
2541
def run(self, revision=None, verbose=False,
2655
2542
recursive=False, from_root=False,
2656
2543
unknown=False, versioned=False, ignored=False,
2657
null=False, kind=None, show_ids=False, path=None, directory=None):
2544
null=False, kind=None, show_ids=False, path=None):
2659
2546
if kind and kind not in ('file', 'directory', 'symlink'):
2660
2547
raise errors.BzrCommandError('invalid kind specified')
2744
2632
class cmd_unknowns(Command):
2745
__doc__ = """List unknown files.
2633
"""List unknown files.
2749
2637
_see_also = ['ls']
2750
takes_options = ['directory']
2752
2639
@display_command
2753
def run(self, directory=u'.'):
2754
for f in WorkingTree.open_containing(directory)[0].unknowns():
2641
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2755
2642
self.outf.write(osutils.quotefn(f) + '\n')
2758
2645
class cmd_ignore(Command):
2759
__doc__ = """Ignore specified files or patterns.
2646
"""Ignore specified files or patterns.
2761
2648
See ``bzr help patterns`` for details on the syntax of patterns.
2832
2704
_see_also = ['status', 'ignored', 'patterns']
2833
2705
takes_args = ['name_pattern*']
2834
takes_options = ['directory',
2835
Option('default-rules',
2836
help='Display the default ignore rules that bzr uses.')
2707
Option('old-default-rules',
2708
help='Write out the ignore rules bzr < 0.9 always used.')
2839
def run(self, name_pattern_list=None, default_rules=None,
2711
def run(self, name_pattern_list=None, old_default_rules=None):
2841
2712
from bzrlib import ignores
2842
if default_rules is not None:
2843
# dump the default rules and exit
2844
for pattern in ignores.USER_DEFAULTS:
2713
if old_default_rules is not None:
2714
# dump the rules and exit
2715
for pattern in ignores.OLD_DEFAULTS:
2845
2716
self.outf.write("%s\n" % pattern)
2847
2718
if not name_pattern_list:
2848
2719
raise errors.BzrCommandError("ignore requires at least one "
2849
"NAME_PATTERN or --default-rules.")
2720
"NAME_PATTERN or --old-default-rules")
2850
2721
name_pattern_list = [globbing.normalize_pattern(p)
2851
2722
for p in name_pattern_list]
2853
for p in name_pattern_list:
2854
if not globbing.Globster.is_pattern_valid(p):
2855
bad_patterns += ('\n %s' % p)
2857
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2858
ui.ui_factory.show_error(msg)
2859
raise errors.InvalidPattern('')
2860
2723
for name_pattern in name_pattern_list:
2861
2724
if (name_pattern[0] == '/' or
2862
2725
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2863
2726
raise errors.BzrCommandError(
2864
2727
"NAME_PATTERN should not be an absolute path")
2865
tree, relpath = WorkingTree.open_containing(directory)
2728
tree, relpath = WorkingTree.open_containing(u'.')
2866
2729
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2867
2730
ignored = globbing.Globster(name_pattern_list)
2869
self.add_cleanup(tree.lock_read().unlock)
2870
2733
for entry in tree.list_files():
2872
2735
if id is not None:
2873
2736
filename = entry[0]
2874
2737
if ignored.match(filename):
2875
2738
matches.append(filename)
2876
2740
if len(matches) > 0:
2877
2741
self.outf.write("Warning: the following files are version controlled and"
2878
2742
" match your ignore pattern:\n%s"
2894
2758
encoding_type = 'replace'
2895
2759
_see_also = ['ignore', 'ls']
2896
takes_options = ['directory']
2898
2761
@display_command
2899
def run(self, directory=u'.'):
2900
tree = WorkingTree.open_containing(directory)[0]
2901
self.add_cleanup(tree.lock_read().unlock)
2763
tree = WorkingTree.open_containing(u'.')[0]
2765
self.add_cleanup(tree.unlock)
2902
2766
for path, file_class, kind, file_id, entry in tree.list_files():
2903
2767
if file_class != 'I':
2910
2774
class cmd_lookup_revision(Command):
2911
__doc__ = """Lookup the revision-id from a revision-number
2775
"""Lookup the revision-id from a revision-number
2914
2778
bzr lookup-revision 33
2917
2781
takes_args = ['revno']
2918
takes_options = ['directory']
2920
2783
@display_command
2921
def run(self, revno, directory=u'.'):
2784
def run(self, revno):
2923
2786
revno = int(revno)
2924
2787
except ValueError:
2925
2788
raise errors.BzrCommandError("not a valid revision-number: %r"
2927
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2790
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2928
2791
self.outf.write("%s\n" % revid)
2931
2794
class cmd_export(Command):
2932
__doc__ = """Export current or past revision to a destination directory or archive.
2795
"""Export current or past revision to a destination directory or archive.
2934
2797
If no revision is specified this exports the last committed revision.
2973
2835
'revision in which it was changed.'),
2975
2837
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2976
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2838
root=None, filters=False, per_file_timestamps=False):
2977
2839
from bzrlib.export import export
2979
2841
if branch_or_subdir is None:
2980
tree = WorkingTree.open_containing(directory)[0]
2842
tree = WorkingTree.open_containing(u'.')[0]
2981
2843
b = tree.branch
3014
2876
@display_command
3015
2877
def run(self, filename, revision=None, name_from_revision=False,
3016
filters=False, directory=None):
3017
2879
if revision is not None and len(revision) != 1:
3018
2880
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3019
2881
" one revision specifier")
3020
2882
tree, branch, relpath = \
3021
_open_directory_or_containing_tree_or_branch(filename, directory)
3022
self.add_cleanup(branch.lock_read().unlock)
2883
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2885
self.add_cleanup(branch.unlock)
3023
2886
return self._run(tree, branch, relpath, filename, revision,
3024
2887
name_from_revision, filters)
3140
3004
to trigger updates to external systems like bug trackers. The --fixes
3141
3005
option can be used to record the association between a revision and
3142
3006
one or more bugs. See ``bzr help bugs`` for details.
3008
A selective commit may fail in some cases where the committed
3009
tree would be invalid. Consider::
3014
bzr commit foo -m "committing foo"
3015
bzr mv foo/bar foo/baz
3018
bzr commit foo/bar -m "committing bar but not baz"
3020
In the example above, the last commit will fail by design. This gives
3021
the user the opportunity to decide whether they want to commit the
3022
rename at the same time, separately first, or not at all. (As a general
3023
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3025
# TODO: Run hooks on tree to-be-committed, and after commit.
3027
# TODO: Strict commit that fails if there are deleted files.
3028
# (what does "deleted files" mean ??)
3030
# TODO: Give better message for -s, --summary, used by tla people
3032
# XXX: verbose currently does nothing
3145
3034
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3146
3035
takes_args = ['selected*']
3207
3092
def run(self, message=None, file=None, verbose=False, selected_list=None,
3208
3093
unchanged=False, strict=False, local=False, fixes=None,
3209
author=None, show_diff=False, exclude=None, commit_time=None,
3094
author=None, show_diff=False, exclude=None, commit_time=None):
3211
3095
from bzrlib.errors import (
3212
3096
PointlessCommit,
3213
3097
ConflictsInTree,
3228
3111
raise errors.BzrCommandError(
3229
3112
"Could not parse --commit-time: " + str(e))
3114
# TODO: Need a blackbox test for invoking the external editor; may be
3115
# slightly problematic to run this cross-platform.
3117
# TODO: do more checks that the commit will succeed before
3118
# spending the user's valuable time typing a commit message.
3231
3120
properties = {}
3233
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3122
tree, selected_list = tree_files(selected_list)
3234
3123
if selected_list == ['']:
3235
3124
# workaround - commit of root of tree should be exactly the same
3236
3125
# as just default commit in that tree, and succeed even though
3289
3175
# make_commit_message_template_encoded returns user encoding.
3290
3176
# We probably want to be using edit_commit_message instead to
3292
my_message = set_commit_message(commit_obj)
3293
if my_message is None:
3294
start_message = generate_commit_message_template(commit_obj)
3295
my_message = edit_commit_message_encoded(text,
3296
start_message=start_message)
3178
start_message = generate_commit_message_template(commit_obj)
3179
my_message = edit_commit_message_encoded(text,
3180
start_message=start_message)
3297
3181
if my_message is None:
3298
3182
raise errors.BzrCommandError("please specify a commit"
3299
3183
" message with either --message or --file")
3312
3196
reporter=None, verbose=verbose, revprops=properties,
3313
3197
authors=author, timestamp=commit_stamp,
3314
3198
timezone=offset,
3315
exclude=tree.safe_relpath_files(exclude),
3199
exclude=safe_relpath_files(tree, exclude))
3317
3200
except PointlessCommit:
3318
3201
raise errors.BzrCommandError("No changes to commit."
3319
" Please 'bzr add' the files you want to commit, or use"
3320
" --unchanged to force an empty commit.")
3202
" Use --unchanged to commit anyhow.")
3321
3203
except ConflictsInTree:
3322
3204
raise errors.BzrCommandError('Conflicts detected in working '
3323
3205
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3406
3288
class cmd_upgrade(Command):
3407
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3409
When the default format has changed after a major new release of
3410
Bazaar, you may be informed during certain operations that you
3411
should upgrade. Upgrading to a newer format may improve performance
3412
or make new features available. It may however limit interoperability
3413
with older repositories or with older versions of Bazaar.
3415
If you wish to upgrade to a particular format rather than the
3416
current default, that can be specified using the --format option.
3417
As a consequence, you can use the upgrade command this way to
3418
"downgrade" to an earlier format, though some conversions are
3419
a one way process (e.g. changing from the 1.x default to the
3420
2.x default) so downgrading is not always possible.
3422
A backup.bzr.~#~ directory is created at the start of the conversion
3423
process (where # is a number). By default, this is left there on
3424
completion. If the conversion fails, delete the new .bzr directory
3425
and rename this one back in its place. Use the --clean option to ask
3426
for the backup.bzr directory to be removed on successful conversion.
3427
Alternatively, you can delete it by hand if everything looks good
3430
If the location given is a shared repository, dependent branches
3431
are also converted provided the repository converts successfully.
3432
If the conversion of a branch fails, remaining branches are still
3435
For more information on upgrades, see the Bazaar Upgrade Guide,
3436
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3289
"""Upgrade branch storage to current format.
3291
The check command or bzr developers may sometimes advise you to run
3292
this command. When the default format has changed you may also be warned
3293
during other operations to upgrade.
3439
_see_also = ['check', 'reconcile', 'formats']
3296
_see_also = ['check']
3440
3297
takes_args = ['url?']
3441
3298
takes_options = [
3442
RegistryOption('format',
3443
help='Upgrade to a specific format. See "bzr help'
3444
' formats" for details.',
3445
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3446
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3447
value_switches=True, title='Branch format'),
3449
help='Remove the backup.bzr directory if successful.'),
3451
help="Show what would be done, but don't actually do anything."),
3299
RegistryOption('format',
3300
help='Upgrade to a specific format. See "bzr help'
3301
' formats" for details.',
3302
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3303
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3304
value_switches=True, title='Branch format'),
3454
def run(self, url='.', format=None, clean=False, dry_run=False):
3307
def run(self, url='.', format=None):
3455
3308
from bzrlib.upgrade import upgrade
3456
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3458
if len(exceptions) == 1:
3459
# Compatibility with historical behavior
3309
upgrade(url, format)
3465
3312
class cmd_whoami(Command):
3466
__doc__ = """Show or set bzr user id.
3313
"""Show or set bzr user id.
3469
3316
Show the email of the current user::
3485
3331
encoding_type = 'replace'
3487
3333
@display_command
3488
def run(self, email=False, branch=False, name=None, directory=None):
3334
def run(self, email=False, branch=False, name=None):
3489
3335
if name is None:
3490
if directory is None:
3491
# use branch if we're inside one; otherwise global config
3493
c = Branch.open_containing(u'.')[0].get_config()
3494
except errors.NotBranchError:
3495
c = _mod_config.GlobalConfig()
3497
c = Branch.open(directory).get_config()
3336
# use branch if we're inside one; otherwise global config
3338
c = Branch.open_containing('.')[0].get_config()
3339
except errors.NotBranchError:
3340
c = config.GlobalConfig()
3499
3342
self.outf.write(c.user_email() + '\n')
3501
3344
self.outf.write(c.username() + '\n')
3505
raise errors.BzrCommandError("--email can only be used to display existing "
3508
3347
# display a warning if an email address isn't included in the given name.
3510
_mod_config.extract_email_address(name)
3349
config.extract_email_address(name)
3511
3350
except errors.NoEmailInUsername, e:
3512
3351
warning('"%s" does not seem to contain an email address. '
3513
3352
'This is allowed, but not recommended.', name)
3515
3354
# use global config unless --branch given
3517
if directory is None:
3518
c = Branch.open_containing(u'.')[0].get_config()
3520
c = Branch.open(directory).get_config()
3356
c = Branch.open_containing('.')[0].get_config()
3522
c = _mod_config.GlobalConfig()
3358
c = config.GlobalConfig()
3523
3359
c.set_user_option('email', name)
3526
3362
class cmd_nick(Command):
3527
__doc__ = """Print or set the branch nickname.
3363
"""Print or set the branch nickname.
3529
3365
If unset, the tree root directory name is used as the nickname.
3530
3366
To print the current nickname, execute with no argument.
3592
3427
'bzr alias --remove expects an alias to remove.')
3593
3428
# If alias is not found, print something like:
3594
3429
# unalias: foo: not found
3595
c = _mod_config.GlobalConfig()
3430
c = config.GlobalConfig()
3596
3431
c.unset_alias(alias_name)
3598
3433
@display_command
3599
3434
def print_aliases(self):
3600
3435
"""Print out the defined aliases in a similar format to bash."""
3601
aliases = _mod_config.GlobalConfig().get_aliases()
3436
aliases = config.GlobalConfig().get_aliases()
3602
3437
for key, value in sorted(aliases.iteritems()):
3603
3438
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3615
3450
def set_alias(self, alias_name, alias_command):
3616
3451
"""Save the alias in the global config."""
3617
c = _mod_config.GlobalConfig()
3452
c = config.GlobalConfig()
3618
3453
c.set_alias(alias_name, alias_command)
3621
3456
class cmd_selftest(Command):
3622
__doc__ = """Run internal test suite.
3457
"""Run internal test suite.
3624
3459
If arguments are given, they are regular expressions that say which tests
3625
3460
should run. Tests matching any expression are run, and other tests are
3674
3506
if typestring == "sftp":
3675
3507
from bzrlib.tests import stub_sftp
3676
3508
return stub_sftp.SFTPAbsoluteServer
3677
elif typestring == "memory":
3509
if typestring == "memory":
3678
3510
from bzrlib.tests import test_server
3679
3511
return memory.MemoryServer
3680
elif typestring == "fakenfs":
3512
if typestring == "fakenfs":
3681
3513
from bzrlib.tests import test_server
3682
3514
return test_server.FakeNFSServer
3683
3515
msg = "No known transport type %s. Supported types are: sftp\n" %\
3696
3528
'throughout the test suite.',
3697
3529
type=get_transport_type),
3698
3530
Option('benchmark',
3699
help='Run the benchmarks rather than selftests.',
3531
help='Run the benchmarks rather than selftests.'),
3701
3532
Option('lsprof-timed',
3702
3533
help='Generate lsprof output for benchmarked'
3703
3534
' sections of code.'),
3704
3535
Option('lsprof-tests',
3705
3536
help='Generate lsprof output for each test.'),
3537
Option('cache-dir', type=str,
3538
help='Cache intermediate benchmark output in this '
3706
3540
Option('first',
3707
3541
help='Run all tests, but run specified tests first.',
3708
3542
short_name='f',
3717
3551
Option('randomize', type=str, argname="SEED",
3718
3552
help='Randomize the order of tests using the given'
3719
3553
' seed or "now" for the current time.'),
3720
ListOption('exclude', type=str, argname="PATTERN",
3722
help='Exclude tests that match this regular'
3554
Option('exclude', type=str, argname="PATTERN",
3556
help='Exclude tests that match this regular'
3724
3558
Option('subunit',
3725
3559
help='Output test progress via subunit.'),
3726
3560
Option('strict', help='Fail on missing dependencies or '
3746
3577
def run(self, testspecs_list=None, verbose=False, one=False,
3747
3578
transport=None, benchmark=None,
3579
lsprof_timed=None, cache_dir=None,
3749
3580
first=False, list_only=False,
3750
3581
randomize=None, exclude=None, strict=False,
3751
3582
load_list=None, debugflag=None, starting_with=None, subunit=False,
3752
parallel=None, lsprof_tests=False,
3754
from bzrlib import tests
3583
parallel=None, lsprof_tests=False):
3584
from bzrlib.tests import selftest
3585
import bzrlib.benchmarks as benchmarks
3586
from bzrlib.benchmarks import tree_creator
3588
# Make deprecation warnings visible, unless -Werror is set
3589
symbol_versioning.activate_deprecation_warnings(override=False)
3591
if cache_dir is not None:
3592
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3756
3593
if testspecs_list is not None:
3757
3594
pattern = '|'.join(testspecs_list)
3764
3601
raise errors.BzrCommandError("subunit not available. subunit "
3765
3602
"needs to be installed to use --subunit.")
3766
3603
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3767
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3768
# stdout, which would corrupt the subunit stream.
3769
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3770
# following code can be deleted when it's sufficiently deployed
3771
# -- vila/mgz 20100514
3772
if (sys.platform == "win32"
3773
and getattr(sys.stdout, 'fileno', None) is not None):
3775
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3777
3605
self.additional_selftest_args.setdefault(
3778
3606
'suite_decorators', []).append(parallel)
3780
raise errors.BzrCommandError(
3781
"--benchmark is no longer supported from bzr 2.2; "
3782
"use bzr-usertest instead")
3783
test_suite_factory = None
3785
exclude_pattern = None
3608
test_suite_factory = benchmarks.test_suite
3609
# Unless user explicitly asks for quiet, be verbose in benchmarks
3610
verbose = not is_quiet()
3611
# TODO: should possibly lock the history file...
3612
benchfile = open(".perf_history", "at", buffering=1)
3613
self.add_cleanup(benchfile.close)
3787
exclude_pattern = '(' + '|'.join(exclude) + ')'
3789
self._disable_fsync()
3615
test_suite_factory = None
3790
3617
selftest_kwargs = {"verbose": verbose,
3791
3618
"pattern": pattern,
3792
3619
"stop_on_failure": one,
3794
3621
"test_suite_factory": test_suite_factory,
3795
3622
"lsprof_timed": lsprof_timed,
3796
3623
"lsprof_tests": lsprof_tests,
3624
"bench_history": benchfile,
3797
3625
"matching_tests_first": first,
3798
3626
"list_only": list_only,
3799
3627
"random_seed": randomize,
3800
"exclude_pattern": exclude_pattern,
3628
"exclude_pattern": exclude,
3801
3629
"strict": strict,
3802
3630
"load_list": load_list,
3803
3631
"debug_flags": debugflag,
3804
3632
"starting_with": starting_with
3806
3634
selftest_kwargs.update(self.additional_selftest_args)
3808
# Make deprecation warnings visible, unless -Werror is set
3809
cleanup = symbol_versioning.activate_deprecation_warnings(
3812
result = tests.selftest(**selftest_kwargs)
3635
result = selftest(**selftest_kwargs)
3815
3636
return int(not result)
3817
def _disable_fsync(self):
3818
"""Change the 'os' functionality to not synchronize."""
3819
self._orig_fsync = getattr(os, 'fsync', None)
3820
if self._orig_fsync is not None:
3821
os.fsync = lambda filedes: None
3822
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3823
if self._orig_fdatasync is not None:
3824
os.fdatasync = lambda filedes: None
3827
3639
class cmd_version(Command):
3828
__doc__ = """Show version of bzr."""
3640
"""Show version of bzr."""
3830
3642
encoding_type = 'replace'
3831
3643
takes_options = [
3878
3692
class cmd_merge(Command):
3879
__doc__ = """Perform a three-way merge.
3693
"""Perform a three-way merge.
3881
3695
The source of the merge can be specified either in the form of a branch,
3882
3696
or in the form of a path to a file containing a merge directive generated
3883
3697
with bzr send. If neither is specified, the default is the upstream branch
3884
or the branch most recently merged using --remember. The source of the
3885
merge may also be specified in the form of a path to a file in another
3886
branch: in this case, only the modifications to that file are merged into
3887
the current working tree.
3889
When merging from a branch, by default bzr will try to merge in all new
3890
work from the other branch, automatically determining an appropriate base
3891
revision. If this fails, you may need to give an explicit base.
3893
To pick a different ending revision, pass "--revision OTHER". bzr will
3894
try to merge in all new work up to and including revision OTHER.
3896
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3897
through OTHER, excluding BASE but including OTHER, will be merged. If this
3898
causes some revisions to be skipped, i.e. if the destination branch does
3899
not already contain revision BASE, such a merge is commonly referred to as
3900
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3901
cherrypicks. The changes look like a normal commit, and the history of the
3902
changes from the other branch is not stored in the commit.
3904
Revision numbers are always relative to the source branch.
3698
or the branch most recently merged using --remember.
3700
When merging a branch, by default the tip will be merged. To pick a different
3701
revision, pass --revision. If you specify two values, the first will be used as
3702
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3703
available revisions, like this is commonly referred to as "cherrypicking".
3705
Revision numbers are always relative to the branch being merged.
3707
By default, bzr will try to merge in all new work from the other
3708
branch, automatically determining an appropriate base. If this
3709
fails, you may need to give an explicit base.
3906
3711
Merge will do its best to combine the changes in two branches, but there
3907
3712
are some kinds of problems only a human can fix. When it encounters those,
3911
3716
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3913
If there is no default branch set, the first merge will set it (use
3914
--no-remember to avoid settting it). After that, you can omit the branch
3915
to use the default. To change the default, use --remember. The value will
3916
only be saved if the remote location can be accessed.
3718
If there is no default branch set, the first merge will set it. After
3719
that, you can omit the branch to use the default. To change the
3720
default, use --remember. The value will only be saved if the remote
3721
location can be accessed.
3918
3723
The results of the merge are placed into the destination working
3919
3724
directory, where they can be reviewed (with bzr diff), tested, and then
3920
3725
committed to record the result of the merge.
3922
3727
merge refuses to run if there are any uncommitted changes, unless
3923
--force is given. If --force is given, then the changes from the source
3924
will be merged with the current working tree, including any uncommitted
3925
changes in the tree. The --force option can also be used to create a
3728
--force is given. The --force option can also be used to create a
3926
3729
merge revision which has more than two parents.
3928
3731
If one would like to merge changes from the working tree of the other
3976
3779
' completely merged into the source, pull from the'
3977
3780
' source rather than merging. When this happens,'
3978
3781
' you do not need to commit the result.'),
3979
custom_help('directory',
3980
3783
help='Branch to merge into, '
3981
'rather than the one containing the working directory.'),
3784
'rather than the one containing the working directory.',
3982
3788
Option('preview', help='Instead of merging, show a diff of the'
3984
3790
Option('interactive', help='Select changes interactively.',
4056
3859
self.sanity_check_merger(merger)
4057
3860
if (merger.base_rev_id == merger.other_rev_id and
4058
3861
merger.other_rev_id is not None):
4059
# check if location is a nonexistent file (and not a branch) to
4060
# disambiguate the 'Nothing to do'
4061
if merger.interesting_files:
4062
if not merger.other_tree.has_filename(
4063
merger.interesting_files[0]):
4064
note("merger: " + str(merger))
4065
raise errors.PathsDoNotExist([location])
4066
3862
note('Nothing to do.')
4068
if pull and not preview:
4069
3865
if merger.interesting_files is not None:
4070
3866
raise errors.BzrCommandError('Cannot pull individual files')
4071
3867
if (merger.base_rev_id == tree.last_revision()):
4095
3891
def _do_preview(self, merger):
4096
3892
from bzrlib.diff import show_diff_trees
4097
3893
result_tree = self._get_preview(merger)
4098
path_encoding = osutils.get_diff_header_encoding()
4099
3894
show_diff_trees(merger.this_tree, result_tree, self.outf,
4100
old_label='', new_label='',
4101
path_encoding=path_encoding)
3895
old_label='', new_label='')
4103
3897
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4104
3898
merger.change_reporter = change_reporter
4180
3974
if other_revision_id is None:
4181
3975
other_revision_id = _mod_revision.ensure_null(
4182
3976
other_branch.last_revision())
4183
# Remember where we merge from. We need to remember if:
4184
# - user specify a location (and we don't merge from the parent
4186
# - user ask to remember or there is no previous location set to merge
4187
# from and user didn't ask to *not* remember
4188
if (user_location is not None
4190
or (remember is None
4191
and tree.branch.get_submit_branch() is None)))):
3977
# Remember where we merge from
3978
if ((remember or tree.branch.get_submit_branch() is None) and
3979
user_location is not None):
4192
3980
tree.branch.set_submit_branch(other_branch.base)
4193
# Merge tags (but don't set them in the master branch yet, the user
4194
# might revert this merge). Commit will propagate them.
4195
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3981
_merge_tags_if_possible(other_branch, tree.branch)
4196
3982
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4197
3983
other_revision_id, base_revision_id, other_branch, base_branch)
4198
3984
if other_path != '':
4361
4148
class cmd_revert(Command):
4362
__doc__ = """Revert files to a previous revision.
4149
"""Revert files to a previous revision.
4364
4151
Giving a list of files will revert only those files. Otherwise, all files
4365
4152
will be reverted. If the revision is not specified with '--revision', the
4366
4153
last committed revision is used.
4368
4155
To remove only some changes, without reverting to a prior version, use
4369
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4370
will remove the changes introduced by the second last commit (-2), without
4371
affecting the changes introduced by the last commit (-1). To remove
4372
certain changes on a hunk-by-hunk basis, see the shelve command.
4156
merge instead. For example, "merge . --revision -2..-3" will remove the
4157
changes introduced by -2, without affecting the changes introduced by -1.
4158
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4374
4160
By default, any files that have been manually changed will be backed up
4375
4161
first. (Files changed only by merge are not backed up.) Backup files have
4540
4326
theirs_only=False,
4541
4327
log_format=None, long=False, short=False, line=False,
4542
4328
show_ids=False, verbose=False, this=False, other=False,
4543
include_merges=False, revision=None, my_revision=None,
4329
include_merges=False, revision=None, my_revision=None):
4545
4330
from bzrlib.missing import find_unmerged, iter_log_revisions
4546
4331
def message(s):
4547
4332
if not is_quiet():
4649
4437
class cmd_pack(Command):
4650
__doc__ = """Compress the data within a repository.
4652
This operation compresses the data within a bazaar repository. As
4653
bazaar supports automatic packing of repository, this operation is
4654
normally not required to be done manually.
4656
During the pack operation, bazaar takes a backup of existing repository
4657
data, i.e. pack files. This backup is eventually removed by bazaar
4658
automatically when it is safe to do so. To save disk space by removing
4659
the backed up pack files, the --clean-obsolete-packs option may be
4662
Warning: If you use --clean-obsolete-packs and your machine crashes
4663
during or immediately after repacking, you may be left with a state
4664
where the deletion has been written to disk but the new packs have not
4665
been. In this case the repository may be unusable.
4438
"""Compress the data within a repository."""
4668
4440
_see_also = ['repositories']
4669
4441
takes_args = ['branch_or_repo?']
4671
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4674
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4443
def run(self, branch_or_repo='.'):
4675
4444
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4677
4446
branch = dir.open_branch()
4678
4447
repository = branch.repository
4679
4448
except errors.NotBranchError:
4680
4449
repository = dir.open_repository()
4681
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4684
4453
class cmd_plugins(Command):
4685
__doc__ = """List the installed plugins.
4454
"""List the installed plugins.
4687
4456
This command displays the list of installed plugins including
4688
4457
version of plugin and a short description of each.
4705
4474
@display_command
4706
4475
def run(self, verbose=False):
4707
from bzrlib import plugin
4708
# Don't give writelines a generator as some codecs don't like that
4709
self.outf.writelines(
4710
list(plugin.describe_plugins(show_paths=verbose)))
4476
import bzrlib.plugin
4477
from inspect import getdoc
4479
for name, plugin in bzrlib.plugin.plugins().items():
4480
version = plugin.__version__
4481
if version == 'unknown':
4483
name_ver = '%s %s' % (name, version)
4484
d = getdoc(plugin.module)
4486
doc = d.split('\n')[0]
4488
doc = '(no description)'
4489
result.append((name_ver, doc, plugin.path()))
4490
for name_ver, doc, path in sorted(result):
4491
self.outf.write("%s\n" % name_ver)
4492
self.outf.write(" %s\n" % doc)
4494
self.outf.write(" %s\n" % path)
4495
self.outf.write("\n")
4713
4498
class cmd_testament(Command):
4714
__doc__ = """Show testament (signing-form) of a revision."""
4499
"""Show testament (signing-form) of a revision."""
4715
4500
takes_options = [
4717
4502
Option('long', help='Produce long-format testament.'),
4718
4503
Option('strict',
4719
4504
help='Produce a strict-format testament.')]
4720
4505
takes_args = ['branch?']
4721
encoding_type = 'exact'
4722
4506
@display_command
4723
4507
def run(self, branch=u'.', revision=None, long=False, strict=False):
4724
4508
from bzrlib.testament import Testament, StrictTestament
4730
4514
b = Branch.open_containing(branch)[0]
4732
4516
b = Branch.open(branch)
4733
self.add_cleanup(b.lock_read().unlock)
4518
self.add_cleanup(b.unlock)
4734
4519
if revision is None:
4735
4520
rev_id = b.last_revision()
4737
4522
rev_id = revision[0].as_revision_id(b)
4738
4523
t = testament_class.from_revision(b.repository, rev_id)
4740
self.outf.writelines(t.as_text_lines())
4525
sys.stdout.writelines(t.as_text_lines())
4742
self.outf.write(t.as_short_text())
4527
sys.stdout.write(t.as_short_text())
4745
4530
class cmd_annotate(Command):
4746
__doc__ = """Show the origin of each line in a file.
4531
"""Show the origin of each line in a file.
4748
4533
This prints out the given file with an annotation on the left side
4749
4534
indicating which revision, author and date introduced the change.
4760
4545
Option('long', help='Show commit date in annotations.'),
4765
4549
encoding_type = 'exact'
4767
4551
@display_command
4768
4552
def run(self, filename, all=False, long=False, revision=None,
4769
show_ids=False, directory=None):
4770
from bzrlib.annotate import (
4554
from bzrlib.annotate import annotate_file, annotate_file_tree
4773
4555
wt, branch, relpath = \
4774
_open_directory_or_containing_tree_or_branch(filename, directory)
4556
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4775
4557
if wt is not None:
4776
self.add_cleanup(wt.lock_read().unlock)
4559
self.add_cleanup(wt.unlock)
4778
self.add_cleanup(branch.lock_read().unlock)
4562
self.add_cleanup(branch.unlock)
4779
4563
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4780
self.add_cleanup(tree.lock_read().unlock)
4781
if wt is not None and revision is None:
4565
self.add_cleanup(tree.unlock)
4782
4567
file_id = wt.path2id(relpath)
4784
4569
file_id = tree.path2id(relpath)
4785
4570
if file_id is None:
4786
4571
raise errors.NotVersionedError(filename)
4572
file_version = tree.inventory[file_id].revision
4787
4573
if wt is not None and revision is None:
4788
4574
# If there is a tree and we're not annotating historical
4789
4575
# versions, annotate the working tree's content.
4790
4576
annotate_file_tree(wt, file_id, self.outf, long, all,
4791
4577
show_ids=show_ids)
4793
annotate_file_tree(tree, file_id, self.outf, long, all,
4794
show_ids=show_ids, branch=branch)
4579
annotate_file(branch, file_version, file_id, long, all, self.outf,
4797
4583
class cmd_re_sign(Command):
4798
__doc__ = """Create a digital signature for an existing revision."""
4584
"""Create a digital signature for an existing revision."""
4799
4585
# TODO be able to replace existing ones.
4801
4587
hidden = True # is this right ?
4802
4588
takes_args = ['revision_id*']
4803
takes_options = ['directory', 'revision']
4589
takes_options = ['revision']
4805
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4591
def run(self, revision_id_list=None, revision=None):
4806
4592
if revision_id_list is not None and revision is not None:
4807
4593
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4808
4594
if revision_id_list is None and revision is None:
4809
4595
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4810
b = WorkingTree.open_containing(directory)[0].branch
4811
self.add_cleanup(b.lock_write().unlock)
4596
b = WorkingTree.open_containing(u'.')[0].branch
4598
self.add_cleanup(b.unlock)
4812
4599
return self._run(b, revision_id_list, revision)
4814
4601
def _run(self, b, revision_id_list, revision):
4910
4696
_see_also = ['checkouts', 'bind']
4911
4697
takes_args = []
4912
takes_options = ['directory']
4914
def run(self, directory=u'.'):
4915
b, relpath = Branch.open_containing(directory)
4701
b, relpath = Branch.open_containing(u'.')
4916
4702
if not b.unbind():
4917
4703
raise errors.BzrCommandError('Local branch is not bound')
4920
4706
class cmd_uncommit(Command):
4921
__doc__ = """Remove the last committed revision.
4707
"""Remove the last committed revision.
4923
4709
--verbose will print out what is being removed.
4924
4710
--dry-run will go through all the motions, but not actually
4964
4750
b = control.open_branch()
4966
4752
if tree is not None:
4967
self.add_cleanup(tree.lock_write().unlock)
4754
self.add_cleanup(tree.unlock)
4969
self.add_cleanup(b.lock_write().unlock)
4757
self.add_cleanup(b.unlock)
4970
4758
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4972
4760
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5043
4825
bzr break-lock bzr+ssh://example.com/bzr/foo
5044
bzr break-lock --conf ~/.bazaar
5047
4827
takes_args = ['location?']
5050
help='LOCATION is the directory where the config lock is.'),
5052
help='Do not ask for confirmation before breaking the lock.'),
5055
def run(self, location=None, config=False, force=False):
4829
def run(self, location=None, show=False):
5056
4830
if location is None:
5057
4831
location = u'.'
5059
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5061
{'bzrlib.lockdir.break': True})
5063
conf = _mod_config.LockableConfig(file_name=location)
5066
control, relpath = bzrdir.BzrDir.open_containing(location)
5068
control.break_lock()
5069
except NotImplementedError:
4832
control, relpath = bzrdir.BzrDir.open_containing(location)
4834
control.break_lock()
4835
except NotImplementedError:
5073
4839
class cmd_wait_until_signalled(Command):
5074
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5076
4842
This just prints a line to signal when it is ready, then blocks on stdin.
5137
4904
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5138
4905
protocol=None):
5139
from bzrlib import transport
4906
from bzrlib.transport import get_transport, transport_server_registry
5140
4907
if directory is None:
5141
4908
directory = os.getcwd()
5142
4909
if protocol is None:
5143
protocol = transport.transport_server_registry.get()
4910
protocol = transport_server_registry.get()
5144
4911
host, port = self.get_host_and_port(port)
5145
4912
url = urlutils.local_path_to_url(directory)
5146
4913
if not allow_writes:
5147
4914
url = 'readonly+' + url
5148
t = transport.get_transport(url)
5149
protocol(t, host, port, inet)
4915
transport = get_transport(url)
4916
protocol(transport, host, port, inet)
5152
4919
class cmd_join(Command):
5153
__doc__ = """Combine a tree into its containing tree.
4920
"""Combine a tree into its containing tree.
5155
4922
This command requires the target tree to be in a rich-root format.
5264
5030
encoding_type = 'exact'
5266
5032
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5267
sign=False, revision=None, mail_to=None, message=None,
5033
sign=False, revision=None, mail_to=None, message=None):
5269
5034
from bzrlib.revision import ensure_null, NULL_REVISION
5270
5035
include_patch, include_bundle = {
5271
5036
'plain': (False, False),
5272
5037
'diff': (True, False),
5273
5038
'bundle': (True, True),
5275
branch = Branch.open(directory)
5040
branch = Branch.open('.')
5276
5041
stored_submit_branch = branch.get_submit_branch()
5277
5042
if submit_branch is None:
5278
5043
submit_branch = stored_submit_branch
5354
5119
source branch defaults to that containing the working directory, but can
5355
5120
be changed using --from.
5357
Both the submit branch and the public branch follow the usual behavior with
5358
respect to --remember: If there is no default location set, the first send
5359
will set it (use --no-remember to avoid settting it). After that, you can
5360
omit the location to use the default. To change the default, use
5361
--remember. The value will only be saved if the location can be accessed.
5363
5122
In order to calculate those changes, bzr must analyse the submit branch.
5364
5123
Therefore it is most efficient for the submit branch to be a local mirror.
5365
5124
If a public location is known for the submit_branch, that location is used
5436
5195
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5437
no_patch=False, revision=None, remember=None, output=None,
5196
no_patch=False, revision=None, remember=False, output=None,
5438
5197
format=None, mail_to=None, message=None, body=None,
5439
5198
strict=None, **kwargs):
5440
5199
from bzrlib.send import send
5584
5347
if (not force) and branch.tags.has_tag(tag_name):
5585
5348
raise errors.TagAlreadyExists(tag_name)
5586
5349
branch.tags.set_tag(tag_name, revision_id)
5587
note('Created tag %s.' % tag_name)
5350
self.outf.write('Created tag %s.\n' % tag_name)
5590
5353
class cmd_tags(Command):
5591
__doc__ = """List tags.
5593
5356
This command shows a table of tag names and the revisions they reference.
5596
5359
_see_also = ['tag']
5597
5360
takes_options = [
5598
custom_help('directory',
5599
help='Branch whose tags should be displayed.'),
5600
RegistryOption('sort',
5362
help='Branch whose tags should be displayed.',
5366
RegistryOption.from_kwargs('sort',
5601
5367
'Sort tags by different criteria.', title='Sorting',
5602
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5368
alpha='Sort tags lexicographically (default).',
5369
time='Sort tags chronologically.',
5608
5375
@display_command
5609
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5610
from bzrlib.tag import tag_sort_methods
5611
5382
branch, relpath = Branch.open_containing(directory)
5613
5384
tags = branch.tags.get_tag_dict().items()
5617
self.add_cleanup(branch.lock_read().unlock)
5389
self.add_cleanup(branch.unlock)
5619
# Restrict to the specified range
5620
tags = self._tags_for_range(branch, revision)
5622
sort = tag_sort_methods.get()
5391
graph = branch.repository.get_graph()
5392
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5393
revid1, revid2 = rev1.rev_id, rev2.rev_id
5394
# only show revisions between revid1 and revid2 (inclusive)
5395
tags = [(tag, revid) for tag, revid in tags if
5396
graph.is_between(revid, revid1, revid2)]
5399
elif sort == 'time':
5401
for tag, revid in tags:
5403
revobj = branch.repository.get_revision(revid)
5404
except errors.NoSuchRevision:
5405
timestamp = sys.maxint # place them at the end
5407
timestamp = revobj.timestamp
5408
timestamps[revid] = timestamp
5409
tags.sort(key=lambda x: timestamps[x[1]])
5624
5410
if not show_ids:
5625
5411
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5626
5412
for index, (tag, revid) in enumerate(tags):
5637
5423
for tag, revspec in tags:
5638
5424
self.outf.write('%-20s %s\n' % (tag, revspec))
5640
def _tags_for_range(self, branch, revision):
5642
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5643
revid1, revid2 = rev1.rev_id, rev2.rev_id
5644
# _get_revision_range will always set revid2 if it's not specified.
5645
# If revid1 is None, it means we want to start from the branch
5646
# origin which is always a valid ancestor. If revid1 == revid2, the
5647
# ancestry check is useless.
5648
if revid1 and revid1 != revid2:
5649
# FIXME: We really want to use the same graph than
5650
# branch.iter_merge_sorted_revisions below, but this is not
5651
# easily available -- vila 2011-09-23
5652
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5653
# We don't want to output anything in this case...
5655
# only show revisions between revid1 and revid2 (inclusive)
5656
tagged_revids = branch.tags.get_reverse_tag_dict()
5658
for r in branch.iter_merge_sorted_revisions(
5659
start_revision_id=revid2, stop_revision_id=revid1,
5660
stop_rule='include'):
5661
revid_tags = tagged_revids.get(r[0], None)
5663
found.extend([(tag, r[0]) for tag in revid_tags])
5667
5427
class cmd_reconfigure(Command):
5668
__doc__ = """Reconfigure the type of a bzr directory.
5428
"""Reconfigure the type of a bzr directory.
5670
5430
A target configuration must be specified.
5791
5550
def run(self, to_location=None, force=False, create_branch=False,
5792
revision=None, directory=u'.'):
5793
5552
from bzrlib import switch
5794
tree_location = directory
5795
5554
revision = _get_one_revision('switch', revision)
5796
5555
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5797
5556
if to_location is None:
5798
5557
if revision is None:
5799
5558
raise errors.BzrCommandError('You must supply either a'
5800
5559
' revision or a location')
5801
to_location = tree_location
5803
5562
branch = control_dir.open_branch()
5804
5563
had_explicit_nick = branch.get_config().has_explicit_nickname()
6076
5834
You can put multiple items on the shelf, and by default, 'unshelve' will
6077
5835
restore the most recently shelved changes.
6079
For complicated changes, it is possible to edit the changes in a separate
6080
editor program to decide what the file remaining in the working copy
6081
should look like. To do this, add the configuration option
6083
change_editor = PROGRAM @new_path @old_path
6085
where @new_path is replaced with the path of the new version of the
6086
file and @old_path is replaced with the path of the old version of
6087
the file. The PROGRAM should save the new file with the desired
6088
contents of the file in the working tree.
6092
5838
takes_args = ['file*']
6094
5840
takes_options = [
6097
5842
Option('all', help='Shelve all changes.'),
6104
5849
Option('destroy',
6105
5850
help='Destroy removed changes instead of shelving them.'),
6107
_see_also = ['unshelve', 'configuration']
5852
_see_also = ['unshelve']
6109
5854
def run(self, revision=None, all=False, file_list=None, message=None,
6110
writer=None, list=False, destroy=False, directory=None):
5855
writer=None, list=False, destroy=False):
6112
return self.run_for_list(directory=directory)
5857
return self.run_for_list()
6113
5858
from bzrlib.shelf_ui import Shelver
6114
5859
if writer is None:
6115
5860
writer = bzrlib.option.diff_writer_registry.get()
6117
5862
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6118
file_list, message, destroy=destroy, directory=directory)
5863
file_list, message, destroy=destroy)
6190
5933
To check what clean-tree will do, use --dry-run.
6192
takes_options = ['directory',
6193
Option('ignored', help='Delete all ignored files.'),
6194
Option('detritus', help='Delete conflict files, merge and revert'
5935
takes_options = [Option('ignored', help='Delete all ignored files.'),
5936
Option('detritus', help='Delete conflict files, merge'
6195
5937
' backups, and failed selftest dirs.'),
6196
5938
Option('unknown',
6197
5939
help='Delete files unknown to bzr (default).'),
6199
5941
' deleting them.'),
6200
5942
Option('force', help='Do not prompt before deleting.')]
6201
5943
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6202
force=False, directory=u'.'):
6203
5945
from bzrlib.clean_tree import clean_tree
6204
5946
if not (unknown or ignored or detritus):
6208
clean_tree(directory, unknown=unknown, ignored=ignored,
6209
detritus=detritus, dry_run=dry_run, no_prompt=force)
5950
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5951
dry_run=dry_run, no_prompt=force)
6212
5954
class cmd_reference(Command):
6213
__doc__ = """list, view and set branch locations for nested trees.
5955
"""list, view and set branch locations for nested trees.
6215
5957
If no arguments are provided, lists the branch locations for nested trees.
6216
5958
If one argument is provided, display the branch location for that tree.
6256
5998
self.outf.write('%s %s\n' % (path, location))
6259
class cmd_export_pot(Command):
6260
__doc__ = """Export command helps and error messages in po format."""
6265
from bzrlib.export_pot import export_pot
6266
export_pot(self.outf)
6269
6001
def _register_lazy_builtins():
6270
6002
# register lazy builtins from other modules; called at startup and should
6271
6003
# be only called once.
6272
6004
for (name, aliases, module_name) in [
6273
6005
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6274
('cmd_config', [], 'bzrlib.config'),
6275
6006
('cmd_dpush', [], 'bzrlib.foreign'),
6276
6007
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6277
6008
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6278
6009
('cmd_conflicts', [], 'bzrlib.conflicts'),
6279
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6280
('cmd_verify_signatures', [],
6281
'bzrlib.commit_signature_commands'),
6282
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6010
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6284
6012
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
