75
65
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
68
def tree_files(file_list, default_branch=u'.', canonicalize=True):
81
return internal_tree_files(file_list, default_branch, canonicalize,
70
return internal_tree_files(file_list, default_branch, canonicalize)
83
71
except errors.FileInWrongBranch, e:
84
72
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
73
(e.path, file_list[0]))
88
def tree_files_for_add(file_list):
90
Return a tree and list of absolute paths from a file list.
92
Similar to tree_files, but add handles files a bit differently, so it a
93
custom implementation. In particular, MutableTreeTree.smart_add expects
94
absolute paths, which it immediately converts to relative paths.
96
# FIXME Would be nice to just return the relative paths like
97
# internal_tree_files does, but there are a large number of unit tests
98
# that assume the current interface to mutabletree.smart_add
100
tree, relpath = WorkingTree.open_containing(file_list[0])
101
if tree.supports_views():
102
view_files = tree.views.lookup_view()
104
for filename in file_list:
105
if not osutils.is_inside_any(view_files, filename):
106
raise errors.FileOutsideView(filename, view_files)
107
file_list = file_list[:]
108
file_list[0] = tree.abspath(relpath)
110
tree = WorkingTree.open_containing(u'.')[0]
111
if tree.supports_views():
112
view_files = tree.views.lookup_view()
114
file_list = view_files
115
view_str = views.view_display_str(view_files)
116
note("Ignoring files outside view. View is %s" % view_str)
117
return tree, file_list
120
def _get_one_revision(command_name, revisions):
121
if revisions is None:
123
if len(revisions) != 1:
124
raise errors.BzrCommandError(
125
'bzr %s --revision takes exactly one revision identifier' % (
130
76
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
131
"""Get a revision tree. Not suitable for commands that change the tree.
133
Specifically, the basis tree in dirstate trees is coupled to the dirstate
134
and doing a commit/uncommit/pull will at best fail due to changing the
137
If tree is passed in, it should be already locked, for lifetime management
138
of the trees internal cached state.
140
77
if branch is None:
141
78
branch = tree.branch
142
79
if revisions is None:
162
101
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
103
:param file_list: Filenames to convert.
166
105
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
108
:return: workingtree, [relative_paths]
174
110
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
111
return WorkingTree.open_containing(default_branch)[0], file_list
183
112
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):
113
return tree, safe_relpath_files(tree, file_list, canonicalize)
116
def safe_relpath_files(tree, file_list, canonicalize=True):
189
117
"""Convert file_list into a list of relpaths in tree.
191
119
:param tree: A tree to operate on.
192
120
: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
121
:return: A list of relative paths.
196
122
:raises errors.PathNotChild: When a provided path is in a different tree
199
125
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
128
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
129
# doesn't - fix that up here before we enter the loop.
362
257
' --revision or a revision_id')
363
258
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
260
# TODO: jam 20060112 should cat-revision always output utf-8?
261
if revision_id is not None:
262
revision_id = osutils.safe_revision_id(revision_id, warn=False)
264
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
265
except errors.NoSuchRevision:
266
msg = "The repository %s contains no revision %s." % (b.repository.base,
268
raise errors.BzrCommandError(msg)
269
elif revision is not None:
272
raise errors.BzrCommandError('You cannot specify a NULL'
274
rev_id = rev.as_revision_id(b)
275
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
278
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
279
"""Dump the contents of a btree index file to stdout.
395
281
PATH is a btree index file, it can be any URL. This includes things like
396
282
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
358
To re-create the working tree, use "bzr checkout".
481
360
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
361
takes_args = ['location?']
483
362
takes_options = [
485
364
help='Remove the working tree even if it has '
486
365
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
368
def run(self, location='.', force=False):
369
d = bzrdir.BzrDir.open(location)
372
working = d.open_workingtree()
373
except errors.NoWorkingTree:
374
raise errors.BzrCommandError("No working tree to remove")
375
except errors.NotLocalUrl:
376
raise errors.BzrCommandError("You cannot remove the working tree of a "
379
changes = working.changes_from(working.basis_tree())
380
if changes.has_changed():
381
raise errors.UncommittedChanges(working)
383
working_path = working.bzrdir.root_transport.base
384
branch_path = working.branch.bzrdir.root_transport.base
385
if working_path != branch_path:
386
raise errors.BzrCommandError("You cannot remove the working tree from "
387
"a lightweight checkout")
389
d.destroy_workingtree()
514
392
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
393
"""Show current revision number.
517
395
This is equal to the number of revisions on this branch.
520
398
_see_also = ['info']
521
399
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
547
self.outf.write(str(revno) + '\n')
402
def run(self, location=u'.'):
403
self.outf.write(str(Branch.open_containing(location)[0].revno()))
404
self.outf.write('\n')
550
407
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
408
"""Show revision number and revision id for a given revision identifier.
554
411
takes_args = ['revision_info*']
563
Option('tree', help='Show revno of working tree'),
567
def run(self, revision=None, directory=u'.', tree=False,
568
revision_info_list=[]):
423
def run(self, revision=None, directory=u'.', revision_info_list=[]):
571
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
581
426
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
427
revs.extend(revision)
583
428
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
594
revision_ids.append(b.last_revision())
598
for revision_id in revision_ids:
429
for rev in revision_info_list:
430
revs.append(RevisionSpec.from_string(rev))
432
b = Branch.open_containing(directory)[0]
435
revs.append(RevisionSpec.from_string('-1'))
438
revision_id = rev.as_revision_id(b)
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
440
revno = '%4d' % (b.revision_id_to_revno(revision_id))
602
441
except errors.NoSuchRevision:
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
442
dotted_map = b.get_revision_id_to_revno_map()
443
revno = '.'.join(str(i) for i in dotted_map[revision_id])
444
print '%s %s' % (revno, revision_id)
612
447
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
448
"""Add specified files or directories.
615
450
In non-recursive mode, all the named items are added, regardless
616
451
of whether they were previously ignored. A warning is given if
817
662
takes_args = ['names*']
818
663
takes_options = [Option("after", help="Move only the bzr identifier"
819
664
" of the file, because the file has already been moved."),
820
Option('auto', help='Automatically guess renames.'),
821
Option('dry-run', help='Avoid making changes when guessing renames.'),
823
666
aliases = ['move', 'rename']
824
667
encoding_type = 'replace'
826
def run(self, names_list, after=False, auto=False, dry_run=False):
828
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
669
def run(self, names_list, after=False):
831
670
if names_list is None:
833
673
if len(names_list) < 2:
834
674
raise errors.BzrCommandError("missing file argument")
835
675
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
840
def run_auto(self, names_list, after, dry_run):
841
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
678
self._run(tree, names_list, rel_names, after)
852
682
def _run(self, tree, names_list, rel_names, after):
853
683
into_existing = osutils.isdir(names_list[-1])
1030
843
branch_from = Branch.open(location,
1031
844
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1035
846
if branch_to.get_parent() is None or remember:
1036
847
branch_to.set_parent(branch_from.base)
1038
849
if revision is not None:
1039
revision_id = revision.as_revision_id(branch_from)
1041
if tree_to is not None:
1042
view_info = _get_view_info_for_change_reporter(tree_to)
1043
change_reporter = delta._ChangeReporter(
1044
unversioned_filter=tree_to.is_ignored,
1045
view_info=view_info)
1046
result = tree_to.pull(
1047
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1050
result = branch_to.pull(
1051
branch_from, overwrite, revision_id, local=local)
1053
result.report(self.outf)
1054
if verbose and result.old_revid != result.new_revid:
1055
log.show_branch_change(
1056
branch_to, self.outf, result.old_revno,
850
if len(revision) == 1:
851
revision_id = revision[0].as_revision_id(branch_from)
853
raise errors.BzrCommandError(
854
'bzr pull --revision takes one value.')
856
branch_to.lock_write()
858
if tree_to is not None:
859
change_reporter = delta._ChangeReporter(
860
unversioned_filter=tree_to.is_ignored)
861
result = tree_to.pull(branch_from, overwrite, revision_id,
863
possible_transports=possible_transports)
865
result = branch_to.pull(branch_from, overwrite, revision_id)
867
result.report(self.outf)
868
if verbose and result.old_revid != result.new_revid:
869
log.show_branch_change(branch_to, self.outf, result.old_revno,
1060
875
class cmd_push(Command):
1061
__doc__ = """Update a mirror of this branch.
876
"""Update a mirror of this branch.
1063
878
The target branch will not have its working tree populated because this
1064
879
is both expensive, and is not supported on remote file systems.
1066
881
Some smart servers or protocols *may* put the working tree in place in
1190
999
takes_args = ['from_location', 'to_location?']
1191
1000
takes_options = ['revision', Option('hardlink',
1192
1001
help='Hard-link working tree files where possible.'),
1194
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1198
1002
Option('stacked',
1199
1003
help='Create a stacked branch referring to the source branch. '
1200
1004
'The new branch will depend on the availability of the source '
1201
1005
'branch for all operations.'),
1202
1006
Option('standalone',
1203
1007
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1009
aliases = ['get', 'clone']
1214
1011
def run(self, from_location, to_location=None, revision=None,
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1012
hardlink=False, stacked=False, standalone=False):
1218
1013
from bzrlib.tag import _merge_tags_if_possible
1014
if revision is None:
1016
elif len(revision) > 1:
1017
raise errors.BzrCommandError(
1018
'bzr branch --revision takes exactly 1 revision value')
1219
1020
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1221
revision = _get_one_revision('branch', revision)
1222
1022
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1024
if len(revision) == 1 and revision[0] is not None:
1025
revision_id = revision[0].as_revision_id(br_from)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1027
# FIXME - wt.last_revision, fallback to branch, fall back to
1028
# None or perhaps NULL_REVISION to mean copy nothing
1030
revision_id = br_from.last_revision()
1031
if to_location is None:
1032
to_location = urlutils.derive_to_location(from_location)
1033
to_transport = transport.get_transport(to_location)
1035
to_transport.mkdir('.')
1036
except errors.FileExists:
1037
raise errors.BzrCommandError('Target directory "%s" already'
1038
' exists.' % to_location)
1039
except errors.NoSuchFile:
1040
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1043
# preserve whatever source format we have.
1044
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1045
possible_transports=[to_transport],
1046
accelerator_tree=accelerator_tree,
1047
hardlink=hardlink, stacked=stacked,
1048
force_new_repo=standalone,
1049
source_branch=br_from)
1050
branch = dir.open_branch()
1051
except errors.NoSuchRevision:
1052
to_transport.delete_tree('.')
1053
msg = "The branch %s has no revision %s." % (from_location,
1055
raise errors.BzrCommandError(msg)
1056
_merge_tags_if_possible(br_from, branch)
1057
# If the source branch is stacked, the new branch may
1058
# be stacked whether we asked for that explicitly or not.
1059
# We therefore need a try/except here and not just 'if stacked:'
1061
note('Created new stacked branch referring to %s.' %
1062
branch.get_stacked_on_url())
1063
except (errors.NotStacked, errors.UnstackableBranchFormat,
1064
errors.UnstackableRepositoryFormat), e:
1065
note('Branched %d revision(s).' % branch.revno())
1288
1070
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1071
"""Create a new checkout of an existing branch.
1291
1073
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1074
the branch found in '.'. This is useful if you have removed the working tree
1293
1075
or if it was never created - i.e. if you pushed the branch to its current
1294
1076
location using SFTP.
1296
1078
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1297
1079
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1298
1080
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1367
1153
def run(self, dir=u'.'):
1368
1154
tree = WorkingTree.open_containing(dir)[0]
1369
1155
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1383
renames.append(paths)
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1157
new_inv = tree.inventory
1158
old_tree = tree.basis_tree()
1159
old_tree.lock_read()
1161
old_inv = old_tree.inventory
1163
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1164
for f, paths, c, v, p, n, k, e in iterator:
1165
if paths[0] == paths[1]:
1169
renames.append(paths)
1171
for old_name, new_name in renames:
1172
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1179
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1180
"""Update a tree to have the latest code committed to its branch.
1392
1182
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1183
conflicts. If you have any local changes, you will still
1394
1184
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1186
If you want to discard your local changes, you can just do a
1397
1187
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1403
1190
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1191
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1192
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1194
def run(self, dir='.'):
1412
1195
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1196
possible_transports = []
1415
master = branch.get_master_branch(
1197
master = tree.branch.get_master_branch(
1416
1198
possible_transports=possible_transports)
1417
1199
if master is not None:
1418
1200
tree.lock_write()
1419
branch_location = master.base
1421
1202
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1204
existing_pending_merges = tree.get_parent_ids()[1:]
1205
last_rev = _mod_revision.ensure_null(tree.last_revision())
1206
if last_rev == _mod_revision.ensure_null(
1207
tree.branch.last_revision()):
1208
# may be up to date, check master too.
1209
if master is None or last_rev == _mod_revision.ensure_null(
1210
master.last_revision()):
1211
revno = tree.branch.revision_id_to_revno(last_rev)
1212
note("Tree is up to date at revision %d." % (revno,))
1450
1214
conflicts = tree.update(
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1215
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1216
possible_transports=possible_transports)
1217
revno = tree.branch.revision_id_to_revno(
1218
_mod_revision.ensure_null(tree.last_revision()))
1219
note('Updated to revision %d.' % (revno,))
1220
if tree.get_parent_ids()[1:] != existing_pending_merges:
1221
note('Your local commits will now show as pending merges with '
1222
"'bzr status', and can be committed with 'bzr commit'.")
1475
1231
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1232
"""Show information about a working tree, branch or repository.
1478
1234
This command will show all known locations and formats associated to the
1479
tree, branch or repository.
1481
In verbose mode, statistical information is included with each report.
1482
To see extended statistic information, use a verbosity level of 2 or
1483
higher by specifying the verbose option multiple times, e.g. -vv.
1235
tree, branch or repository. Statistical information is included with
1485
1238
Branches and working trees will also report any missing revisions.
1489
Display information on the format and related locations:
1493
Display the above together with extended format information and
1494
basic statistics (like the number of files in the working tree and
1495
number of revisions in the branch and repository):
1499
Display the above together with number of committers to the branch:
1503
1240
_see_also = ['revno', 'working-trees', 'repositories']
1504
1241
takes_args = ['location?']
1546
1283
file_list = [f for f in file_list]
1548
1285
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1550
# Heuristics should probably all move into tree.remove_smart or
1553
added = tree.changes_from(tree.basis_tree(),
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1556
if len(file_list) == 0:
1557
raise errors.BzrCommandError('No matching files.')
1558
elif file_list is None:
1559
# missing files show up in iter_changes(basis) as
1560
# versioned-with-no-kind.
1562
for change in tree.iter_changes(tree.basis_tree()):
1563
# Find paths in the working tree that have no kind:
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1566
file_list = sorted(missing, reverse=True)
1567
file_deletion_strategy = 'keep'
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1287
# Heuristics should probably all move into tree.remove_smart or
1290
added = tree.changes_from(tree.basis_tree(),
1291
specific_files=file_list).added
1292
file_list = sorted([f[0] for f in added], reverse=True)
1293
if len(file_list) == 0:
1294
raise errors.BzrCommandError('No matching files.')
1295
elif file_list is None:
1296
# missing files show up in iter_changes(basis) as
1297
# versioned-with-no-kind.
1299
for change in tree.iter_changes(tree.basis_tree()):
1300
# Find paths in the working tree that have no kind:
1301
if change[1][1] is not None and change[6][1] is None:
1302
missing.append(change[1][1])
1303
file_list = sorted(missing, reverse=True)
1304
file_deletion_strategy = 'keep'
1305
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1306
keep_files=file_deletion_strategy=='keep',
1307
force=file_deletion_strategy=='force')
1573
1312
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1313
"""Print file_id of a particular file or directory.
1576
1315
The file_id is assigned when the file is first added and remains the
1577
1316
same through all revisions where the file exists, even when it is
2114
1829
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2117
log is bzr's default tool for exploring the history of a branch.
2118
The branch to use is taken from the first parameter. If no parameters
2119
are given, the branch containing the working directory is logged.
2120
Here are some simple examples::
2122
bzr log log the current branch
2123
bzr log foo.py log a file in its branch
2124
bzr log http://server/branch log a branch on a server
2126
The filtering, ordering and information shown for each revision can
2127
be controlled as explained below. By default, all revisions are
2128
shown sorted (topologically) so that newer revisions appear before
2129
older ones and descendants always appear before ancestors. If displayed,
2130
merged revisions are shown indented under the revision in which they
2135
The log format controls how information about each revision is
2136
displayed. The standard log formats are called ``long``, ``short``
2137
and ``line``. The default is long. See ``bzr help log-formats``
2138
for more details on log formats.
2140
The following options can be used to control what information is
2143
-l N display a maximum of N revisions
2144
-n N display N levels of revisions (0 for all, 1 for collapsed)
2145
-v display a status summary (delta) for each revision
2146
-p display a diff (patch) for each revision
2147
--show-ids display revision-ids (and file-ids), not just revnos
2149
Note that the default number of levels to display is a function of the
2150
log format. If the -n option is not used, the standard log formats show
2151
just the top level (mainline).
2153
Status summaries are shown using status flags like A, M, etc. To see
2154
the changes explained using words like ``added`` and ``modified``
2155
instead, use the -vv option.
2159
To display revisions from oldest to newest, use the --forward option.
2160
In most cases, using this option will have little impact on the total
2161
time taken to produce a log, though --forward does not incrementally
2162
display revisions like --reverse does when it can.
2164
:Revision filtering:
2166
The -r option can be used to specify what revision or range of revisions
2167
to filter against. The various forms are shown below::
2169
-rX display revision X
2170
-rX.. display revision X and later
2171
-r..Y display up to and including revision Y
2172
-rX..Y display from X to Y inclusive
2174
See ``bzr help revisionspec`` for details on how to specify X and Y.
2175
Some common examples are given below::
2177
-r-1 show just the tip
2178
-r-10.. show the last 10 mainline revisions
2179
-rsubmit:.. show what's new on this branch
2180
-rancestor:path.. show changes since the common ancestor of this
2181
branch and the one at location path
2182
-rdate:yesterday.. show changes since yesterday
2184
When logging a range of revisions using -rX..Y, log starts at
2185
revision Y and searches back in history through the primary
2186
("left-hand") parents until it finds X. When logging just the
2187
top level (using -n1), an error is reported if X is not found
2188
along the way. If multi-level logging is used (-n0), X may be
2189
a nested merge revision and the log will be truncated accordingly.
2193
If parameters are given and the first one is not a branch, the log
2194
will be filtered to show only those revisions that changed the
2195
nominated files or directories.
2197
Filenames are interpreted within their historical context. To log a
2198
deleted file, specify a revision range so that the file existed at
2199
the end or start of the range.
2201
Historical context is also important when interpreting pathnames of
2202
renamed files/directories. Consider the following example:
2204
* revision 1: add tutorial.txt
2205
* revision 2: modify tutorial.txt
2206
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
2210
* ``bzr log guide.txt`` will log the file added in revision 1
2212
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2214
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2215
the original file in revision 2.
2217
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2218
was no file called guide.txt in revision 2.
2220
Renames are always followed by log. By design, there is no need to
2221
explicitly ask for this (and no way to stop logging a file back
2222
until it was last renamed).
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2231
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2241
top = log -l10 --line
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2245
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2248
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2252
very slow. A fix for this issue is currently under development.
2253
With or without that fix, it is recommended that a revision range
2254
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2257
used to find revisions matching user names, commit messages, etc.
2258
Among other features, this plugin can find all revisions containing
2259
a list of words but not others.
2261
When exploring non-mainline history on large projects with deep
2262
history, the performance of log can be greatly improved by installing
2263
the historycache plugin. This plugin buffers historical information
2264
trading disk space for faster speed.
1830
"""Show log of a branch, file, or directory.
1832
By default show the log of the branch containing the working directory.
1834
To request a range of logs, you can use the command -r begin..end
1835
-r revision requests a specific revision, -r ..end or -r begin.. are
1839
Log the current branch::
1847
Log the last 10 revisions of a branch::
1849
bzr log -r -10.. http://server/branch
2266
takes_args = ['file*']
2267
_see_also = ['log-formats', 'revisionspec']
1852
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1854
takes_args = ['location?']
2268
1855
takes_options = [
2269
1856
Option('forward',
2270
1857
help='Show from oldest to newest.'),
2378
1935
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
1936
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2382
1940
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2393
diff_type = 'partial'
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2435
Logger(b, rqst).show(lf)
1941
if log_format is None:
1942
log_format = log.log_formatter_registry.get_default(b)
1944
lf = log_format(show_ids=show_ids, to_file=self.outf,
1945
show_timezone=timezone,
1946
delta_format=get_verbosity_level(),
1953
direction=direction,
1954
start_revision=rev1,
1958
show_diff=show_diff)
2438
1963
def _get_revision_range(revisionspec_list, branch, command_name):
2439
1964
"""Take the input of a revision option and turn it into a revision range.
2441
1966
It returns RevisionInfo objects which can be used to obtain the rev_id's
2442
of the desired revisions. It does some user input validations.
1967
of the desired revisons. It does some user input validations.
2444
1969
if revisionspec_list is None:
2558
2077
if path is None:
2562
2082
raise errors.BzrCommandError('cannot specify both --from-root'
2565
2086
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2568
# Calculate the prefix to use
2572
prefix = relpath + '/'
2573
elif fs_path != '.' and not fs_path.endswith('/'):
2574
prefix = fs_path + '/'
2576
2092
if revision is not None or tree is None:
2577
2093
tree = _get_one_revision_tree('ls', revision, branch=branch)
2580
if isinstance(tree, WorkingTree) and tree.supports_views():
2581
view_files = tree.views.lookup_view()
2584
view_str = views.view_display_str(view_files)
2585
note("Ignoring files outside view. View is %s" % view_str)
2587
2095
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
from_dir=relpath, recursive=recursive):
2591
# Apply additional masking
2592
if not all and not selection[fc]:
2594
if kind is not None and fkind != kind:
2599
fullpath = osutils.pathjoin(relpath, fp)
2602
views.check_path_in_view(tree, fullpath)
2603
except errors.FileOutsideView:
2608
fp = osutils.pathjoin(prefix, fp)
2609
kindch = entry.kind_character()
2610
outstring = fp + kindch
2611
ui.ui_factory.clear_term()
2613
outstring = '%-8s %s' % (fc, outstring)
2614
if show_ids and fid is not None:
2615
outstring = "%-50s %s" % (outstring, fid)
2616
self.outf.write(outstring + '\n')
2618
self.outf.write(fp + '\0')
2621
self.outf.write(fid)
2622
self.outf.write('\0')
2630
self.outf.write('%-50s %s\n' % (outstring, my_id))
2632
self.outf.write(outstring + '\n')
2097
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2098
if fp.startswith(relpath):
2099
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2100
if non_recursive and '/' in fp:
2102
if not all and not selection[fc]:
2104
if kind is not None and fkind != kind:
2106
kindch = entry.kind_character()
2107
outstring = fp + kindch
2109
outstring = '%-8s %s' % (fc, outstring)
2110
if show_ids and fid is not None:
2111
outstring = "%-50s %s" % (outstring, fid)
2112
self.outf.write(outstring + '\n')
2114
self.outf.write(fp + '\0')
2117
self.outf.write(fid)
2118
self.outf.write('\0')
2126
self.outf.write('%-50s %s\n' % (outstring, my_id))
2128
self.outf.write(outstring + '\n')
2635
2133
class cmd_unknowns(Command):
2636
__doc__ = """List unknown files.
2134
"""List unknown files.
2858
2320
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2322
export(rev_tree, dest, format, root, subdir)
2862
2323
except errors.NoSuchExportFormat, e:
2863
2324
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2866
2327
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2328
"""Write the contents of a file as of a given revision to standard output.
2869
2330
If no revision is nominated, the last revision is used.
2871
2332
Note: Take care to redirect standard output when using this command on a
2875
2336
_see_also = ['ls']
2876
2337
takes_options = [
2877
2338
Option('name-from-revision', help='The path name in the old tree.'),
2878
Option('filters', help='Apply content filters to display the '
2879
'convenience form.'),
2882
2341
takes_args = ['filename']
2883
2342
encoding_type = 'exact'
2885
2344
@display_command
2886
def run(self, filename, revision=None, name_from_revision=False,
2345
def run(self, filename, revision=None, name_from_revision=False):
2888
2346
if revision is not None and len(revision) != 1:
2889
2347
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2348
" one revision specifier")
2891
2349
tree, branch, relpath = \
2892
2350
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2351
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2353
return self._run(tree, branch, relpath, filename, revision,
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2358
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2900
2359
if tree is None:
2901
2360
tree = b.basis_tree()
2902
2361
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2363
cur_file_id = tree.path2id(relpath)
2906
2364
old_file_id = rev_tree.path2id(relpath)
2908
2366
if name_from_revision:
2909
# Try in revision if requested
2910
2367
if old_file_id is None:
2911
2368
raise errors.BzrCommandError(
2912
2369
"%r is not present in revision %s" % (
2913
2370
filename, rev_tree.get_revision_id()))
2915
2372
content = rev_tree.get_file_text(old_file_id)
2917
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
2935
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
2949
self.outf.write(content)
2373
elif cur_file_id is not None:
2374
content = rev_tree.get_file_text(cur_file_id)
2375
elif old_file_id is not None:
2376
content = rev_tree.get_file_text(old_file_id)
2378
raise errors.BzrCommandError(
2379
"%r is not present in revision %s" % (
2380
filename, rev_tree.get_revision_id()))
2381
self.outf.write(content)
2952
2384
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2385
"""Show the offset in seconds from GMT to local time."""
2955
2387
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2389
print osutils.local_time_offset()
2961
2393
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2964
An explanatory message needs to be given for each commit. This is
2965
often done by using the --message option (getting the message from the
2966
command line) or by using the --file option (getting the message from
2967
a file). If neither of these options is given, an editor is opened for
2968
the user to enter the message. To see the changed files in the
2969
boilerplate text loaded into the editor, use the --show-diff option.
2971
By default, the entire tree is committed and the person doing the
2972
commit is assumed to be the author. These defaults can be overridden
2977
If selected files are specified, only changes to those files are
2978
committed. If a directory is specified then the directory and
2979
everything within it is committed.
2981
When excludes are given, they take precedence over selected files.
2982
For example, to commit only changes within foo, but not changes
2985
bzr commit foo -x foo/bar
2987
A selective commit after a merge is not yet supported.
2991
If the author of the change is not the same person as the committer,
2992
you can specify the author's name using the --author option. The
2993
name should be in the same format as a committer-id, e.g.
2994
"John Doe <jdoe@example.com>". If there is more than one author of
2995
the change you can specify the option multiple times, once for each
3000
A common mistake is to forget to add a new file or directory before
3001
running the commit command. The --strict option checks for unknown
3002
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3008
If you accidentially commit the wrong changes or make a spelling
3009
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3012
Hooks can also be configured to run after a commit. This allows you
3013
to trigger updates to external systems like bug trackers. The --fixes
3014
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2394
"""Commit changes into a new revision.
2396
If no arguments are given, the entire tree is committed.
2398
If selected files are specified, only changes to those files are
2399
committed. If a directory is specified then the directory and everything
2400
within it is committed.
2402
When excludes are given, they take precedence over selected files.
2403
For example, too commit only changes within foo, but not changes within
2406
bzr commit foo -x foo/bar
2408
If author of the change is not the same person as the committer, you can
2409
specify the author's name using the --author option. The name should be
2410
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2412
A selected-file commit may fail in some cases where the committed
2413
tree would be invalid. Consider::
2418
bzr commit foo -m "committing foo"
2419
bzr mv foo/bar foo/baz
2422
bzr commit foo/bar -m "committing bar but not baz"
2424
In the example above, the last commit will fail by design. This gives
2425
the user the opportunity to decide whether they want to commit the
2426
rename at the same time, separately first, or not at all. (As a general
2427
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2429
Note: A selected-file commit after a merge is not yet supported.
3034
2431
# TODO: Run hooks on tree to-be-committed, and after commit.
3073
2466
"the master branch until a normal commit "
3074
2467
"is performed."
3076
Option('show-diff', short_name='p',
3077
help='When no message is supplied, show the diff along'
3078
' with the status summary in the message editor.'),
2470
help='When no message is supplied, show the diff along'
2471
' with the status summary in the message editor.'),
3080
2473
aliases = ['ci', 'checkin']
3082
def _iter_bug_fix_urls(self, fixes, branch):
2475
def _get_bug_fix_properties(self, fixes, branch):
3083
2477
# Configure the properties for bug fixing attributes.
3084
2478
for fixed_bug in fixes:
3085
2479
tokens = fixed_bug.split(':')
3086
2480
if len(tokens) != 2:
3087
2481
raise errors.BzrCommandError(
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
2482
"Invalid bug %s. Must be in the form of 'tag:id'. "
2483
"Commit refused." % fixed_bug)
3091
2484
tag, bug_id = tokens
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
2486
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
3094
2487
except errors.UnknownBugTrackerAbbreviation:
3095
2488
raise errors.BzrCommandError(
3096
2489
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
2490
except errors.MalformedBugIdentifier:
3098
2491
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
2492
"Invalid bug identifier for %s. Commit refused."
2494
properties.append('%s fixed' % bug_url)
2495
return '\n'.join(properties)
3101
2497
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
2498
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
2499
author=None, show_diff=False, exclude=None):
3104
2500
from bzrlib.errors import (
3105
2501
PointlessCommit,
3106
2502
ConflictsInTree,
3138
2526
if fixes is None:
3140
bug_property = bugtracker.encode_fixes_bug_urls(
3141
self._iter_bug_fix_urls(fixes, tree.branch))
2528
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
3142
2529
if bug_property:
3143
2530
properties['bugs'] = bug_property
3145
2532
if local and not tree.branch.get_bound_location():
3146
2533
raise errors.LocalRequiresBoundBranch()
3148
if message is not None:
3150
file_exists = osutils.lexists(message)
3151
except UnicodeError:
3152
# The commit message contains unicode characters that can't be
3153
# represented in the filesystem encoding, so that can't be a
3158
'The commit message is a file name: "%(f)s".\n'
3159
'(use --file "%(f)s" to take commit message from that file)'
3161
ui.ui_factory.show_warning(warning_msg)
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3169
2535
def get_message(commit_obj):
3170
2536
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
2537
my_message = message
2538
if my_message is None and not file:
2539
t = make_commit_message_template_encoded(tree,
3180
2540
selected_list, diff=show_diff,
3181
2541
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3187
2542
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
2543
my_message = edit_commit_message_encoded(t,
3189
2544
start_message=start_message)
3190
2545
if my_message is None:
3191
2546
raise errors.BzrCommandError("please specify a commit"
3192
2547
" message with either --message or --file")
2548
elif my_message and file:
2549
raise errors.BzrCommandError(
2550
"please specify either --message or --file")
2552
my_message = codecs.open(file, 'rt',
2553
osutils.get_user_encoding()).read()
3193
2554
if my_message == "":
3194
2555
raise errors.BzrCommandError("empty commit message specified")
3195
2556
return my_message
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3198
# but the command line should not do that.
3199
if not selected_list:
3200
selected_list = None
3202
2559
tree.commit(message_callback=get_message,
3203
2560
specific_files=selected_list,
3204
2561
allow_pointless=unchanged, strict=strict, local=local,
3205
2562
reporter=None, verbose=verbose, revprops=properties,
3206
authors=author, timestamp=commit_stamp,
3208
2564
exclude=safe_relpath_files(tree, exclude))
3209
2565
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
2566
# FIXME: This should really happen before the file is read in;
2567
# perhaps prepare the commit; get the message; then actually commit
2568
raise errors.BzrCommandError("no changes to commit."
2569
" use --unchanged to commit anyhow")
3212
2570
except ConflictsInTree:
3213
2571
raise errors.BzrCommandError('Conflicts detected in working '
3214
2572
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3600
2933
if cache_dir is not None:
3601
2934
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2936
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2937
print ' %s (%s python%s)' % (
2939
bzrlib.version_string,
2940
bzrlib._format_version_tuple(sys.version_info),
3602
2943
if testspecs_list is not None:
3603
2944
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
self.additional_selftest_args.setdefault(
3620
'suite_decorators', []).append(parallel)
3622
2948
test_suite_factory = benchmarks.test_suite
3623
2949
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
2950
verbose = not is_quiet()
3625
2951
# TODO: should possibly lock the history file...
3626
2952
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
2954
test_suite_factory = None
3630
2955
benchfile = None
3631
selftest_kwargs = {"verbose": verbose,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
2957
result = selftest(verbose=verbose,
2959
stop_on_failure=one,
2960
transport=transport,
2961
test_suite_factory=test_suite_factory,
2962
lsprof_timed=lsprof_timed,
2963
bench_history=benchfile,
2964
matching_tests_first=first,
2965
list_only=list_only,
2966
random_seed=randomize,
2967
exclude_pattern=exclude,
2969
load_list=load_list,
2970
debug_flags=debugflag,
2971
starting_with=starting_with,
2974
if benchfile is not None:
2977
note('tests passed')
2979
note('tests failed')
3650
2980
return int(not result)
3653
2983
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
2984
"""Show version of bzr."""
3656
2986
encoding_type = 'replace'
3657
2987
takes_options = [
3821
3136
allow_pending = True
3822
3137
verified = 'inapplicable'
3823
3138
tree = WorkingTree.open_containing(directory)[0]
3139
change_reporter = delta._ChangeReporter(
3140
unversioned_filter=tree.is_ignored)
3826
basis_tree = tree.revision_tree(tree.last_revision())
3827
except errors.NoSuchRevision:
3828
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3833
raise errors.UncommittedChanges(tree)
3835
view_info = _get_view_info_for_change_reporter(tree)
3836
change_reporter = delta._ChangeReporter(
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
3143
pb = ui.ui_factory.nested_progress_bar()
3144
cleanups.append(pb.finished)
3146
cleanups.append(tree.unlock)
3147
if location is not None:
3149
mergeable = bundle.read_mergeable_from_url(location,
3150
possible_transports=possible_transports)
3151
except errors.NotABundle:
3155
raise errors.BzrCommandError('Cannot use --uncommitted'
3156
' with bundles or merge directives.')
3158
if revision is not None:
3159
raise errors.BzrCommandError(
3160
'Cannot use -r with merge directives or bundles')
3161
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3164
if merger is None and uncommitted:
3165
if revision is not None and len(revision) > 0:
3166
raise errors.BzrCommandError('Cannot use --uncommitted and'
3167
' --revision at the same time.')
3168
location = self._select_branch_location(tree, location)[0]
3169
other_tree, other_path = WorkingTree.open_containing(location)
3170
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3172
allow_pending = False
3173
if other_path != '':
3174
merger.interesting_files = [other_path]
3177
merger, allow_pending = self._get_merger_from_branch(tree,
3178
location, revision, remember, possible_transports, pb)
3180
merger.merge_type = merge_type
3181
merger.reprocess = reprocess
3182
merger.show_base = show_base
3183
self.sanity_check_merger(merger)
3184
if (merger.base_rev_id == merger.other_rev_id and
3185
merger.other_rev_id is not None):
3186
note('Nothing to do.')
3189
if merger.interesting_files is not None:
3190
raise errors.BzrCommandError('Cannot pull individual files')
3191
if (merger.base_rev_id == tree.last_revision()):
3192
result = tree.pull(merger.other_branch, False,
3193
merger.other_rev_id)
3194
result.report(self.outf)
3196
merger.check_basis(not force)
3198
return self._do_preview(merger)
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3891
return self._do_preview(merger)
3893
return self._do_interactive(merger)
3895
return self._do_merge(merger, change_reporter, allow_pending,
3898
def _get_preview(self, merger):
3200
return self._do_merge(merger, change_reporter, allow_pending,
3203
for cleanup in reversed(cleanups):
3206
def _do_preview(self, merger):
3207
from bzrlib.diff import show_diff_trees
3899
3208
tree_merger = merger.make_merger()
3900
3209
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3902
result_tree = tt.get_preview_tree()
3905
def _do_preview(self, merger):
3906
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3211
result_tree = tt.get_preview_tree()
3212
show_diff_trees(merger.this_tree, result_tree, self.outf,
3213
old_label='', new_label='')
3911
3217
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3218
merger.change_reporter = change_reporter
4097
3371
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3372
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3373
if merge_type is None:
4101
3374
merge_type = _mod_merge.Merge3Merger
4102
3375
tree, file_list = tree_files(file_list)
4103
3376
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4110
repository = tree.branch.repository
4111
interesting_ids = None
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3378
parents = tree.get_parent_ids()
3379
if len(parents) != 2:
3380
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3381
" merges. Not cherrypicking or"
3383
repository = tree.branch.repository
3384
interesting_ids = None
3386
conflicts = tree.conflicts()
3387
if file_list is not None:
3388
interesting_ids = set()
3389
for filename in file_list:
3390
file_id = tree.path2id(filename)
3392
raise errors.NotVersionedError(filename)
3393
interesting_ids.add(file_id)
3394
if tree.kind(file_id) != "directory":
3397
for name, ie in tree.inventory.iter_entries(file_id):
3398
interesting_ids.add(ie.file_id)
3399
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3401
# Remerge only supports resolving contents conflicts
3402
allowed_conflicts = ('text conflict', 'contents conflict')
3403
restore_files = [c.path for c in conflicts
3404
if c.typestring in allowed_conflicts]
3405
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3406
tree.set_conflicts(ConflictList(new_conflicts))
3407
if file_list is not None:
3408
restore_files = file_list
3409
for filename in restore_files:
3411
restore(tree.abspath(filename))
3412
except errors.NotConflicted:
3414
# Disable pending merges, because the file texts we are remerging
3415
# have not had those merges performed. If we use the wrong parents
3416
# list, we imply that the working tree text has seen and rejected
3417
# all the changes from the other tree, when in fact those changes
3418
# have not yet been seen.
3419
pb = ui.ui_factory.nested_progress_bar()
3420
tree.set_parent_ids(parents[:1])
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
3422
merger = _mod_merge.Merger.from_revision_ids(pb,
3424
merger.interesting_ids = interesting_ids
3425
merger.merge_type = merge_type
3426
merger.show_base = show_base
3427
merger.reprocess = reprocess
3428
conflicts = merger.do_merge()
3430
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3434
if conflicts > 0:
4180
3458
name. If you name a directory, all the contents of that directory will be
4183
If you have newly added files since the target revision, they will be
4184
removed. If the files to be removed have been changed, backups will be
4185
created as above. Directories containing unknown files will not be
3461
Any files that have been newly added since that revision will be deleted,
3462
with a backup kept if appropriate. Directories containing unknown files
3463
will not be deleted.
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
3465
The working tree contains a list of pending merged revisions, which will
3466
be included as parents in the next commit. Normally, revert clears that
3467
list as well as reverting the files. If any files are specified, revert
3468
leaves the pending merge list alone and reverts only the files. Use "bzr
3469
revert ." in the tree root to revert all files but keep the merge record,
3470
and "bzr revert --forget-merges" to clear the pending merge list without
4195
3471
reverting any files.
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4208
3474
_see_also = ['cat', 'export']
4389
3650
_get_revision_range(revision,
4390
3651
remote_branch, self.name()))
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4404
show_timezone='original')
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4413
lf.log_revision(revision)
4414
printed_local = True
4417
printed_local = False
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4422
message("You are missing %d revision(s):\n" %
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4427
lf.log_revision(revision)
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4438
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
3653
local_branch.lock_read()
3655
remote_branch.lock_read()
3657
local_extra, remote_extra = find_unmerged(
3658
local_branch, remote_branch, restrict,
3659
backward=not reverse,
3660
include_merges=include_merges,
3661
local_revid_range=local_revid_range,
3662
remote_revid_range=remote_revid_range)
3664
if log_format is None:
3665
registry = log.log_formatter_registry
3666
log_format = registry.get_default(local_branch)
3667
lf = log_format(to_file=self.outf,
3669
show_timezone='original')
3672
if local_extra and not theirs_only:
3673
message("You have %d extra revision(s):\n" %
3675
for revision in iter_log_revisions(local_extra,
3676
local_branch.repository,
3678
lf.log_revision(revision)
3679
printed_local = True
3682
printed_local = False
3684
if remote_extra and not mine_only:
3685
if printed_local is True:
3687
message("You are missing %d revision(s):\n" %
3689
for revision in iter_log_revisions(remote_extra,
3690
remote_branch.repository,
3692
lf.log_revision(revision)
3695
if mine_only and not local_extra:
3696
# We checked local, and found nothing extra
3697
message('This branch is up to date.\n')
3698
elif theirs_only and not remote_extra:
3699
# We checked remote, and found nothing extra
3700
message('Other branch is up to date.\n')
3701
elif not (mine_only or theirs_only or local_extra or
3703
# We checked both branches, and neither one had extra
3705
message("Branches are up to date.\n")
3707
remote_branch.unlock()
3709
local_branch.unlock()
4442
3710
if not status_code and parent is None and other_branch is not None:
4443
3711
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
3713
# handle race conditions - a parent might be set while we run.
3714
if local_branch.get_parent() is None:
3715
local_branch.set_parent(remote_branch.base)
3717
local_branch.unlock()
4448
3718
return status_code
4451
3721
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
3722
"""Compress the data within a repository."""
4470
3724
_see_also = ['repositories']
4471
3725
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
3727
def run(self, branch_or_repo='.'):
4477
3728
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
3730
branch = dir.open_branch()
4480
3731
repository = branch.repository
4481
3732
except errors.NotBranchError:
4482
3733
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
3737
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
3738
"""List the installed plugins.
4489
3740
This command displays the list of installed plugins including
4490
3741
version of plugin and a short description of each.
4589
3842
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
3843
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4594
3846
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4600
file_id = wt.path2id(relpath)
4602
file_id = tree.path2id(relpath)
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
if wt is not None and revision is None:
4607
# If there is a tree and we're not annotating historical
4608
# versions, annotate the working tree's content.
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
3848
tree = _get_one_revision_tree('annotate', revision, branch=branch)
3850
file_id = wt.path2id(relpath)
3852
file_id = tree.path2id(relpath)
3854
raise errors.NotVersionedError(filename)
3855
file_version = tree.inventory[file_id].revision
3856
if wt is not None and revision is None:
3857
# If there is a tree and we're not annotating historical
3858
# versions, annotate the working tree's content.
3859
annotate_file_tree(wt, file_id, self.outf, long, all,
3862
annotate_file(branch, file_version, file_id, long, all, self.outf,
4616
3871
class cmd_re_sign(Command):
4617
__doc__ = """Create a digital signature for an existing revision."""
3872
"""Create a digital signature for an existing revision."""
4618
3873
# TODO be able to replace existing ones.
4620
3875
hidden = True # is this right ?
4621
3876
takes_args = ['revision_id*']
4622
3877
takes_options = ['revision']
4624
3879
def run(self, revision_id_list=None, revision=None):
4625
3880
if revision_id_list is not None and revision is not None:
4626
3881
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4928
4195
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
4196
and port is an integer TCP/IP port.
4932
if port is not None:
4198
from bzrlib.smart import medium
4199
host = medium.BZR_DEFAULT_INTERFACE
4201
port = medium.BZR_DEFAULT_PORT
4933
4203
if ':' in port:
4934
4204
host, port = port.split(':')
4935
4205
port = int(port)
4936
4206
return host, port
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
4208
def get_smart_server(self, transport, inet, port):
4209
"""Construct a smart server.
4211
:param transport: The base transport from which branches will be
4213
:param inet: If True, serve over stdin and stdout. Used for running
4215
:param port: The port to listen on. By default, it's `
4216
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4218
:return: A smart server.
4220
from bzrlib.smart import medium, server
4222
smart_server = medium.SmartServerPipeStreamMedium(
4223
sys.stdin, sys.stdout, transport)
4225
host, port = self.get_host_and_port(port)
4226
smart_server = server.SmartTCPServer(
4227
transport, host=host, port=port)
4228
note('listening on port: %s' % smart_server.port)
4231
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4232
from bzrlib.transport import get_transport
4233
from bzrlib.transport.chroot import ChrootServer
4941
4234
if directory is None:
4942
4235
directory = os.getcwd()
4943
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
4236
url = urlutils.local_path_to_url(directory)
4947
4237
if not allow_writes:
4948
4238
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4239
chroot_server = ChrootServer(get_transport(url))
4240
chroot_server.setUp()
4241
t = get_transport(chroot_server.get_url())
4242
smart_server = self.get_smart_server(t, inet, port)
4243
self.run_smart_server(smart_server)
4953
4246
class cmd_join(Command):
4954
__doc__ = """Combine a tree into its containing tree.
4956
This command requires the target tree to be in a rich-root format.
4247
"""Combine a subtree into its containing tree.
4249
This command is for experimental use only. It requires the target tree
4250
to be in dirstate-with-subtree format, which cannot be converted into
4958
4253
The TREE argument should be an independent tree, inside another tree, but
4959
4254
not part of it. (Such trees can be produced by "bzr split", but also by
5134
4436
directly from the merge directive, without retrieving data from a
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
4439
If --no-bundle is specified, then public_branch is needed (and must be
4440
up-to-date), so that the receiver can perform the merge using the
4441
public_branch. The public_branch is always included if known, so that
4442
people can check it later.
4444
The submit branch defaults to the parent, but can be overridden. Both
4445
submit branch and public branch will be remembered if supplied.
4447
If a public_branch is known for the submit_branch, that public submit
4448
branch is used in the merge instructions. This means that a local mirror
4449
can be used as your actual submit branch, once you have set public_branch
5164
4452
Mail is sent using your preferred mail program. This should be transparent
5165
4453
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5166
4454
If the preferred client can't be found (or used), your editor will be used.
5168
4456
To use a specific mail program, set the mail_client configuration option.
5169
4457
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5170
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5171
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5172
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4458
specific clients are "claws", "evolution", "kmail", "mutt", and
4459
"thunderbird"; generic options are "default", "editor", "emacsclient",
4460
"mapi", and "xdg-email". Plugins may also add supported clients.
5175
4462
If mail is being sent, a to address is required. This can be supplied
5176
4463
either on the commandline, by setting the submit_to configuration
5177
option in the branch itself or the child_submit_to configuration option
4464
option in the branch itself or the child_submit_to configuration option
5178
4465
in the submit branch.
5180
4467
Two formats are currently supported: "4" uses revision bundle format 4 and
5210
4492
short_name='f',
5212
4494
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
4495
help='Write merge directive to this file; '
5214
4496
'use - for stdout.',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
5219
4498
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5224
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4502
RegistryOption.from_kwargs('format',
4503
'Use the specified output format.',
4504
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4505
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5229
4508
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
4509
no_patch=False, revision=None, remember=False, output=None,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
5233
from bzrlib.send import send
5234
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
4510
format='4', mail_to=None, message=None, **kwargs):
4511
return self._run(submit_branch, revision, public_branch, remember,
4512
format, no_bundle, no_patch, output,
4513
kwargs.get('from', '.'), mail_to, message)
4515
def _run(self, submit_branch, revision, public_branch, remember, format,
4516
no_bundle, no_patch, output, from_, mail_to, message):
4517
from bzrlib.revision import NULL_REVISION
4518
branch = Branch.open_containing(from_)[0]
4520
outfile = cStringIO.StringIO()
4524
outfile = open(output, 'wb')
4525
# we may need to write data into branch's repository to calculate
4530
config = branch.get_config()
4532
mail_to = config.get_user_option('submit_to')
4533
mail_client = config.get_mail_client()
4534
if remember and submit_branch is None:
4535
raise errors.BzrCommandError(
4536
'--remember requires a branch to be specified.')
4537
stored_submit_branch = branch.get_submit_branch()
4538
remembered_submit_branch = None
4539
if submit_branch is None:
4540
submit_branch = stored_submit_branch
4541
remembered_submit_branch = "submit"
4543
if stored_submit_branch is None or remember:
4544
branch.set_submit_branch(submit_branch)
4545
if submit_branch is None:
4546
submit_branch = branch.get_parent()
4547
remembered_submit_branch = "parent"
4548
if submit_branch is None:
4549
raise errors.BzrCommandError('No submit branch known or'
4551
if remembered_submit_branch is not None:
4552
note('Using saved %s location "%s" to determine what '
4553
'changes to submit.', remembered_submit_branch,
4557
submit_config = Branch.open(submit_branch).get_config()
4558
mail_to = submit_config.get_user_option("child_submit_to")
4560
stored_public_branch = branch.get_public_branch()
4561
if public_branch is None:
4562
public_branch = stored_public_branch
4563
elif stored_public_branch is None or remember:
4564
branch.set_public_branch(public_branch)
4565
if no_bundle and public_branch is None:
4566
raise errors.BzrCommandError('No public branch specified or'
4568
base_revision_id = None
4570
if revision is not None:
4571
if len(revision) > 2:
4572
raise errors.BzrCommandError('bzr send takes '
4573
'at most two one revision identifiers')
4574
revision_id = revision[-1].as_revision_id(branch)
4575
if len(revision) == 2:
4576
base_revision_id = revision[0].as_revision_id(branch)
4577
if revision_id is None:
4578
revision_id = branch.last_revision()
4579
if revision_id == NULL_REVISION:
4580
raise errors.BzrCommandError('No revisions to submit.')
4582
directive = merge_directive.MergeDirective2.from_objects(
4583
branch.repository, revision_id, time.time(),
4584
osutils.local_time_offset(), submit_branch,
4585
public_branch=public_branch, include_patch=not no_patch,
4586
include_bundle=not no_bundle, message=message,
4587
base_revision_id=base_revision_id)
4588
elif format == '0.9':
4591
patch_type = 'bundle'
4593
raise errors.BzrCommandError('Format 0.9 does not'
4594
' permit bundle with no patch')
4600
directive = merge_directive.MergeDirective.from_objects(
4601
branch.repository, revision_id, time.time(),
4602
osutils.local_time_offset(), submit_branch,
4603
public_branch=public_branch, patch_type=patch_type,
4606
outfile.writelines(directive.to_lines())
4608
subject = '[MERGE] '
4609
if message is not None:
4612
revision = branch.repository.get_revision(revision_id)
4613
subject += revision.get_summary()
4614
basename = directive.get_disk_name(branch)
4615
mail_client.compose_merge_request(mail_to, subject,
4616
outfile.getvalue(), basename)
5241
4623
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
4625
"""Create a merge-directive for submitting changes.
5244
4627
A merge directive provides many things needed for requesting merges:
5475
4838
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
5476
4839
takes_args = ['location?']
5478
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5482
value_switches=True, enum_switch=False,
5483
branch='Reconfigure to be an unbound branch with no working tree.',
5484
tree='Reconfigure to be an unbound branch with a working tree.',
5485
checkout='Reconfigure to be a bound branch with a working tree.',
5486
lightweight_checkout='Reconfigure to be a lightweight'
5487
' checkout (with no local history).',
5488
standalone='Reconfigure to be a standalone branch '
5489
'(i.e. stop using shared repository).',
5490
use_shared='Reconfigure to use a shared repository.',
5491
with_trees='Reconfigure repository to create '
5492
'working trees on branches by default.',
5493
with_no_trees='Reconfigure repository to not create '
5494
'working trees on branches by default.'
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
5498
help='Perform reconfiguration even if local changes'
5500
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
4840
takes_options = [RegistryOption.from_kwargs('target_type',
4841
title='Target type',
4842
help='The type to reconfigure the directory to.',
4843
value_switches=True, enum_switch=False,
4844
branch='Reconfigure to be an unbound branch '
4845
'with no working tree.',
4846
tree='Reconfigure to be an unbound branch '
4847
'with a working tree.',
4848
checkout='Reconfigure to be a bound branch '
4849
'with a working tree.',
4850
lightweight_checkout='Reconfigure to be a lightweight'
4851
' checkout (with no local history).',
4852
standalone='Reconfigure to be a standalone branch '
4853
'(i.e. stop using shared repository).',
4854
use_shared='Reconfigure to use a shared repository.'),
4855
Option('bind-to', help='Branch to bind checkout to.',
4858
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
4862
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
4863
directory = bzrdir.BzrDir.open(location)
5514
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5516
elif stacked_on is not None:
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5519
reconfigure.ReconfigureUnstacked().apply(directory)
5520
# At the moment you can use --stacked-on and a different
5521
# reconfiguration shape at the same time; there seems no good reason
5523
4864
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
4865
raise errors.BzrCommandError('No target configuration specified')
5529
4866
elif target_type == 'branch':
5530
4867
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
4868
elif target_type == 'tree':
5532
4869
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
4870
elif target_type == 'checkout':
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
4871
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
5536
4873
elif target_type == 'lightweight-checkout':
5537
4874
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
4875
directory, bind_to)
5568
4899
/path/to/newbranch.
5570
4901
Bound branches use the nickname of its master branch unless it is set
5571
locally, in which case switching will update the local nickname to be
4902
locally, in which case switching will update the the local nickname to be
5572
4903
that of the master.
5575
takes_args = ['to_location?']
4906
takes_args = ['to_location']
5576
4907
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
5579
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
4908
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
4911
def run(self, to_location, force=False):
5586
4912
from bzrlib import switch
5587
4913
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
4914
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
4915
branch = control_dir.open_branch()
5596
branch = control_dir.open_branch()
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
4917
to_branch = Branch.open(to_location)
5598
4918
except errors.NotBranchError:
5600
had_explicit_nick = False
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
if had_explicit_nick:
4919
this_branch = control_dir.open_branch()
4920
# This may be a heavy checkout, where we want the master branch
4921
this_url = this_branch.get_bound_location()
4922
# If not, use a local sibling
4923
if this_url is None:
4924
this_url = this_branch.base
4925
to_branch = Branch.open(
4926
urlutils.join(this_url, '..', to_location))
4927
switch.switch(control_dir, to_branch, force)
4928
if branch.get_config().has_explicit_nickname():
5625
4929
branch = control_dir.open_branch() #get the new branch!
5626
4930
branch.nick = to_branch.nick
5627
4931
note('Switched to branch: %s',
5628
4932
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5648
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5651
Views provide a mask over the tree so that users can focus on
5652
a subset of a tree when doing their work. After creating a view,
5653
commands that support a list of files - status, diff, commit, etc -
5654
effectively have that list of files implicitly given each time.
5655
An explicit list of files can still be given but those files
5656
must be within the current view.
5658
In most cases, a view has a short life-span: it is created to make
5659
a selected change and is deleted once that change is committed.
5660
At other times, you may wish to create one or more named views
5661
and switch between them.
5663
To disable the current view without deleting it, you can switch to
5664
the pseudo view called ``off``. This can be useful when you need
5665
to see the whole tree for an operation or two (e.g. merge) but
5666
want to switch back to your view after that.
5669
To define the current view::
5671
bzr view file1 dir1 ...
5673
To list the current view::
5677
To delete the current view::
5681
To disable the current view without deleting it::
5683
bzr view --switch off
5685
To define a named view and switch to it::
5687
bzr view --name view-name file1 dir1 ...
5689
To list a named view::
5691
bzr view --name view-name
5693
To delete a named view::
5695
bzr view --name view-name --delete
5697
To switch to a named view::
5699
bzr view --switch view-name
5701
To list all views defined::
5705
To delete all views::
5707
bzr view --delete --all
5711
takes_args = ['file*']
5714
help='Apply list or delete action to all views.',
5717
help='Delete the view.',
5720
help='Name of the view to define, list or delete.',
5724
help='Name of the view to switch to.',
5729
def run(self, file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
5736
current_view, view_dict = tree.views.get_view_info()
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
5747
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
5750
raise errors.BzrCommandError("No current view to delete")
5752
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
5761
elif switch == 'off':
5762
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
5764
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
5767
tree.views.set_view_info(switch, view_dict)
5768
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
5772
self.outf.write('Views defined:\n')
5773
for view in sorted(view_dict):
5774
if view == current_view:
5778
view_str = views.view_display_str(view_dict[view])
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
5784
# No name given and no current view set
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
5789
tree.views.set_view(name, sorted(file_list))
5790
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
5795
# No name given and no current view set
5796
self.outf.write('No current view.\n')
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
5802
4935
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
4936
"""Show a branch's currently registered hooks.
5808
for hook_key in sorted(hooks.known_hooks.keys()):
5809
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5810
self.outf.write("%s:\n" % type(some_hooks).__name__)
5811
for hook_name, hook_point in sorted(some_hooks.items()):
5812
self.outf.write(" %s:\n" % (hook_name,))
5813
found_hooks = list(hook_point)
5815
for hook in found_hooks:
5816
self.outf.write(" %s\n" %
5817
(some_hooks.get_hook_name(hook),))
5819
self.outf.write(" <no hooks installed>\n")
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5830
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
5836
takes_args = ["location?"]
5838
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
4940
takes_args = ['path?']
4942
def run(self, path=None):
4945
branch_hooks = Branch.open(path).hooks
4946
for hook_type in branch_hooks:
4947
hooks = branch_hooks[hook_type]
4948
self.outf.write("%s:\n" % (hook_type,))
4951
self.outf.write(" %s\n" %
4952
(branch_hooks.get_hook_name(hook),))
4954
self.outf.write(" <no hooks installed>\n")
5847
4957
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
4958
"""Temporarily set aside some changes from the current tree.
5850
4960
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
4961
ie. out of the way, until a later time when you can bring them back from
5852
the shelf with the 'unshelve' command. The changes are stored alongside
5853
your working tree, and so they aren't propagated along with your branch nor
5854
will they survive its deletion.
4962
the shelf with the 'unshelve' command.
5856
4964
If shelve --list is specified, previously-shelved changes are listed.
5880
4988
value_switches=True, enum_switch=False),
5882
4990
Option('list', help='List shelved changes.'),
5884
help='Destroy removed changes instead of shelving them.'),
5886
4992
_see_also = ['unshelve']
5888
4994
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
4995
writer=None, list=False):
5891
4997
return self.run_for_list()
5892
4998
from bzrlib.shelf_ui import Shelver
5893
4999
if writer is None:
5894
5000
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5002
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5902
5004
except errors.UserAbort:
5905
5007
def run_for_list(self):
5906
5008
tree = WorkingTree.open_containing('.')[0]
5907
5009
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5011
manager = tree.get_shelf_manager()
5012
shelves = manager.active_shelves()
5013
if len(shelves) == 0:
5014
note('No shelved changes.')
5016
for shelf_id in reversed(shelves):
5017
message = manager.get_metadata(shelf_id).get('message')
5019
message = '<no message>'
5020
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
5026
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5027
"""Restore shelved changes.
5925
5029
By default, the most recently shelved changes are restored. However if you
5926
specify a shelf by id those changes will be restored instead. This works
5927
best when the changes don't depend on each other.
5030
specify a patch by name those changes will be restored instead. This
5031
works best when the changes don't depend on each other.
5930
5034
takes_args = ['shelf_id?']
5934
5038
enum_switch=False, value_switches=True,
5935
5039
apply="Apply changes and remove from the shelf.",
5936
5040
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5041
delete_only="Delete changes without applying them."
5943
5044
_see_also = ['shelve']
5945
5046
def run(self, shelf_id=None, action='apply'):
5946
5047
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5048
Unshelver.from_args(shelf_id, action).run()
5051
def _create_prefix(cur_transport):
5052
needed = [cur_transport]
5053
# Recurse upwards until we can create a directory successfully
5055
new_transport = cur_transport.clone('..')
5056
if new_transport.base == cur_transport.base:
5057
raise errors.BzrCommandError(
5058
"Failed to create path prefix for %s."
5059
% cur_transport.base)
5951
unshelver.tree.unlock()
5954
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5957
By default, only unknown files, not ignored files, are deleted. Versioned
5958
files are never deleted.
5960
Another class is 'detritus', which includes files emitted by bzr during
5961
normal operations and selftests. (The value of these files decreases with
5964
If no options are specified, unknown files are deleted. Otherwise, option
5965
flags are respected, and may be combined.
5967
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
5971
' backups, and failed selftest dirs.'),
5973
help='Delete files unknown to bzr (default).'),
5974
Option('dry-run', help='Show files to delete instead of'
5976
Option('force', help='Do not prompt before deleting.')]
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
5980
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5988
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5991
If no arguments are provided, lists the branch locations for nested trees.
5992
If one argument is provided, display the branch location for that tree.
5993
If two arguments are provided, set the branch location for that tree.
5998
takes_args = ['path?', 'location?']
6000
def run(self, path=None, location=None):
6002
if path is not None:
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6006
if path is not None:
6009
tree = branch.basis_tree()
6011
info = branch._get_all_reference_info().iteritems()
6012
self._display_reference_info(tree, branch, info)
5061
new_transport.mkdir('.')
5062
except errors.NoSuchFile:
5063
needed.append(new_transport)
5064
cur_transport = new_transport
6014
file_id = tree.path2id(path)
6016
raise errors.NotVersionedError(path)
6017
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6019
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6023
def _display_reference_info(self, tree, branch, info):
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6030
ref_list.append((path, location))
6031
for path, location in sorted(ref_list):
6032
self.outf.write('%s %s\n' % (path, location))
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
5067
# Now we only need to create child directories
5069
cur_transport = needed.pop()
5070
cur_transport.ensure_base()
5073
# these get imported and then picked up by the scan for cmd_*
5074
# TODO: Some more consistent way to split command definitions across files;
5075
# we do need to load at least some information about them to know of
5076
# aliases. ideally we would avoid loading the implementation until the
5077
# details were needed.
5078
from bzrlib.cmd_version_info import cmd_version_info
5079
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5080
from bzrlib.bundle.commands import (
5083
from bzrlib.sign_my_commits import cmd_sign_my_commits
5084
from bzrlib.weave_commands import cmd_versionedfile_list, \
5085
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
