72
69
_parse_revision_str,
74
71
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
74
def tree_files(file_list, default_branch=u'.', canonicalize=True,
83
return internal_tree_files(file_list, default_branch, canonicalize,
77
return internal_tree_files(file_list, default_branch, canonicalize,
79
except errors.FileInWrongBranch, e:
80
raise errors.BzrCommandError("%s is not in the same branch as %s" %
81
(e.path, file_list[0]))
87
84
def tree_files_for_add(file_list):
152
149
# XXX: Bad function name; should possibly also be a class method of
153
150
# WorkingTree rather than a function.
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
151
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
152
apply_view=True):
157
153
"""Convert command-line paths to a WorkingTree and relative paths.
159
Deprecated: use WorkingTree.open_containing_paths instead.
161
155
This is typically used for command-line processors that take one or
162
156
more filenames, and infer the workingtree that contains them.
174
168
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
170
if file_list is None or len(file_list) == 0:
171
tree = WorkingTree.open_containing(default_branch)[0]
172
if tree.supports_views() and apply_view:
173
view_files = tree.views.lookup_view()
175
file_list = view_files
176
view_str = views.view_display_str(view_files)
177
note("Ignoring files outside view. View is %s" % view_str)
178
return tree, file_list
179
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
180
return tree, safe_relpath_files(tree, file_list, canonicalize,
181
apply_view=apply_view)
184
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
185
"""Convert file_list into a list of relpaths in tree.
187
:param tree: A tree to operate on.
188
:param file_list: A list of user provided paths or None.
189
:param apply_view: if True and a view is set, apply it or check that
190
specified files are within it
191
:return: A list of relative paths.
192
:raises errors.PathNotChild: When a provided path is in a different tree
195
if file_list is None:
197
if tree.supports_views() and apply_view:
198
view_files = tree.views.lookup_view()
202
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
203
# doesn't - fix that up here before we enter the loop.
205
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
208
for filename in file_list:
210
relpath = fixer(osutils.dereference_path(filename))
211
if view_files and not osutils.is_inside_any(view_files, relpath):
212
raise errors.FileOutsideView(filename, view_files)
213
new_list.append(relpath)
214
except errors.PathNotChild:
215
raise errors.FileInWrongBranch(tree.branch, filename)
182
219
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
231
# TODO: Make sure no commands unconditionally use the working directory as a
203
232
# branch. If a filename argument is used, the first of them should be used to
204
233
# specify the branch. (Perhaps this can be factored out into some kind of
253
282
To skip the display of pending merge information altogether, use
254
283
the no-pending option or specify a file/directory.
256
To compare the working directory to a specific revision, pass a
257
single revision to the revision argument.
259
To see which files have changed in a specific revision, or between
260
two revisions, pass a revision range to the revision argument.
261
This will produce the same results as calling 'bzr diff --summarize'.
285
If a revision argument is given, the status is calculated against
286
that revision, or between two revisions if two are provided.
264
289
# TODO: --no-recurse, --recurse options
324
349
self.outf.write(revtext.decode('utf-8'))
327
def run(self, revision_id=None, revision=None, directory=u'.'):
352
def run(self, revision_id=None, revision=None):
328
353
if revision_id is not None and revision is not None:
329
354
raise errors.BzrCommandError('You can only supply one of'
330
355
' revision_id or --revision')
331
356
if revision_id is None and revision is None:
332
357
raise errors.BzrCommandError('You must supply either'
333
358
' --revision or a revision_id')
335
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
359
b = WorkingTree.open_containing(u'.')[0].branch
337
361
revisions = b.repository.revisions
338
362
if revisions is None:
435
456
for node in bt.iter_all_entries():
436
457
# Node is made up of:
437
458
# (index, key, value, [references])
441
refs_as_tuples = None
443
refs_as_tuples = static_tuple.as_tuples(refs)
459
refs_as_tuples = static_tuple.as_tuples(node[3])
444
460
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
445
461
self.outf.write('%s\n' % (as_tuple,))
448
464
class cmd_remove_tree(Command):
449
__doc__ = """Remove the working tree from a given branch/checkout.
465
"""Remove the working tree from a given branch/checkout.
451
467
Since a lightweight checkout is little more than a working tree
452
468
this will refuse to run against one.
479
495
if (working.has_changes()):
480
496
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:
498
working_path = working.bzrdir.root_transport.base
499
branch_path = working.branch.bzrdir.root_transport.base
500
if working_path != branch_path:
485
501
raise errors.BzrCommandError("You cannot remove the working tree"
486
502
" from a lightweight checkout")
488
504
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)
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'
544
507
class cmd_revno(Command):
545
__doc__ = """Show current revision number.
508
"""Show current revision number.
547
510
This is equal to the number of revisions on this branch.
569
533
revno = ".".join(str(n) for n in revno_t)
571
535
b = Branch.open_containing(location)[0]
572
self.add_cleanup(b.lock_read().unlock)
537
self.add_cleanup(b.unlock)
573
538
revno = b.revno()
574
539
self.cleanup_now()
575
540
self.outf.write(str(revno) + '\n')
578
543
class cmd_revision_info(Command):
579
__doc__ = """Show revision number and revision id for a given revision identifier.
544
"""Show revision number and revision id for a given revision identifier.
582
547
takes_args = ['revision_info*']
583
548
takes_options = [
585
custom_help('directory',
586
551
help='Branch to examine, '
587
'rather than the one containing the working directory.'),
552
'rather than the one containing the working directory.',
588
556
Option('tree', help='Show revno of working tree'),
781
752
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
783
754
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)
755
work_tree, file_list = tree_files(file_list)
756
work_tree.lock_read()
757
self.add_cleanup(work_tree.unlock)
786
758
if revision is not None:
787
759
tree = revision.as_tree(work_tree.branch)
789
761
extra_trees = [work_tree]
790
self.add_cleanup(tree.lock_read().unlock)
763
self.add_cleanup(tree.unlock)
854
826
if len(names_list) < 2:
855
827
raise errors.BzrCommandError("missing file argument")
856
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
857
self.add_cleanup(tree.lock_tree_write().unlock)
828
tree, rel_names = tree_files(names_list, canonicalize=False)
829
tree.lock_tree_write()
830
self.add_cleanup(tree.unlock)
858
831
self._run(tree, names_list, rel_names, after)
860
833
def run_auto(self, names_list, after, dry_run):
865
838
raise errors.BzrCommandError('--after cannot be specified with'
867
work_tree, file_list = WorkingTree.open_containing_paths(
868
names_list, default_directory='.')
869
self.add_cleanup(work_tree.lock_tree_write().unlock)
840
work_tree, file_list = tree_files(names_list, default_branch='.')
841
work_tree.lock_tree_write()
842
self.add_cleanup(work_tree.unlock)
870
843
rename_map.RenameMap.guess_renames(work_tree, dry_run)
872
845
def _run(self, tree, names_list, rel_names, after):
966
939
match the remote one, use pull --overwrite. This will work even if the two
967
940
branches have diverged.
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.
942
If there is no default location set, the first pull will set it. After
943
that, you can omit the location to use the default. To change the
944
default, use --remember. The value will only be saved if the remote
945
location can be accessed.
974
947
Note: The location can be specified either in the form of a branch,
975
948
or in the form of a path to a file containing a merge directive generated
980
953
takes_options = ['remember', 'overwrite', 'revision',
981
954
custom_help('verbose',
982
955
help='Show logs of pulled revisions.'),
983
custom_help('directory',
984
957
help='Branch to pull into, '
985
'rather than the one containing the working directory.'),
958
'rather than the one containing the working directory.',
987
963
help="Perform a local pull in a bound "
988
964
"branch. Local pulls are not applied to "
989
965
"the master branch."
992
help="Show base revision text in conflicts.")
994
968
takes_args = ['location?']
995
969
encoding_type = 'replace'
997
def run(self, location=None, remember=None, overwrite=False,
971
def run(self, location=None, remember=False, overwrite=False,
998
972
revision=None, verbose=False,
999
directory=None, local=False,
973
directory=None, local=False):
1001
974
# FIXME: too much stuff is in the command class
1002
975
revision_id = None
1003
976
mergeable = None
1051
1019
branch_from = Branch.open(location,
1052
1020
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)):
1022
if branch_to.get_parent() is None or remember:
1057
1023
branch_to.set_parent(branch_from.base)
1025
if branch_from is not branch_to:
1026
branch_from.lock_read()
1027
self.add_cleanup(branch_from.unlock)
1059
1028
if revision is not None:
1060
1029
revision_id = revision.as_revision_id(branch_from)
1031
branch_to.lock_write()
1032
self.add_cleanup(branch_to.unlock)
1062
1033
if tree_to is not None:
1063
1034
view_info = _get_view_info_for_change_reporter(tree_to)
1064
1035
change_reporter = delta._ChangeReporter(
1103
1069
do a merge (see bzr help merge) from the other branch, and commit that.
1104
1070
After that you will be able to do a push without '--overwrite'.
1106
If there is no default push location set, the first push will set it (use
1107
--no-remember to avoid settting it). After that, you can omit the
1108
location to use the default. To change the default, use --remember. The
1109
value will only be saved if the remote location can be accessed.
1072
If there is no default push location set, the first push will set it.
1073
After that, you can omit the location to use the default. To change the
1074
default, use --remember. The value will only be saved if the remote
1075
location can be accessed.
1112
1078
_see_also = ['pull', 'update', 'working-trees']
1114
1080
Option('create-prefix',
1115
1081
help='Create the path leading up to the branch '
1116
1082
'if it does not already exist.'),
1117
custom_help('directory',
1118
1084
help='Branch to push from, '
1119
'rather than the one containing the working directory.'),
1085
'rather than the one containing the working directory.',
1120
1089
Option('use-existing-dir',
1121
1090
help='By default push will fail if the target'
1122
1091
' directory exists, but does not already'
1133
1102
Option('strict',
1134
1103
help='Refuse to push if there are uncommitted changes in'
1135
1104
' the working tree, --no-strict disables the check.'),
1137
help="Don't populate the working tree, even for protocols"
1138
" that support it."),
1140
1106
takes_args = ['location?']
1141
1107
encoding_type = 'replace'
1143
def run(self, location=None, remember=None, overwrite=False,
1109
def run(self, location=None, remember=False, overwrite=False,
1144
1110
create_prefix=False, verbose=False, revision=None,
1145
1111
use_existing_dir=False, directory=None, stacked_on=None,
1146
stacked=False, strict=None, no_tree=False):
1112
stacked=False, strict=None):
1147
1113
from bzrlib.push import _show_push_branch
1149
1115
if directory is None:
1151
1117
# Get the source branch
1152
1118
(tree, br_from,
1153
1119
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1121
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1122
if strict is None: strict = True # default value
1154
1123
# Get the tip's revision_id
1155
1124
revision = _get_one_revision('push', revision)
1156
1125
if revision is not None:
1157
1126
revision_id = revision.in_history(br_from).rev_id
1159
1128
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.')
1129
if strict and tree is not None and revision_id is None:
1130
if (tree.has_changes()):
1131
raise errors.UncommittedChanges(
1132
tree, more='Use --no-strict to force the push.')
1133
if tree.last_revision() != tree.branch.last_revision():
1134
# The tree has lost sync with its branch, there is little
1135
# chance that the user is aware of it but he can still force
1136
# the push with --no-strict
1137
raise errors.OutOfDateTree(
1138
tree, more='Use --no-strict to force the push.')
1165
1140
# Get the stacked_on branch, if any
1166
1141
if stacked_on is not None:
1167
1142
stacked_on = urlutils.normalize_url(stacked_on)
1195
1170
_show_push_branch(br_from, revision_id, location, self.outf,
1196
1171
verbose=verbose, overwrite=overwrite, remember=remember,
1197
1172
stacked_on=stacked_on, create_prefix=create_prefix,
1198
use_existing_dir=use_existing_dir, no_tree=no_tree)
1173
use_existing_dir=use_existing_dir)
1201
1176
class cmd_branch(Command):
1202
__doc__ = """Create a new branch that is a copy of an existing branch.
1177
"""Create a new branch that is a copy of an existing branch.
1204
1179
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1205
1180
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1211
1186
To retrieve the branch as of a particular revision, supply the --revision
1212
1187
parameter, as in "branch foo/bar -r 5".
1214
The synonyms 'clone' and 'get' for this command are deprecated.
1217
1190
_see_also = ['checkout']
1218
1191
takes_args = ['from_location', 'to_location?']
1219
takes_options = ['revision',
1220
Option('hardlink', help='Hard-link working tree files where possible.'),
1221
Option('files-from', type=str,
1222
help="Get file contents from this tree."),
1192
takes_options = ['revision', Option('hardlink',
1193
help='Hard-link working tree files where possible.'),
1223
1194
Option('no-tree',
1224
1195
help="Create a branch without a working-tree."),
1225
1196
Option('switch',
1244
1215
def run(self, from_location, to_location=None, revision=None,
1245
1216
hardlink=False, stacked=False, standalone=False, no_tree=False,
1246
use_existing_dir=False, switch=False, bind=False,
1217
use_existing_dir=False, switch=False, bind=False):
1248
1218
from bzrlib import switch as _mod_switch
1249
1219
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
1220
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
1262
accelerator_tree = None
1263
if files_from is not None and files_from != from_location:
1264
accelerator_tree = WorkingTree.open(files_from)
1265
1222
revision = _get_one_revision('branch', revision)
1266
self.add_cleanup(br_from.lock_read().unlock)
1224
self.add_cleanup(br_from.unlock)
1267
1225
if revision is not None:
1268
1226
revision_id = revision.as_revision_id(br_from)
1374
1332
to_location = branch_location
1375
1333
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1376
1334
branch_location)
1377
if not (hardlink or files_from):
1378
# accelerator_tree is usually slower because you have to read N
1379
# files (no readahead, lots of seeks, etc), but allow the user to
1380
# explicitly request it
1381
accelerator_tree = None
1382
1335
revision = _get_one_revision('checkout', revision)
1383
if files_from is not None and files_from != branch_location:
1336
if files_from is not None:
1384
1337
accelerator_tree = WorkingTree.open(files_from)
1385
1338
if revision is not None:
1386
1339
revision_id = revision.as_revision_id(source)
1442
1397
If you want to discard your local changes, you can just do a
1443
1398
'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
1400
If the tree's branch is bound to a master branch, it will also update
1449
1401
the branch from the master.
1452
1404
_see_also = ['pull', 'working-trees', 'status-flags']
1453
1405
takes_args = ['dir?']
1454
takes_options = ['revision',
1456
help="Show base revision text in conflicts."),
1406
takes_options = ['revision']
1458
1407
aliases = ['up']
1460
def run(self, dir='.', revision=None, show_base=None):
1409
def run(self, dir='.', revision=None):
1461
1410
if revision is not None and len(revision) != 1:
1462
1411
raise errors.BzrCommandError(
1463
1412
"bzr update --revision takes exactly one revision")
1467
1416
master = branch.get_master_branch(
1468
1417
possible_transports=possible_transports)
1469
1418
if master is not None:
1470
1420
branch_location = master.base
1422
tree.lock_tree_write()
1473
1423
branch_location = tree.branch.base
1474
tree.lock_tree_write()
1475
1424
self.add_cleanup(tree.unlock)
1476
1425
# get rid of the final '/' and be ready for display
1477
branch_location = urlutils.unescape_for_display(
1478
branch_location.rstrip('/'),
1426
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1480
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1481
1429
if master is None:
1491
1439
revision_id = branch.last_revision()
1492
1440
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))
1441
revno = branch.revision_id_to_revno(revision_id)
1442
note("Tree is up to date at revision %d of branch %s" %
1443
(revno, branch_location))
1497
1445
view_info = _get_view_info_for_change_reporter(tree)
1498
1446
change_reporter = delta._ChangeReporter(
1503
1451
change_reporter,
1504
1452
possible_transports=possible_transports,
1505
1453
revision=revision_id,
1507
show_base=show_base)
1508
1455
except errors.NoSuchRevision, e:
1509
1456
raise errors.BzrCommandError(
1510
1457
"branch has no revision %s\n"
1511
1458
"bzr update --revision only works"
1512
1459
" for a revision in the branch history"
1513
1460
% (e.revision))
1514
revno = tree.branch.revision_id_to_dotted_revno(
1461
revno = tree.branch.revision_id_to_revno(
1515
1462
_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:
1463
note('Updated to revision %d of branch %s' %
1464
(revno, branch_location))
1465
if tree.get_parent_ids()[1:] != existing_pending_merges:
1520
1466
note('Your local commits will now show as pending merges with '
1521
1467
"'bzr status', and can be committed with 'bzr commit'.")
1522
1468
if conflicts != 0:
1572
1518
class cmd_remove(Command):
1573
__doc__ = """Remove files or directories.
1519
"""Remove files or directories.
1575
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1576
delete them if they can easily be recovered using revert otherwise they
1577
will be backed up (adding an extention of the form .~#~). If no options or
1578
parameters are given Bazaar will scan for files that are being tracked by
1579
Bazaar but missing in your tree and stop tracking them for you.
1521
This makes bzr stop tracking changes to the specified files. bzr will delete
1522
them if they can easily be recovered using revert. If no options or
1523
parameters are given bzr will scan for files that are being tracked by bzr
1524
but missing in your tree and stop tracking them for you.
1581
1526
takes_args = ['file*']
1582
1527
takes_options = ['verbose',
1584
1529
RegistryOption.from_kwargs('file-deletion-strategy',
1585
1530
'The file deletion mode to be used.',
1586
1531
title='Deletion Strategy', value_switches=True, enum_switch=False,
1587
safe='Backup changed files (default).',
1532
safe='Only delete files if they can be'
1533
' safely recovered (default).',
1588
1534
keep='Delete from bzr but leave the working copy.',
1589
no_backup='Don\'t backup changed files.',
1590
1535
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)')]
1536
'recovered and even if they are non-empty directories.')]
1593
1537
aliases = ['rm', 'del']
1594
1538
encoding_type = 'replace'
1596
1540
def run(self, file_list, verbose=False, new=False,
1597
1541
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)
1542
tree, file_list = tree_files(file_list)
1605
1544
if file_list is not None:
1606
1545
file_list = [f for f in file_list]
1608
self.add_cleanup(tree.lock_write().unlock)
1548
self.add_cleanup(tree.unlock)
1609
1549
# Heuristics should probably all move into tree.remove_smart or
1626
1566
file_deletion_strategy = 'keep'
1627
1567
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1628
1568
keep_files=file_deletion_strategy=='keep',
1629
force=(file_deletion_strategy=='no-backup'))
1569
force=file_deletion_strategy=='force')
1632
1572
class cmd_file_id(Command):
1633
__doc__ = """Print file_id of a particular file or directory.
1573
"""Print file_id of a particular file or directory.
1635
1575
The file_id is assigned when the file is first added and remains the
1636
1576
same through all revisions where the file exists, even when it is
1695
1635
_see_also = ['check']
1696
1636
takes_args = ['branch?']
1698
Option('canonicalize-chks',
1699
help='Make sure CHKs are in canonical form (repairs '
1704
def run(self, branch=".", canonicalize_chks=False):
1638
def run(self, branch="."):
1705
1639
from bzrlib.reconcile import reconcile
1706
1640
dir = bzrdir.BzrDir.open(branch)
1707
reconcile(dir, canonicalize_chks=canonicalize_chks)
1710
1644
class cmd_revision_history(Command):
1711
__doc__ = """Display the list of revision ids on a branch."""
1645
"""Display the list of revision ids on a branch."""
1713
1647
_see_also = ['log']
1714
1648
takes_args = ['location?']
1743
1677
last_revision = wt.last_revision()
1745
self.add_cleanup(b.repository.lock_read().unlock)
1746
graph = b.repository.get_graph()
1747
revisions = [revid for revid, parents in
1748
graph.iter_ancestry([last_revision])]
1749
for revision_id in reversed(revisions):
1750
if _mod_revision.is_null(revision_id):
1679
revision_ids = b.repository.get_ancestry(last_revision)
1681
for revision_id in revision_ids:
1752
1682
self.outf.write(revision_id + '\n')
1755
1685
class cmd_init(Command):
1756
__doc__ = """Make a directory into a versioned branch.
1686
"""Make a directory into a versioned branch.
1758
1688
Use this to create an empty branch, or before importing an
1759
1689
existing project.
1792
1722
Option('append-revisions-only',
1793
1723
help='Never change revnos or the existing log.'
1794
' Append revisions to it only.'),
1796
'Create a branch without a working tree.')
1724
' Append revisions to it only.')
1798
1726
def run(self, location=None, format=None, append_revisions_only=False,
1799
create_prefix=False, no_tree=False):
1727
create_prefix=False):
1800
1728
if format is None:
1801
1729
format = bzrdir.format_registry.make_bzrdir('default')
1802
1730
if location is None:
2038
1944
help='Use this command to compare files.',
2041
RegistryOption('format',
2043
help='Diff format to use.',
2044
lazy_registry=('bzrlib.diff', 'format_registry'),
2045
title='Diff format'),
2047
1948
aliases = ['di', 'dif']
2048
1949
encoding_type = 'exact'
2050
1951
@display_command
2051
1952
def run(self, revision=None, file_list=None, diff_options=None,
2052
prefix=None, old=None, new=None, using=None, format=None):
2053
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1953
prefix=None, old=None, new=None, using=None):
1954
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
2056
1956
if (prefix is None) or (prefix == '0'):
2057
1957
# diff -p0 format
2071
1971
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2072
1972
' 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
1974
(old_tree, new_tree,
2079
1975
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()
1976
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1977
file_list, revision, old, new, apply_view=True)
2084
1978
return show_diff_trees(old_tree, new_tree, sys.stdout,
2085
1979
specific_files=specific_files,
2086
1980
external_diff_options=diff_options,
2087
1981
old_label=old_label, new_label=new_label,
2088
extra_trees=extra_trees,
2089
path_encoding=path_encoding,
1982
extra_trees=extra_trees, using=using)
2094
1985
class cmd_deleted(Command):
2095
__doc__ = """List files deleted in the working tree.
1986
"""List files deleted in the working tree.
2097
1988
# TODO: Show files deleted since a previous revision, or
2098
1989
# between two revisions.
2101
1992
# level of effort but possibly much less IO. (Or possibly not,
2102
1993
# if the directories are very large...)
2103
1994
_see_also = ['status', 'ls']
2104
takes_options = ['directory', 'show-ids']
1995
takes_options = ['show-ids']
2106
1997
@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)
1998
def run(self, show_ids=False):
1999
tree = WorkingTree.open_containing(u'.')[0]
2001
self.add_cleanup(tree.unlock)
2110
2002
old = tree.basis_tree()
2111
self.add_cleanup(old.lock_read().unlock)
2004
self.add_cleanup(old.unlock)
2112
2005
for path, ie in old.inventory.iter_entries():
2113
2006
if not tree.has_id(ie.file_id):
2114
2007
self.outf.write(path)
2121
2014
class cmd_modified(Command):
2122
__doc__ = """List files modified in working tree.
2015
"""List files modified in working tree.
2126
2019
_see_also = ['status', 'ls']
2127
takes_options = ['directory', 'null']
2022
help='Write an ascii NUL (\\0) separator '
2023
'between files rather than a newline.')
2129
2026
@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)
2027
def run(self, null=False):
2028
tree = WorkingTree.open_containing(u'.')[0]
2133
2029
td = tree.changes_from(tree.basis_tree())
2135
2030
for path, id, kind, text_modified, meta_modified in td.modified:
2137
2032
self.outf.write(path + '\0')
2142
2037
class cmd_added(Command):
2143
__doc__ = """List files added in working tree.
2038
"""List files added in working tree.
2147
2042
_see_also = ['status', 'ls']
2148
takes_options = ['directory', 'null']
2045
help='Write an ascii NUL (\\0) separator '
2046
'between files rather than a newline.')
2150
2049
@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)
2050
def run(self, null=False):
2051
wt = WorkingTree.open_containing(u'.')[0]
2053
self.add_cleanup(wt.unlock)
2154
2054
basis = wt.basis_tree()
2155
self.add_cleanup(basis.lock_read().unlock)
2056
self.add_cleanup(basis.unlock)
2156
2057
basis_inv = basis.inventory
2157
2058
inv = wt.inventory
2158
2059
for file_id in inv:
2159
if basis_inv.has_id(file_id):
2060
if file_id in basis_inv:
2161
2062
if inv.is_root(file_id) and len(basis_inv) == 0:
2163
2064
path = inv.id2path(file_id)
2164
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2065
if not os.access(osutils.abspath(path), os.F_OK):
2167
2068
self.outf.write(path + '\0')
2474
2357
dir, relpath = bzrdir.BzrDir.open_containing(location)
2475
2358
b = dir.open_branch()
2476
self.add_cleanup(b.lock_read().unlock)
2360
self.add_cleanup(b.unlock)
2477
2361
rev1, rev2 = _get_revision_range(revision, b, self.name())
2479
if b.get_config().validate_signatures_in_log():
2483
if not gpg.GPGStrategy.verify_signatures_available():
2484
raise errors.GpgmeNotInstalled(None)
2486
2363
# Decide on the type of delta & diff filtering to use
2487
2364
# TODO: add an --all-files option to make this configurable & consistent
2488
2365
if not verbose:
2532
2408
direction=direction, specific_fileids=file_ids,
2533
2409
start_revision=rev1, end_revision=rev2, limit=limit,
2534
2410
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
2411
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2539
2412
Logger(b, rqst).show(lf)
2560
2433
raise errors.BzrCommandError(
2561
2434
"bzr %s doesn't accept two revisions in different"
2562
2435
" branches." % command_name)
2563
if start_spec.spec is None:
2564
# Avoid loading all the history.
2565
rev1 = RevisionInfo(branch, None, None)
2567
rev1 = start_spec.in_history(branch)
2436
rev1 = start_spec.in_history(branch)
2568
2437
# Avoid loading all of history when we know a missing
2569
2438
# end of range means the last revision ...
2570
2439
if end_spec.spec is None:
2612
2481
tree, relpath = WorkingTree.open_containing(filename)
2613
2482
file_id = tree.path2id(relpath)
2614
2483
b = tree.branch
2615
self.add_cleanup(b.lock_read().unlock)
2485
self.add_cleanup(b.unlock)
2616
2486
touching_revs = log.find_touching_revisions(b, file_id)
2617
2487
for revno, revision_id, what in touching_revs:
2618
2488
self.outf.write("%6d %s\n" % (revno, what))
2621
2491
class cmd_ls(Command):
2622
__doc__ = """List files in a tree.
2492
"""List files in a tree.
2625
2495
_see_also = ['status', 'cat']
2631
2501
help='Recurse into subdirectories.'),
2632
2502
Option('from-root',
2633
2503
help='Print paths relative to the root of the branch.'),
2634
Option('unknown', short_name='u',
2635
help='Print unknown files.'),
2504
Option('unknown', help='Print unknown files.'),
2636
2505
Option('versioned', help='Print versioned files.',
2637
2506
short_name='V'),
2638
Option('ignored', short_name='i',
2639
help='Print ignored files.'),
2640
Option('kind', short_name='k',
2507
Option('ignored', help='Print ignored files.'),
2509
help='Write an ascii NUL (\\0) separator '
2510
'between files rather than a newline.'),
2641
2512
help='List entries of a particular kind: file, directory, symlink.',
2647
2516
@display_command
2648
2517
def run(self, revision=None, verbose=False,
2649
2518
recursive=False, from_root=False,
2650
2519
unknown=False, versioned=False, ignored=False,
2651
null=False, kind=None, show_ids=False, path=None, directory=None):
2520
null=False, kind=None, show_ids=False, path=None):
2653
2522
if kind and kind not in ('file', 'directory', 'symlink'):
2654
2523
raise errors.BzrCommandError('invalid kind specified')
2738
2608
class cmd_unknowns(Command):
2739
__doc__ = """List unknown files.
2609
"""List unknown files.
2743
2613
_see_also = ['ls']
2744
takes_options = ['directory']
2746
2615
@display_command
2747
def run(self, directory=u'.'):
2748
for f in WorkingTree.open_containing(directory)[0].unknowns():
2617
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2749
2618
self.outf.write(osutils.quotefn(f) + '\n')
2752
2621
class cmd_ignore(Command):
2753
__doc__ = """Ignore specified files or patterns.
2622
"""Ignore specified files or patterns.
2755
2624
See ``bzr help patterns`` for details on the syntax of patterns.
2826
2680
_see_also = ['status', 'ignored', 'patterns']
2827
2681
takes_args = ['name_pattern*']
2828
takes_options = ['directory',
2829
Option('default-rules',
2830
help='Display the default ignore rules that bzr uses.')
2683
Option('old-default-rules',
2684
help='Write out the ignore rules bzr < 0.9 always used.')
2833
def run(self, name_pattern_list=None, default_rules=None,
2687
def run(self, name_pattern_list=None, old_default_rules=None):
2835
2688
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:
2689
if old_default_rules is not None:
2690
# dump the rules and exit
2691
for pattern in ignores.OLD_DEFAULTS:
2839
2692
self.outf.write("%s\n" % pattern)
2841
2694
if not name_pattern_list:
2842
2695
raise errors.BzrCommandError("ignore requires at least one "
2843
"NAME_PATTERN or --default-rules.")
2696
"NAME_PATTERN or --old-default-rules")
2844
2697
name_pattern_list = [globbing.normalize_pattern(p)
2845
2698
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
2699
for name_pattern in name_pattern_list:
2855
2700
if (name_pattern[0] == '/' or
2856
2701
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2857
2702
raise errors.BzrCommandError(
2858
2703
"NAME_PATTERN should not be an absolute path")
2859
tree, relpath = WorkingTree.open_containing(directory)
2704
tree, relpath = WorkingTree.open_containing(u'.')
2860
2705
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2861
2706
ignored = globbing.Globster(name_pattern_list)
2863
self.add_cleanup(tree.lock_read().unlock)
2864
2709
for entry in tree.list_files():
2866
2711
if id is not None:
2867
2712
filename = entry[0]
2868
2713
if ignored.match(filename):
2869
2714
matches.append(filename)
2870
2716
if len(matches) > 0:
2871
2717
self.outf.write("Warning: the following files are version controlled and"
2872
2718
" match your ignore pattern:\n%s"
2888
2734
encoding_type = 'replace'
2889
2735
_see_also = ['ignore', 'ls']
2890
takes_options = ['directory']
2892
2737
@display_command
2893
def run(self, directory=u'.'):
2894
tree = WorkingTree.open_containing(directory)[0]
2895
self.add_cleanup(tree.lock_read().unlock)
2739
tree = WorkingTree.open_containing(u'.')[0]
2741
self.add_cleanup(tree.unlock)
2896
2742
for path, file_class, kind, file_id, entry in tree.list_files():
2897
2743
if file_class != 'I':
2904
2750
class cmd_lookup_revision(Command):
2905
__doc__ = """Lookup the revision-id from a revision-number
2751
"""Lookup the revision-id from a revision-number
2908
2754
bzr lookup-revision 33
2911
2757
takes_args = ['revno']
2912
takes_options = ['directory']
2914
2759
@display_command
2915
def run(self, revno, directory=u'.'):
2760
def run(self, revno):
2917
2762
revno = int(revno)
2918
2763
except ValueError:
2919
2764
raise errors.BzrCommandError("not a valid revision-number: %r"
2921
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2766
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2922
2767
self.outf.write("%s\n" % revid)
2925
2770
class cmd_export(Command):
2926
__doc__ = """Export current or past revision to a destination directory or archive.
2771
"""Export current or past revision to a destination directory or archive.
2928
2773
If no revision is specified this exports the last committed revision.
2964
2808
help="Name of the root directory inside the exported file."),
2965
Option('per-file-timestamps',
2966
help='Set modification time of files to that of the last '
2967
'revision in which it was changed.'),
2969
2810
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2970
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2811
root=None, filters=False):
2971
2812
from bzrlib.export import export
2973
2814
if branch_or_subdir is None:
2974
tree = WorkingTree.open_containing(directory)[0]
2815
tree = WorkingTree.open_containing(u'.')[0]
2975
2816
b = tree.branch
2981
2822
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2983
export(rev_tree, dest, format, root, subdir, filtered=filters,
2984
per_file_timestamps=per_file_timestamps)
2824
export(rev_tree, dest, format, root, subdir, filtered=filters)
2985
2825
except errors.NoSuchExportFormat, e:
2986
2826
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2989
2829
class cmd_cat(Command):
2990
__doc__ = """Write the contents of a file as of a given revision to standard output.
2830
"""Write the contents of a file as of a given revision to standard output.
2992
2832
If no revision is nominated, the last revision is used.
3008
2848
@display_command
3009
2849
def run(self, filename, revision=None, name_from_revision=False,
3010
filters=False, directory=None):
3011
2851
if revision is not None and len(revision) != 1:
3012
2852
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3013
2853
" one revision specifier")
3014
2854
tree, branch, relpath = \
3015
_open_directory_or_containing_tree_or_branch(filename, directory)
3016
self.add_cleanup(branch.lock_read().unlock)
2855
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2857
self.add_cleanup(branch.unlock)
3017
2858
return self._run(tree, branch, relpath, filename, revision,
3018
2859
name_from_revision, filters)
3134
2976
to trigger updates to external systems like bug trackers. The --fixes
3135
2977
option can be used to record the association between a revision and
3136
2978
one or more bugs. See ``bzr help bugs`` for details.
2980
A selective commit may fail in some cases where the committed
2981
tree would be invalid. Consider::
2986
bzr commit foo -m "committing foo"
2987
bzr mv foo/bar foo/baz
2990
bzr commit foo/bar -m "committing bar but not baz"
2992
In the example above, the last commit will fail by design. This gives
2993
the user the opportunity to decide whether they want to commit the
2994
rename at the same time, separately first, or not at all. (As a general
2995
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2997
# TODO: Run hooks on tree to-be-committed, and after commit.
2999
# TODO: Strict commit that fails if there are deleted files.
3000
# (what does "deleted files" mean ??)
3002
# TODO: Give better message for -s, --summary, used by tla people
3004
# XXX: verbose currently does nothing
3139
3006
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3140
3007
takes_args = ['selected*']
3201
3064
def run(self, message=None, file=None, verbose=False, selected_list=None,
3202
3065
unchanged=False, strict=False, local=False, fixes=None,
3203
author=None, show_diff=False, exclude=None, commit_time=None,
3066
author=None, show_diff=False, exclude=None, commit_time=None):
3205
3067
from bzrlib.errors import (
3206
3068
PointlessCommit,
3207
3069
ConflictsInTree,
3222
3083
raise errors.BzrCommandError(
3223
3084
"Could not parse --commit-time: " + str(e))
3086
# TODO: Need a blackbox test for invoking the external editor; may be
3087
# slightly problematic to run this cross-platform.
3089
# TODO: do more checks that the commit will succeed before
3090
# spending the user's valuable time typing a commit message.
3225
3092
properties = {}
3227
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3094
tree, selected_list = tree_files(selected_list)
3228
3095
if selected_list == ['']:
3229
3096
# workaround - commit of root of tree should be exactly the same
3230
3097
# as just default commit in that tree, and succeed even though
3255
3122
'(use --file "%(f)s" to take commit message from that file)'
3256
3123
% { 'f': message })
3257
3124
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
3126
def get_message(commit_obj):
3266
3127
"""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,
3128
my_message = message
3129
if my_message is not None and '\r' in my_message:
3130
my_message = my_message.replace('\r\n', '\n')
3131
my_message = my_message.replace('\r', '\n')
3132
if my_message is None and not file:
3133
t = make_commit_message_template_encoded(tree,
3279
3134
selected_list, diff=show_diff,
3280
3135
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)
3136
start_message = generate_commit_message_template(commit_obj)
3137
my_message = edit_commit_message_encoded(t,
3138
start_message=start_message)
3291
3139
if my_message is None:
3292
3140
raise errors.BzrCommandError("please specify a commit"
3293
3141
" message with either --message or --file")
3142
elif my_message and file:
3143
raise errors.BzrCommandError(
3144
"please specify either --message or --file")
3146
my_message = codecs.open(file, 'rt',
3147
osutils.get_user_encoding()).read()
3294
3148
if my_message == "":
3295
3149
raise errors.BzrCommandError("empty commit message specified")
3296
3150
return my_message
3306
3160
reporter=None, verbose=verbose, revprops=properties,
3307
3161
authors=author, timestamp=commit_stamp,
3308
3162
timezone=offset,
3309
exclude=tree.safe_relpath_files(exclude),
3163
exclude=safe_relpath_files(tree, exclude))
3311
3164
except PointlessCommit:
3165
# FIXME: This should really happen before the file is read in;
3166
# perhaps prepare the commit; get the message; then actually commit
3312
3167
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.")
3168
" Use --unchanged to commit anyhow.")
3315
3169
except ConflictsInTree:
3316
3170
raise errors.BzrCommandError('Conflicts detected in working '
3317
3171
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3400
3254
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/.
3255
"""Upgrade branch storage to current format.
3257
The check command or bzr developers may sometimes advise you to run
3258
this command. When the default format has changed you may also be warned
3259
during other operations to upgrade.
3433
_see_also = ['check', 'reconcile', 'formats']
3262
_see_also = ['check']
3434
3263
takes_args = ['url?']
3435
3264
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."),
3265
RegistryOption('format',
3266
help='Upgrade to a specific format. See "bzr help'
3267
' formats" for details.',
3268
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3269
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3270
value_switches=True, title='Branch format'),
3448
def run(self, url='.', format=None, clean=False, dry_run=False):
3273
def run(self, url='.', format=None):
3449
3274
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
3275
upgrade(url, format)
3459
3278
class cmd_whoami(Command):
3460
__doc__ = """Show or set bzr user id.
3279
"""Show or set bzr user id.
3463
3282
Show the email of the current user::
3479
3297
encoding_type = 'replace'
3481
3299
@display_command
3482
def run(self, email=False, branch=False, name=None, directory=None):
3300
def run(self, email=False, branch=False, name=None):
3483
3301
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()
3302
# use branch if we're inside one; otherwise global config
3304
c = Branch.open_containing('.')[0].get_config()
3305
except errors.NotBranchError:
3306
c = config.GlobalConfig()
3493
3308
self.outf.write(c.user_email() + '\n')
3495
3310
self.outf.write(c.username() + '\n')
3499
raise errors.BzrCommandError("--email can only be used to display existing "
3502
3313
# display a warning if an email address isn't included in the given name.
3504
_mod_config.extract_email_address(name)
3315
config.extract_email_address(name)
3505
3316
except errors.NoEmailInUsername, e:
3506
3317
warning('"%s" does not seem to contain an email address. '
3507
3318
'This is allowed, but not recommended.', name)
3509
3320
# 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()
3322
c = Branch.open_containing('.')[0].get_config()
3516
c = _mod_config.GlobalConfig()
3324
c = config.GlobalConfig()
3517
3325
c.set_user_option('email', name)
3520
3328
class cmd_nick(Command):
3521
__doc__ = """Print or set the branch nickname.
3329
"""Print or set the branch nickname.
3523
3331
If unset, the tree root directory name is used as the nickname.
3524
3332
To print the current nickname, execute with no argument.
3586
3393
'bzr alias --remove expects an alias to remove.')
3587
3394
# If alias is not found, print something like:
3588
3395
# unalias: foo: not found
3589
c = _mod_config.GlobalConfig()
3396
c = config.GlobalConfig()
3590
3397
c.unset_alias(alias_name)
3592
3399
@display_command
3593
3400
def print_aliases(self):
3594
3401
"""Print out the defined aliases in a similar format to bash."""
3595
aliases = _mod_config.GlobalConfig().get_aliases()
3402
aliases = config.GlobalConfig().get_aliases()
3596
3403
for key, value in sorted(aliases.iteritems()):
3597
3404
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3609
3416
def set_alias(self, alias_name, alias_command):
3610
3417
"""Save the alias in the global config."""
3611
c = _mod_config.GlobalConfig()
3418
c = config.GlobalConfig()
3612
3419
c.set_alias(alias_name, alias_command)
3615
3422
class cmd_selftest(Command):
3616
__doc__ = """Run internal test suite.
3423
"""Run internal test suite.
3618
3425
If arguments are given, they are regular expressions that say which tests
3619
3426
should run. Tests matching any expression are run, and other tests are
3668
3472
if typestring == "sftp":
3669
3473
from bzrlib.tests import stub_sftp
3670
3474
return stub_sftp.SFTPAbsoluteServer
3671
elif typestring == "memory":
3475
if typestring == "memory":
3672
3476
from bzrlib.tests import test_server
3673
3477
return memory.MemoryServer
3674
elif typestring == "fakenfs":
3478
if typestring == "fakenfs":
3675
3479
from bzrlib.tests import test_server
3676
3480
return test_server.FakeNFSServer
3677
3481
msg = "No known transport type %s. Supported types are: sftp\n" %\
3690
3494
'throughout the test suite.',
3691
3495
type=get_transport_type),
3692
3496
Option('benchmark',
3693
help='Run the benchmarks rather than selftests.',
3497
help='Run the benchmarks rather than selftests.'),
3695
3498
Option('lsprof-timed',
3696
3499
help='Generate lsprof output for benchmarked'
3697
3500
' sections of code.'),
3698
3501
Option('lsprof-tests',
3699
3502
help='Generate lsprof output for each test.'),
3503
Option('cache-dir', type=str,
3504
help='Cache intermediate benchmark output in this '
3700
3506
Option('first',
3701
3507
help='Run all tests, but run specified tests first.',
3702
3508
short_name='f',
3711
3517
Option('randomize', type=str, argname="SEED",
3712
3518
help='Randomize the order of tests using the given'
3713
3519
' seed or "now" for the current time.'),
3714
ListOption('exclude', type=str, argname="PATTERN",
3716
help='Exclude tests that match this regular'
3520
Option('exclude', type=str, argname="PATTERN",
3522
help='Exclude tests that match this regular'
3718
3524
Option('subunit',
3719
3525
help='Output test progress via subunit.'),
3720
3526
Option('strict', help='Fail on missing dependencies or '
3737
3543
def run(self, testspecs_list=None, verbose=False, one=False,
3738
3544
transport=None, benchmark=None,
3545
lsprof_timed=None, cache_dir=None,
3740
3546
first=False, list_only=False,
3741
3547
randomize=None, exclude=None, strict=False,
3742
3548
load_list=None, debugflag=None, starting_with=None, subunit=False,
3743
3549
parallel=None, lsprof_tests=False):
3744
from bzrlib import tests
3550
from bzrlib.tests import selftest
3551
import bzrlib.benchmarks as benchmarks
3552
from bzrlib.benchmarks import tree_creator
3554
# Make deprecation warnings visible, unless -Werror is set
3555
symbol_versioning.activate_deprecation_warnings(override=False)
3557
if cache_dir is not None:
3558
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3746
3559
if testspecs_list is not None:
3747
3560
pattern = '|'.join(testspecs_list)
3754
3567
raise errors.BzrCommandError("subunit not available. subunit "
3755
3568
"needs to be installed to use --subunit.")
3756
3569
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
3571
self.additional_selftest_args.setdefault(
3768
3572
'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
3574
test_suite_factory = benchmarks.test_suite
3575
# Unless user explicitly asks for quiet, be verbose in benchmarks
3576
verbose = not is_quiet()
3577
# TODO: should possibly lock the history file...
3578
benchfile = open(".perf_history", "at", buffering=1)
3579
self.add_cleanup(benchfile.close)
3777
exclude_pattern = '(' + '|'.join(exclude) + ')'
3581
test_suite_factory = None
3778
3583
selftest_kwargs = {"verbose": verbose,
3779
3584
"pattern": pattern,
3780
3585
"stop_on_failure": one,
3782
3587
"test_suite_factory": test_suite_factory,
3783
3588
"lsprof_timed": lsprof_timed,
3784
3589
"lsprof_tests": lsprof_tests,
3590
"bench_history": benchfile,
3785
3591
"matching_tests_first": first,
3786
3592
"list_only": list_only,
3787
3593
"random_seed": randomize,
3788
"exclude_pattern": exclude_pattern,
3594
"exclude_pattern": exclude,
3789
3595
"strict": strict,
3790
3596
"load_list": load_list,
3791
3597
"debug_flags": debugflag,
3792
3598
"starting_with": starting_with
3794
3600
selftest_kwargs.update(self.additional_selftest_args)
3796
# Make deprecation warnings visible, unless -Werror is set
3797
cleanup = symbol_versioning.activate_deprecation_warnings(
3800
result = tests.selftest(**selftest_kwargs)
3601
result = selftest(**selftest_kwargs)
3803
3602
return int(not result)
3806
3605
class cmd_version(Command):
3807
__doc__ = """Show version of bzr."""
3606
"""Show version of bzr."""
3809
3608
encoding_type = 'replace'
3810
3609
takes_options = [
3857
3658
class cmd_merge(Command):
3858
__doc__ = """Perform a three-way merge.
3659
"""Perform a three-way merge.
3860
3661
The source of the merge can be specified either in the form of a branch,
3861
3662
or in the form of a path to a file containing a merge directive generated
3862
3663
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.
3664
or the branch most recently merged using --remember.
3666
When merging a branch, by default the tip will be merged. To pick a different
3667
revision, pass --revision. If you specify two values, the first will be used as
3668
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3669
available revisions, like this is commonly referred to as "cherrypicking".
3671
Revision numbers are always relative to the branch being merged.
3673
By default, bzr will try to merge in all new work from the other
3674
branch, automatically determining an appropriate base. If this
3675
fails, you may need to give an explicit base.
3885
3677
Merge will do its best to combine the changes in two branches, but there
3886
3678
are some kinds of problems only a human can fix. When it encounters those,
3890
3682
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.
3684
If there is no default branch set, the first merge will set it. After
3685
that, you can omit the branch to use the default. To change the
3686
default, use --remember. The value will only be saved if the remote
3687
location can be accessed.
3897
3689
The results of the merge are placed into the destination working
3898
3690
directory, where they can be reviewed (with bzr diff), tested, and then
3899
3691
committed to record the result of the merge.
3901
3693
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
3694
--force is given. The --force option can also be used to create a
3905
3695
merge revision which has more than two parents.
3907
3697
If one would like to merge changes from the working tree of the other
3955
3745
' completely merged into the source, pull from the'
3956
3746
' source rather than merging. When this happens,'
3957
3747
' you do not need to commit the result.'),
3958
custom_help('directory',
3959
3749
help='Branch to merge into, '
3960
'rather than the one containing the working directory.'),
3750
'rather than the one containing the working directory.',
3961
3754
Option('preview', help='Instead of merging, show a diff of the'
3963
3756
Option('interactive', help='Select changes interactively.',
4035
3825
self.sanity_check_merger(merger)
4036
3826
if (merger.base_rev_id == merger.other_rev_id and
4037
3827
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
3828
note('Nothing to do.')
4047
if pull and not preview:
4048
3831
if merger.interesting_files is not None:
4049
3832
raise errors.BzrCommandError('Cannot pull individual files')
4050
3833
if (merger.base_rev_id == tree.last_revision()):
4074
3857
def _do_preview(self, merger):
4075
3858
from bzrlib.diff import show_diff_trees
4076
3859
result_tree = self._get_preview(merger)
4077
path_encoding = osutils.get_diff_header_encoding()
4078
3860
show_diff_trees(merger.this_tree, result_tree, self.outf,
4079
old_label='', new_label='',
4080
path_encoding=path_encoding)
3861
old_label='', new_label='')
4082
3863
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4083
3864
merger.change_reporter = change_reporter
4159
3940
if other_revision_id is None:
4160
3941
other_revision_id = _mod_revision.ensure_null(
4161
3942
other_branch.last_revision())
4162
# Remember where we merge from. We need to remember if:
4163
# - user specify a location (and we don't merge from the parent
4165
# - user ask to remember or there is no previous location set to merge
4166
# from and user didn't ask to *not* remember
4167
if (user_location is not None
4169
or (remember is None
4170
and tree.branch.get_submit_branch() is None)))):
3943
# Remember where we merge from
3944
if ((remember or tree.branch.get_submit_branch() is None) and
3945
user_location is not None):
4171
3946
tree.branch.set_submit_branch(other_branch.base)
4172
# Merge tags (but don't set them in the master branch yet, the user
4173
# might revert this merge). Commit will propagate them.
4174
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3947
_merge_tags_if_possible(other_branch, tree.branch)
4175
3948
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4176
3949
other_revision_id, base_revision_id, other_branch, base_branch)
4177
3950
if other_path != '':
4276
4049
def run(self, file_list=None, merge_type=None, show_base=False,
4277
4050
reprocess=False):
4278
from bzrlib.conflicts import restore
4279
4051
if merge_type is None:
4280
4052
merge_type = _mod_merge.Merge3Merger
4281
tree, file_list = WorkingTree.open_containing_paths(file_list)
4282
self.add_cleanup(tree.lock_write().unlock)
4053
tree, file_list = tree_files(file_list)
4055
self.add_cleanup(tree.unlock)
4283
4056
parents = tree.get_parent_ids()
4284
4057
if len(parents) != 2:
4285
4058
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4340
4113
class cmd_revert(Command):
4341
__doc__ = """Revert files to a previous revision.
4114
"""Revert files to a previous revision.
4343
4116
Giving a list of files will revert only those files. Otherwise, all files
4344
4117
will be reverted. If the revision is not specified with '--revision', the
4345
4118
last committed revision is used.
4347
4120
To remove only some changes, without reverting to a prior version, use
4348
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4349
will remove the changes introduced by the second last commit (-2), without
4350
affecting the changes introduced by the last commit (-1). To remove
4351
certain changes on a hunk-by-hunk basis, see the shelve command.
4121
merge instead. For example, "merge . --revision -2..-3" will remove the
4122
changes introduced by -2, without affecting the changes introduced by -1.
4123
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4353
4125
By default, any files that have been manually changed will be backed up
4354
4126
first. (Files changed only by merge are not backed up.) Backup files have
4519
4291
theirs_only=False,
4520
4292
log_format=None, long=False, short=False, line=False,
4521
4293
show_ids=False, verbose=False, this=False, other=False,
4522
include_merges=False, revision=None, my_revision=None,
4294
include_merges=False, revision=None, my_revision=None):
4524
4295
from bzrlib.missing import find_unmerged, iter_log_revisions
4525
4296
def message(s):
4526
4297
if not is_quiet():
4556
4325
remote_branch = Branch.open(other_branch)
4557
4326
if remote_branch.base == local_branch.base:
4558
4327
remote_branch = local_branch
4560
self.add_cleanup(remote_branch.lock_read().unlock)
4329
local_branch.lock_read()
4330
self.add_cleanup(local_branch.unlock)
4562
4331
local_revid_range = _revision_range_to_revid_range(
4563
4332
_get_revision_range(my_revision, local_branch,
4335
remote_branch.lock_read()
4336
self.add_cleanup(remote_branch.unlock)
4566
4337
remote_revid_range = _revision_range_to_revid_range(
4567
4338
_get_revision_range(revision,
4568
4339
remote_branch, self.name()))
4628
4400
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.
4401
"""Compress the data within a repository."""
4647
4403
_see_also = ['repositories']
4648
4404
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):
4406
def run(self, branch_or_repo='.'):
4654
4407
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4656
4409
branch = dir.open_branch()
4657
4410
repository = branch.repository
4658
4411
except errors.NotBranchError:
4659
4412
repository = dir.open_repository()
4660
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4663
4416
class cmd_plugins(Command):
4664
__doc__ = """List the installed plugins.
4417
"""List the installed plugins.
4666
4419
This command displays the list of installed plugins including
4667
4420
version of plugin and a short description of each.
4684
4437
@display_command
4685
4438
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)))
4439
import bzrlib.plugin
4440
from inspect import getdoc
4442
for name, plugin in bzrlib.plugin.plugins().items():
4443
version = plugin.__version__
4444
if version == 'unknown':
4446
name_ver = '%s %s' % (name, version)
4447
d = getdoc(plugin.module)
4449
doc = d.split('\n')[0]
4451
doc = '(no description)'
4452
result.append((name_ver, doc, plugin.path()))
4453
for name_ver, doc, path in sorted(result):
4454
self.outf.write("%s\n" % name_ver)
4455
self.outf.write(" %s\n" % doc)
4457
self.outf.write(" %s\n" % path)
4458
self.outf.write("\n")
4692
4461
class cmd_testament(Command):
4693
__doc__ = """Show testament (signing-form) of a revision."""
4462
"""Show testament (signing-form) of a revision."""
4694
4463
takes_options = [
4696
4465
Option('long', help='Produce long-format testament.'),
4738
4508
Option('long', help='Show commit date in annotations.'),
4743
4512
encoding_type = 'exact'
4745
4514
@display_command
4746
4515
def run(self, filename, all=False, long=False, revision=None,
4747
show_ids=False, directory=None):
4748
from bzrlib.annotate import (
4517
from bzrlib.annotate import annotate_file, annotate_file_tree
4751
4518
wt, branch, relpath = \
4752
_open_directory_or_containing_tree_or_branch(filename, directory)
4519
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4753
4520
if wt is not None:
4754
self.add_cleanup(wt.lock_read().unlock)
4522
self.add_cleanup(wt.unlock)
4756
self.add_cleanup(branch.lock_read().unlock)
4525
self.add_cleanup(branch.unlock)
4757
4526
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:
4528
self.add_cleanup(tree.unlock)
4760
4530
file_id = wt.path2id(relpath)
4762
4532
file_id = tree.path2id(relpath)
4763
4533
if file_id is None:
4764
4534
raise errors.NotVersionedError(filename)
4535
file_version = tree.inventory[file_id].revision
4765
4536
if wt is not None and revision is None:
4766
4537
# If there is a tree and we're not annotating historical
4767
4538
# versions, annotate the working tree's content.
4768
4539
annotate_file_tree(wt, file_id, self.outf, long, all,
4769
4540
show_ids=show_ids)
4771
annotate_file_tree(tree, file_id, self.outf, long, all,
4772
show_ids=show_ids, branch=branch)
4542
annotate_file(branch, file_version, file_id, long, all, self.outf,
4775
4546
class cmd_re_sign(Command):
4776
__doc__ = """Create a digital signature for an existing revision."""
4547
"""Create a digital signature for an existing revision."""
4777
4548
# TODO be able to replace existing ones.
4779
4550
hidden = True # is this right ?
4780
4551
takes_args = ['revision_id*']
4781
takes_options = ['directory', 'revision']
4552
takes_options = ['revision']
4783
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4554
def run(self, revision_id_list=None, revision=None):
4784
4555
if revision_id_list is not None and revision is not None:
4785
4556
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4786
4557
if revision_id_list is None and revision is None:
4787
4558
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)
4559
b = WorkingTree.open_containing(u'.')[0].branch
4561
self.add_cleanup(b.unlock)
4790
4562
return self._run(b, revision_id_list, revision)
4792
4564
def _run(self, b, revision_id_list, revision):
4888
4659
_see_also = ['checkouts', 'bind']
4889
4660
takes_args = []
4890
takes_options = ['directory']
4892
def run(self, directory=u'.'):
4893
b, relpath = Branch.open_containing(directory)
4664
b, relpath = Branch.open_containing(u'.')
4894
4665
if not b.unbind():
4895
4666
raise errors.BzrCommandError('Local branch is not bound')
4898
4669
class cmd_uncommit(Command):
4899
__doc__ = """Remove the last committed revision.
4670
"""Remove the last committed revision.
4901
4672
--verbose will print out what is being removed.
4902
4673
--dry-run will go through all the motions, but not actually
4942
4713
b = control.open_branch()
4944
4715
if tree is not None:
4945
self.add_cleanup(tree.lock_write().unlock)
4717
self.add_cleanup(tree.unlock)
4947
self.add_cleanup(b.lock_write().unlock)
4720
self.add_cleanup(b.unlock)
4948
4721
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4950
4723
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5021
4788
bzr break-lock bzr+ssh://example.com/bzr/foo
5022
bzr break-lock --conf ~/.bazaar
5025
4790
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):
4792
def run(self, location=None, show=False):
5034
4793
if location is None:
5035
4794
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:
4795
control, relpath = bzrdir.BzrDir.open_containing(location)
4797
control.break_lock()
4798
except NotImplementedError:
5051
4802
class cmd_wait_until_signalled(Command):
5052
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4803
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5054
4805
This just prints a line to signal when it is ready, then blocks on stdin.
5115
4867
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5116
4868
protocol=None):
5117
from bzrlib import transport
4869
from bzrlib.transport import get_transport, transport_server_registry
5118
4870
if directory is None:
5119
4871
directory = os.getcwd()
5120
4872
if protocol is None:
5121
protocol = transport.transport_server_registry.get()
4873
protocol = transport_server_registry.get()
5122
4874
host, port = self.get_host_and_port(port)
5123
4875
url = urlutils.local_path_to_url(directory)
5124
4876
if not allow_writes:
5125
4877
url = 'readonly+' + url
5126
t = transport.get_transport(url)
5127
protocol(t, host, port, inet)
4878
transport = get_transport(url)
4879
protocol(transport, host, port, inet)
5130
4882
class cmd_join(Command):
5131
__doc__ = """Combine a tree into its containing tree.
4883
"""Combine a tree into its containing tree.
5133
4885
This command requires the target tree to be in a rich-root format.
5242
4993
encoding_type = 'exact'
5244
4995
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5245
sign=False, revision=None, mail_to=None, message=None,
4996
sign=False, revision=None, mail_to=None, message=None):
5247
4997
from bzrlib.revision import ensure_null, NULL_REVISION
5248
4998
include_patch, include_bundle = {
5249
4999
'plain': (False, False),
5250
5000
'diff': (True, False),
5251
5001
'bundle': (True, True),
5253
branch = Branch.open(directory)
5003
branch = Branch.open('.')
5254
5004
stored_submit_branch = branch.get_submit_branch()
5255
5005
if submit_branch is None:
5256
5006
submit_branch = stored_submit_branch
5332
5082
source branch defaults to that containing the working directory, but can
5333
5083
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
5085
In order to calculate those changes, bzr must analyse the submit branch.
5342
5086
Therefore it is most efficient for the submit branch to be a local mirror.
5343
5087
If a public location is known for the submit_branch, that location is used
5414
5158
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5415
no_patch=False, revision=None, remember=None, output=None,
5159
no_patch=False, revision=None, remember=False, output=None,
5416
5160
format=None, mail_to=None, message=None, body=None,
5417
5161
strict=None, **kwargs):
5418
5162
from bzrlib.send import send
5512
5256
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5513
5257
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
5260
_see_also = ['commit', 'tags']
5522
takes_args = ['tag_name?']
5261
takes_args = ['tag_name']
5523
5262
takes_options = [
5524
5263
Option('delete',
5525
5264
help='Delete this tag rather than placing it.',
5527
custom_help('directory',
5528
help='Branch in which to place the tag.'),
5267
help='Branch in which to place the tag.',
5529
5271
Option('force',
5530
5272
help='Replace existing tags.',
5535
def run(self, tag_name=None,
5277
def run(self, tag_name,
5541
5283
branch, relpath = Branch.open_containing(directory)
5542
self.add_cleanup(branch.lock_write().unlock)
5285
self.add_cleanup(branch.unlock)
5544
if tag_name is None:
5545
raise errors.BzrCommandError("No tag specified to delete.")
5546
5287
branch.tags.delete_tag(tag_name)
5547
note('Deleted tag %s.' % tag_name)
5288
self.outf.write('Deleted tag %s.\n' % tag_name)
5550
5291
if len(revision) != 1:
5554
5295
revision_id = revision[0].as_revision_id(branch)
5556
5297
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
5298
if (not force) and branch.tags.has_tag(tag_name):
5563
5299
raise errors.TagAlreadyExists(tag_name)
5564
5300
branch.tags.set_tag(tag_name, revision_id)
5565
note('Created tag %s.' % tag_name)
5301
self.outf.write('Created tag %s.\n' % tag_name)
5568
5304
class cmd_tags(Command):
5569
__doc__ = """List tags.
5571
5307
This command shows a table of tag names and the revisions they reference.
5574
5310
_see_also = ['tag']
5575
5311
takes_options = [
5576
custom_help('directory',
5577
help='Branch whose tags should be displayed.'),
5578
RegistryOption('sort',
5313
help='Branch whose tags should be displayed.',
5317
RegistryOption.from_kwargs('sort',
5579
5318
'Sort tags by different criteria.', title='Sorting',
5580
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5319
alpha='Sort tags lexicographically (default).',
5320
time='Sort tags chronologically.',
5586
5326
@display_command
5587
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5588
from bzrlib.tag import tag_sort_methods
5589
5333
branch, relpath = Branch.open_containing(directory)
5591
5335
tags = branch.tags.get_tag_dict().items()
5595
self.add_cleanup(branch.lock_read().unlock)
5340
self.add_cleanup(branch.unlock)
5597
5342
graph = branch.repository.get_graph()
5598
5343
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5600
5345
# only show revisions between revid1 and revid2 (inclusive)
5601
5346
tags = [(tag, revid) for tag, revid in tags if
5602
5347
graph.is_between(revid, revid1, revid2)]
5604
sort = tag_sort_methods.get()
5350
elif sort == 'time':
5352
for tag, revid in tags:
5354
revobj = branch.repository.get_revision(revid)
5355
except errors.NoSuchRevision:
5356
timestamp = sys.maxint # place them at the end
5358
timestamp = revobj.timestamp
5359
timestamps[revid] = timestamp
5360
tags.sort(key=lambda x: timestamps[x[1]])
5606
5361
if not show_ids:
5607
5362
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5608
5363
for index, (tag, revid) in enumerate(tags):
5747
5501
def run(self, to_location=None, force=False, create_branch=False,
5748
revision=None, directory=u'.'):
5749
5503
from bzrlib import switch
5750
tree_location = directory
5751
5505
revision = _get_one_revision('switch', revision)
5752
5506
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5753
5507
if to_location is None:
5754
5508
if revision is None:
5755
5509
raise errors.BzrCommandError('You must supply either a'
5756
5510
' revision or a location')
5757
to_location = tree_location
5759
5513
branch = control_dir.open_branch()
5760
5514
had_explicit_nick = branch.get_config().has_explicit_nickname()
5983
5736
self.outf.write(" <no hooks installed>\n")
5986
class cmd_remove_branch(Command):
5987
__doc__ = """Remove a branch.
5989
This will remove the branch from the specified location but
5990
will keep any working tree or repository in place.
5994
Remove the branch at repo/trunk::
5996
bzr remove-branch repo/trunk
6000
takes_args = ["location?"]
6002
aliases = ["rmbranch"]
6004
def run(self, location=None):
6005
if location is None:
6007
branch = Branch.open_containing(location)[0]
6008
branch.bzrdir.destroy_branch()
6011
5739
class cmd_shelve(Command):
6012
__doc__ = """Temporarily set aside some changes from the current tree.
5740
"""Temporarily set aside some changes from the current tree.
6014
5742
Shelve allows you to temporarily put changes you've made "on the shelf",
6015
5743
ie. out of the way, until a later time when you can bring them back from
6032
5760
You can put multiple items on the shelf, and by default, 'unshelve' will
6033
5761
restore the most recently shelved changes.
6035
For complicated changes, it is possible to edit the changes in a separate
6036
editor program to decide what the file remaining in the working copy
6037
should look like. To do this, add the configuration option
6039
change_editor = PROGRAM @new_path @old_path
6041
where @new_path is replaced with the path of the new version of the
6042
file and @old_path is replaced with the path of the old version of
6043
the file. The PROGRAM should save the new file with the desired
6044
contents of the file in the working tree.
6048
5764
takes_args = ['file*']
6050
5766
takes_options = [
6053
5768
Option('all', help='Shelve all changes.'),
6060
5775
Option('destroy',
6061
5776
help='Destroy removed changes instead of shelving them.'),
6063
_see_also = ['unshelve', 'configuration']
5778
_see_also = ['unshelve']
6065
5780
def run(self, revision=None, all=False, file_list=None, message=None,
6066
writer=None, list=False, destroy=False, directory=None):
5781
writer=None, list=False, destroy=False):
6068
return self.run_for_list(directory=directory)
5783
return self.run_for_list()
6069
5784
from bzrlib.shelf_ui import Shelver
6070
5785
if writer is None:
6071
5786
writer = bzrlib.option.diff_writer_registry.get()
6073
5788
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6074
file_list, message, destroy=destroy, directory=directory)
5789
file_list, message, destroy=destroy)
6146
5859
To check what clean-tree will do, use --dry-run.
6148
takes_options = ['directory',
6149
Option('ignored', help='Delete all ignored files.'),
6150
Option('detritus', help='Delete conflict files, merge and revert'
5861
takes_options = [Option('ignored', help='Delete all ignored files.'),
5862
Option('detritus', help='Delete conflict files, merge'
6151
5863
' backups, and failed selftest dirs.'),
6152
5864
Option('unknown',
6153
5865
help='Delete files unknown to bzr (default).'),
6155
5867
' deleting them.'),
6156
5868
Option('force', help='Do not prompt before deleting.')]
6157
5869
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6158
force=False, directory=u'.'):
6159
5871
from bzrlib.clean_tree import clean_tree
6160
5872
if not (unknown or ignored or detritus):
6164
clean_tree(directory, unknown=unknown, ignored=ignored,
6165
detritus=detritus, dry_run=dry_run, no_prompt=force)
5876
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5877
dry_run=dry_run, no_prompt=force)
6168
5880
class cmd_reference(Command):
6169
__doc__ = """list, view and set branch locations for nested trees.
5881
"""list, view and set branch locations for nested trees.
6171
5883
If no arguments are provided, lists the branch locations for nested trees.
6172
5884
If one argument is provided, display the branch location for that tree.
6212
5924
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)
5927
# these get imported and then picked up by the scan for cmd_*
5928
# TODO: Some more consistent way to split command definitions across files;
5929
# we do need to load at least some information about them to know of
5930
# aliases. ideally we would avoid loading the implementation until the
5931
# details were needed.
5932
from bzrlib.cmd_version_info import cmd_version_info
5933
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5934
from bzrlib.bundle.commands import (
5937
from bzrlib.foreign import cmd_dpush
5938
from bzrlib.sign_my_commits import cmd_sign_my_commits
added
removed
bzrlib/builtins.py
