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]
531
self.add_cleanup(wt.lock_read().unlock)
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
539
revno = ".".join(str(n) for n in revno_t)
541
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
545
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')
548
407
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
408
"""Show revision number and revision id for a given revision identifier.
552
411
takes_args = ['revision_info*']
561
Option('tree', help='Show revno of working tree'),
565
def run(self, revision=None, directory=u'.', tree=False,
566
revision_info_list=[]):
423
def run(self, revision=None, directory=u'.', revision_info_list=[]):
569
wt = WorkingTree.open_containing(directory)[0]
571
self.add_cleanup(wt.lock_read().unlock)
572
except (errors.NoWorkingTree, errors.NotLocalUrl):
574
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
577
426
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
427
revs.extend(revision)
579
428
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
590
revision_ids.append(b.last_revision())
594
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)
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
440
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
441
except errors.NoSuchRevision:
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
605
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)
608
447
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
448
"""Add specified files or directories.
611
450
In non-recursive mode, all the named items are added, regardless
612
451
of whether they were previously ignored. A warning is given if
810
662
takes_args = ['names*']
811
663
takes_options = [Option("after", help="Move only the bzr identifier"
812
664
" of the file, because the file has already been moved."),
813
Option('auto', help='Automatically guess renames.'),
814
Option('dry-run', help='Avoid making changes when guessing renames.'),
816
666
aliases = ['move', 'rename']
817
667
encoding_type = 'replace'
819
def run(self, names_list, after=False, auto=False, dry_run=False):
821
return self.run_auto(names_list, after, dry_run)
823
raise errors.BzrCommandError('--dry-run requires --auto.')
669
def run(self, names_list, after=False):
824
670
if names_list is None:
826
673
if len(names_list) < 2:
827
674
raise errors.BzrCommandError("missing file argument")
828
675
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
832
def run_auto(self, names_list, after, dry_run):
833
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
837
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
678
self._run(tree, names_list, rel_names, after)
843
682
def _run(self, tree, names_list, rel_names, after):
844
683
into_existing = osutils.isdir(names_list[-1])
1019
843
branch_from = Branch.open(location,
1020
844
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1023
846
if branch_to.get_parent() is None or remember:
1024
847
branch_to.set_parent(branch_from.base)
1026
849
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
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,
1048
875
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
876
"""Update a mirror of this branch.
1051
878
The target branch will not have its working tree populated because this
1052
879
is both expensive, and is not supported on remote file systems.
1054
881
Some smart servers or protocols *may* put the working tree in place in
1180
1001
help='Hard-link working tree files where possible.'),
1181
1002
Option('no-tree',
1182
1003
help="Create a branch without a working-tree."),
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1186
1004
Option('stacked',
1187
1005
help='Create a stacked branch referring to the source branch. '
1188
1006
'The new branch will depend on the availability of the source '
1189
1007
'branch for all operations.'),
1190
1008
Option('standalone',
1191
1009
help='Do not use a shared repository, even if available.'),
1192
Option('use-existing-dir',
1193
help='By default branch will fail if the target'
1194
' directory exists, but does not already'
1195
' have a control directory. This flag will'
1196
' allow branch to proceed.'),
1198
help="Bind new branch to from location."),
1200
1011
aliases = ['get', 'clone']
1202
1013
def run(self, from_location, to_location=None, revision=None,
1203
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1014
hardlink=False, stacked=False, standalone=False, no_tree=False):
1206
1015
from bzrlib.tag import _merge_tags_if_possible
1016
if revision is None:
1018
elif len(revision) > 1:
1019
raise errors.BzrCommandError(
1020
'bzr branch --revision takes exactly 1 revision value')
1207
1022
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1026
if len(revision) == 1 and revision[0] is not None:
1027
revision_id = revision[0].as_revision_id(br_from)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1029
# FIXME - wt.last_revision, fallback to branch, fall back to
1030
# None or perhaps NULL_REVISION to mean copy nothing
1032
revision_id = br_from.last_revision()
1033
if to_location is None:
1034
to_location = urlutils.derive_to_location(from_location)
1035
to_transport = transport.get_transport(to_location)
1037
to_transport.mkdir('.')
1038
except errors.FileExists:
1039
raise errors.BzrCommandError('Target directory "%s" already'
1040
' exists.' % to_location)
1041
except errors.NoSuchFile:
1042
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1045
# preserve whatever source format we have.
1046
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1047
possible_transports=[to_transport],
1048
accelerator_tree=accelerator_tree,
1049
hardlink=hardlink, stacked=stacked,
1050
force_new_repo=standalone,
1051
create_tree_if_local=not no_tree,
1052
source_branch=br_from)
1053
branch = dir.open_branch()
1054
except errors.NoSuchRevision:
1055
to_transport.delete_tree('.')
1056
msg = "The branch %s has no revision %s." % (from_location,
1058
raise errors.BzrCommandError(msg)
1059
_merge_tags_if_possible(br_from, branch)
1060
# If the source branch is stacked, the new branch may
1061
# be stacked whether we asked for that explicitly or not.
1062
# We therefore need a try/except here and not just 'if stacked:'
1064
note('Created new stacked branch referring to %s.' %
1065
branch.get_stacked_on_url())
1066
except (errors.NotStacked, errors.UnstackableBranchFormat,
1067
errors.UnstackableRepositoryFormat), e:
1068
note('Branched %d revision(s).' % branch.revno())
1275
1073
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1074
"""Create a new checkout of an existing branch.
1278
1076
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1077
the branch found in '.'. This is useful if you have removed the working tree
1280
1078
or if it was never created - i.e. if you pushed the branch to its current
1281
1079
location using SFTP.
1283
1081
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1284
1082
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1285
1083
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1353
1155
@display_command
1354
1156
def run(self, dir=u'.'):
1355
1157
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1368
renames.append(paths)
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1160
new_inv = tree.inventory
1161
old_tree = tree.basis_tree()
1162
old_tree.lock_read()
1164
old_inv = old_tree.inventory
1166
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1167
for f, paths, c, v, p, n, k, e in iterator:
1168
if paths[0] == paths[1]:
1172
renames.append(paths)
1174
for old_name, new_name in renames:
1175
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1182
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1183
"""Update a tree to have the latest code committed to its branch.
1377
1185
This will perform a merge into the working tree, and may generate
1378
conflicts. If you have any local changes, you will still
1186
conflicts. If you have any local changes, you will still
1379
1187
need to commit them after the update for the update to be complete.
1381
If you want to discard your local changes, you can just do a
1189
If you want to discard your local changes, you can just do a
1382
1190
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1388
1193
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1194
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1195
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1197
def run(self, dir='.'):
1397
1198
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1199
possible_transports = []
1400
master = branch.get_master_branch(
1200
master = tree.branch.get_master_branch(
1401
1201
possible_transports=possible_transports)
1402
1202
if master is not None:
1403
branch_location = master.base
1404
1203
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1205
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1207
existing_pending_merges = tree.get_parent_ids()[1:]
1208
last_rev = _mod_revision.ensure_null(tree.last_revision())
1209
if last_rev == _mod_revision.ensure_null(
1210
tree.branch.last_revision()):
1211
# may be up to date, check master too.
1212
if master is None or last_rev == _mod_revision.ensure_null(
1213
master.last_revision()):
1214
revno = tree.branch.revision_id_to_revno(last_rev)
1215
note("Tree is up to date at revision %d." % (revno,))
1435
1217
conflicts = tree.update(
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1218
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1219
possible_transports=possible_transports)
1220
revno = tree.branch.revision_id_to_revno(
1221
_mod_revision.ensure_null(tree.last_revision()))
1222
note('Updated to revision %d.' % (revno,))
1223
if tree.get_parent_ids()[1:] != existing_pending_merges:
1224
note('Your local commits will now show as pending merges with '
1225
"'bzr status', and can be committed with 'bzr commit'.")
1460
1234
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1235
"""Show information about a working tree, branch or repository.
1463
1237
This command will show all known locations and formats associated to the
1464
tree, branch or repository.
1466
In verbose mode, statistical information is included with each report.
1467
To see extended statistic information, use a verbosity level of 2 or
1468
higher by specifying the verbose option multiple times, e.g. -vv.
1238
tree, branch or repository. Statistical information is included with
1470
1241
Branches and working trees will also report any missing revisions.
1474
Display information on the format and related locations:
1478
Display the above together with extended format information and
1479
basic statistics (like the number of files in the working tree and
1480
number of revisions in the branch and repository):
1484
Display the above together with number of committers to the branch:
1488
1243
_see_also = ['revno', 'working-trees', 'repositories']
1489
1244
takes_args = ['location?']
1530
1285
if file_list is not None:
1531
1286
file_list = [f for f in file_list]
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1290
# Heuristics should probably all move into tree.remove_smart or
1293
added = tree.changes_from(tree.basis_tree(),
1294
specific_files=file_list).added
1295
file_list = sorted([f[0] for f in added], reverse=True)
1296
if len(file_list) == 0:
1297
raise errors.BzrCommandError('No matching files.')
1298
elif file_list is None:
1299
# missing files show up in iter_changes(basis) as
1300
# versioned-with-no-kind.
1302
for change in tree.iter_changes(tree.basis_tree()):
1303
# Find paths in the working tree that have no kind:
1304
if change[1][1] is not None and change[6][1] is None:
1305
missing.append(change[1][1])
1306
file_list = sorted(missing, reverse=True)
1307
file_deletion_strategy = 'keep'
1308
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1309
keep_files=file_deletion_strategy=='keep',
1310
force=file_deletion_strategy=='force')
1557
1315
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1316
"""Print file_id of a particular file or directory.
1560
1318
The file_id is assigned when the file is first added and remains the
1561
1319
same through all revisions where the file exists, even when it is
2094
1832
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2097
log is bzr's default tool for exploring the history of a branch.
2098
The branch to use is taken from the first parameter. If no parameters
2099
are given, the branch containing the working directory is logged.
2100
Here are some simple examples::
2102
bzr log log the current branch
2103
bzr log foo.py log a file in its branch
2104
bzr log http://server/branch log a branch on a server
2106
The filtering, ordering and information shown for each revision can
2107
be controlled as explained below. By default, all revisions are
2108
shown sorted (topologically) so that newer revisions appear before
2109
older ones and descendants always appear before ancestors. If displayed,
2110
merged revisions are shown indented under the revision in which they
2115
The log format controls how information about each revision is
2116
displayed. The standard log formats are called ``long``, ``short``
2117
and ``line``. The default is long. See ``bzr help log-formats``
2118
for more details on log formats.
2120
The following options can be used to control what information is
2123
-l N display a maximum of N revisions
2124
-n N display N levels of revisions (0 for all, 1 for collapsed)
2125
-v display a status summary (delta) for each revision
2126
-p display a diff (patch) for each revision
2127
--show-ids display revision-ids (and file-ids), not just revnos
2129
Note that the default number of levels to display is a function of the
2130
log format. If the -n option is not used, the standard log formats show
2131
just the top level (mainline).
2133
Status summaries are shown using status flags like A, M, etc. To see
2134
the changes explained using words like ``added`` and ``modified``
2135
instead, use the -vv option.
2139
To display revisions from oldest to newest, use the --forward option.
2140
In most cases, using this option will have little impact on the total
2141
time taken to produce a log, though --forward does not incrementally
2142
display revisions like --reverse does when it can.
2144
:Revision filtering:
2146
The -r option can be used to specify what revision or range of revisions
2147
to filter against. The various forms are shown below::
2149
-rX display revision X
2150
-rX.. display revision X and later
2151
-r..Y display up to and including revision Y
2152
-rX..Y display from X to Y inclusive
2154
See ``bzr help revisionspec`` for details on how to specify X and Y.
2155
Some common examples are given below::
2157
-r-1 show just the tip
2158
-r-10.. show the last 10 mainline revisions
2159
-rsubmit:.. show what's new on this branch
2160
-rancestor:path.. show changes since the common ancestor of this
2161
branch and the one at location path
2162
-rdate:yesterday.. show changes since yesterday
2164
When logging a range of revisions using -rX..Y, log starts at
2165
revision Y and searches back in history through the primary
2166
("left-hand") parents until it finds X. When logging just the
2167
top level (using -n1), an error is reported if X is not found
2168
along the way. If multi-level logging is used (-n0), X may be
2169
a nested merge revision and the log will be truncated accordingly.
2173
If parameters are given and the first one is not a branch, the log
2174
will be filtered to show only those revisions that changed the
2175
nominated files or directories.
2177
Filenames are interpreted within their historical context. To log a
2178
deleted file, specify a revision range so that the file existed at
2179
the end or start of the range.
2181
Historical context is also important when interpreting pathnames of
2182
renamed files/directories. Consider the following example:
2184
* revision 1: add tutorial.txt
2185
* revision 2: modify tutorial.txt
2186
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
2190
* ``bzr log guide.txt`` will log the file added in revision 1
2192
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2194
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2195
the original file in revision 2.
2197
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2198
was no file called guide.txt in revision 2.
2200
Renames are always followed by log. By design, there is no need to
2201
explicitly ask for this (and no way to stop logging a file back
2202
until it was last renamed).
2206
The --message option can be used for finding revisions that match a
2207
regular expression in a commit message.
2211
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2217
You may find it useful to add the aliases below to ``bazaar.conf``::
2221
top = log -l10 --line
2224
``bzr tip`` will then show the latest revision while ``bzr top``
2225
will show the last 10 mainline revisions. To see the details of a
2226
particular revision X, ``bzr show -rX``.
2228
If you are interested in looking deeper into a particular merge X,
2229
use ``bzr log -n0 -rX``.
2231
``bzr log -v`` on a branch with lots of history is currently
2232
very slow. A fix for this issue is currently under development.
2233
With or without that fix, it is recommended that a revision range
2234
be given when using the -v option.
2236
bzr has a generic full-text matching plugin, bzr-search, that can be
2237
used to find revisions matching user names, commit messages, etc.
2238
Among other features, this plugin can find all revisions containing
2239
a list of words but not others.
2241
When exploring non-mainline history on large projects with deep
2242
history, the performance of log can be greatly improved by installing
2243
the historycache plugin. This plugin buffers historical information
2244
trading disk space for faster speed.
1833
"""Show log of a branch, file, or directory.
1835
By default show the log of the branch containing the working directory.
1837
To request a range of logs, you can use the command -r begin..end
1838
-r revision requests a specific revision, -r ..end or -r begin.. are
1842
Log the current branch::
1850
Log the last 10 revisions of a branch::
1852
bzr log -r -10.. http://server/branch
2246
takes_args = ['file*']
2247
_see_also = ['log-formats', 'revisionspec']
1855
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1857
takes_args = ['location?']
2248
1858
takes_options = [
2249
1859
Option('forward',
2250
1860
help='Show from oldest to newest.'),
2357
1938
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
1939
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
1943
rev1, rev2 = _get_revision_range(revision, b, self.name())
2362
# Decide on the type of delta & diff filtering to use
2363
# TODO: add an --all-files option to make this configurable & consistent
2371
diff_type = 'partial'
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2385
show_advice=levels is None)
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2413
Logger(b, rqst).show(lf)
1944
if log_format is None:
1945
log_format = log.log_formatter_registry.get_default(b)
1947
lf = log_format(show_ids=show_ids, to_file=self.outf,
1948
show_timezone=timezone,
1949
delta_format=get_verbosity_level(),
1956
direction=direction,
1957
start_revision=rev1,
1961
show_diff=show_diff)
2416
1966
def _get_revision_range(revisionspec_list, branch, command_name):
2417
1967
"""Take the input of a revision option and turn it into a revision range.
2419
1969
It returns RevisionInfo objects which can be used to obtain the rev_id's
2420
of the desired revisions. It does some user input validations.
1970
of the desired revisons. It does some user input validations.
2422
1972
if revisionspec_list is None:
2535
2080
if path is None:
2539
2085
raise errors.BzrCommandError('cannot specify both --from-root'
2542
2089
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2545
# Calculate the prefix to use
2549
prefix = relpath + '/'
2550
elif fs_path != '.' and not fs_path.endswith('/'):
2551
prefix = fs_path + '/'
2553
2095
if revision is not None or tree is None:
2554
2096
tree = _get_one_revision_tree('ls', revision, branch=branch)
2557
if isinstance(tree, WorkingTree) and tree.supports_views():
2558
view_files = tree.views.lookup_view()
2561
view_str = views.view_display_str(view_files)
2562
note("Ignoring files outside view. View is %s" % view_str)
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2570
if kind is not None and fkind != kind:
2575
fullpath = osutils.pathjoin(relpath, fp)
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2594
self.outf.write(fp + '\0')
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2608
self.outf.write(outstring + '\n')
2100
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2101
if fp.startswith(relpath):
2102
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2103
if non_recursive and '/' in fp:
2105
if not all and not selection[fc]:
2107
if kind is not None and fkind != kind:
2109
kindch = entry.kind_character()
2110
outstring = fp + kindch
2112
outstring = '%-8s %s' % (fc, outstring)
2113
if show_ids and fid is not None:
2114
outstring = "%-50s %s" % (outstring, fid)
2115
self.outf.write(outstring + '\n')
2117
self.outf.write(fp + '\0')
2120
self.outf.write(fid)
2121
self.outf.write('\0')
2129
self.outf.write('%-50s %s\n' % (outstring, my_id))
2131
self.outf.write(outstring + '\n')
2611
2136
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2137
"""List unknown files.
2833
2323
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2325
export(rev_tree, dest, format, root, subdir)
2837
2326
except errors.NoSuchExportFormat, e:
2838
2327
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2841
2330
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2331
"""Write the contents of a file as of a given revision to standard output.
2844
2333
If no revision is nominated, the last revision is used.
2846
2335
Note: Take care to redirect standard output when using this command on a
2850
2339
_see_also = ['ls']
2851
2340
takes_options = [
2852
2341
Option('name-from-revision', help='The path name in the old tree.'),
2853
Option('filters', help='Apply content filters to display the '
2854
'convenience form.'),
2857
2344
takes_args = ['filename']
2858
2345
encoding_type = 'exact'
2860
2347
@display_command
2861
def run(self, filename, revision=None, name_from_revision=False,
2348
def run(self, filename, revision=None, name_from_revision=False):
2863
2349
if revision is not None and len(revision) != 1:
2864
2350
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
2351
" one revision specifier")
2866
2352
tree, branch, relpath = \
2867
2353
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2356
return self._run(tree, branch, relpath, filename, revision,
2872
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2361
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2874
2362
if tree is None:
2875
2363
tree = b.basis_tree()
2876
2364
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2366
cur_file_id = tree.path2id(relpath)
2879
2367
old_file_id = rev_tree.path2id(relpath)
2881
2369
if name_from_revision:
2882
# Try in revision if requested
2883
2370
if old_file_id is None:
2884
2371
raise errors.BzrCommandError(
2885
2372
"%r is not present in revision %s" % (
2886
2373
filename, rev_tree.get_revision_id()))
2888
2375
content = rev_tree.get_file_text(old_file_id)
2890
cur_file_id = tree.path2id(relpath)
2892
if cur_file_id is not None:
2893
# Then try with the actual file id
2895
content = rev_tree.get_file_text(cur_file_id)
2897
except errors.NoSuchId:
2898
# The actual file id didn't exist at that time
2900
if not found and old_file_id is not None:
2901
# Finally try with the old file id
2902
content = rev_tree.get_file_text(old_file_id)
2905
# Can't be found anywhere
2906
raise errors.BzrCommandError(
2907
"%r is not present in revision %s" % (
2908
filename, rev_tree.get_revision_id()))
2910
from bzrlib.filters import (
2911
ContentFilterContext,
2912
filtered_output_bytes,
2914
filters = rev_tree._content_filter_stack(relpath)
2915
chunks = content.splitlines(True)
2916
content = filtered_output_bytes(chunks, filters,
2917
ContentFilterContext(relpath, rev_tree))
2919
self.outf.writelines(content)
2922
self.outf.write(content)
2376
elif cur_file_id is not None:
2377
content = rev_tree.get_file_text(cur_file_id)
2378
elif old_file_id is not None:
2379
content = rev_tree.get_file_text(old_file_id)
2381
raise errors.BzrCommandError(
2382
"%r is not present in revision %s" % (
2383
filename, rev_tree.get_revision_id()))
2384
self.outf.write(content)
2925
2387
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2388
"""Show the offset in seconds from GMT to local time."""
2928
2390
@display_command
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2392
print osutils.local_time_offset()
2934
2396
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2937
An explanatory message needs to be given for each commit. This is
2938
often done by using the --message option (getting the message from the
2939
command line) or by using the --file option (getting the message from
2940
a file). If neither of these options is given, an editor is opened for
2941
the user to enter the message. To see the changed files in the
2942
boilerplate text loaded into the editor, use the --show-diff option.
2944
By default, the entire tree is committed and the person doing the
2945
commit is assumed to be the author. These defaults can be overridden
2950
If selected files are specified, only changes to those files are
2951
committed. If a directory is specified then the directory and
2952
everything within it is committed.
2954
When excludes are given, they take precedence over selected files.
2955
For example, to commit only changes within foo, but not changes
2958
bzr commit foo -x foo/bar
2960
A selective commit after a merge is not yet supported.
2964
If the author of the change is not the same person as the committer,
2965
you can specify the author's name using the --author option. The
2966
name should be in the same format as a committer-id, e.g.
2967
"John Doe <jdoe@example.com>". If there is more than one author of
2968
the change you can specify the option multiple times, once for each
2973
A common mistake is to forget to add a new file or directory before
2974
running the commit command. The --strict option checks for unknown
2975
files and aborts the commit if any are found. More advanced pre-commit
2976
checks can be implemented by defining hooks. See ``bzr help hooks``
2981
If you accidentially commit the wrong changes or make a spelling
2982
mistake in the commit message say, you can use the uncommit command
2983
to undo it. See ``bzr help uncommit`` for details.
2985
Hooks can also be configured to run after a commit. This allows you
2986
to trigger updates to external systems like bug trackers. The --fixes
2987
option can be used to record the association between a revision and
2988
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2397
"""Commit changes into a new revision.
2399
If no arguments are given, the entire tree is committed.
2401
If selected files are specified, only changes to those files are
2402
committed. If a directory is specified then the directory and everything
2403
within it is committed.
2405
When excludes are given, they take precedence over selected files.
2406
For example, too commit only changes within foo, but not changes within
2409
bzr commit foo -x foo/bar
2411
If author of the change is not the same person as the committer, you can
2412
specify the author's name using the --author option. The name should be
2413
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2415
A selected-file commit may fail in some cases where the committed
2416
tree would be invalid. Consider::
2421
bzr commit foo -m "committing foo"
2422
bzr mv foo/bar foo/baz
2425
bzr commit foo/bar -m "committing bar but not baz"
2427
In the example above, the last commit will fail by design. This gives
2428
the user the opportunity to decide whether they want to commit the
2429
rename at the same time, separately first, or not at all. (As a general
2430
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2432
Note: A selected-file commit after a merge is not yet supported.
3007
2434
# TODO: Run hooks on tree to-be-committed, and after commit.
3046
2469
"the master branch until a normal commit "
3047
2470
"is performed."
3049
Option('show-diff', short_name='p',
3050
help='When no message is supplied, show the diff along'
3051
' with the status summary in the message editor.'),
2473
help='When no message is supplied, show the diff along'
2474
' with the status summary in the message editor.'),
3053
2476
aliases = ['ci', 'checkin']
3055
def _iter_bug_fix_urls(self, fixes, branch):
2478
def _get_bug_fix_properties(self, fixes, branch):
3056
2480
# Configure the properties for bug fixing attributes.
3057
2481
for fixed_bug in fixes:
3058
2482
tokens = fixed_bug.split(':')
3059
2483
if len(tokens) != 2:
3060
2484
raise errors.BzrCommandError(
3061
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3062
"See \"bzr help bugs\" for more information on this "
3063
"feature.\nCommit refused." % fixed_bug)
2485
"Invalid bug %s. Must be in the form of 'tag:id'. "
2486
"Commit refused." % fixed_bug)
3064
2487
tag, bug_id = tokens
3066
yield bugtracker.get_bug_url(tag, branch, bug_id)
2489
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
3067
2490
except errors.UnknownBugTrackerAbbreviation:
3068
2491
raise errors.BzrCommandError(
3069
2492
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3070
except errors.MalformedBugIdentifier, e:
2493
except errors.MalformedBugIdentifier:
3071
2494
raise errors.BzrCommandError(
3072
"%s\nCommit refused." % (str(e),))
2495
"Invalid bug identifier for %s. Commit refused."
2497
properties.append('%s fixed' % bug_url)
2498
return '\n'.join(properties)
3074
2500
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
2501
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
2502
author=None, show_diff=False, exclude=None):
3077
2503
from bzrlib.errors import (
3078
2504
PointlessCommit,
3079
2505
ConflictsInTree,
3111
2529
if fixes is None:
3113
bug_property = bugtracker.encode_fixes_bug_urls(
3114
self._iter_bug_fix_urls(fixes, tree.branch))
2531
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
3115
2532
if bug_property:
3116
2533
properties['bugs'] = bug_property
3118
2535
if local and not tree.branch.get_bound_location():
3119
2536
raise errors.LocalRequiresBoundBranch()
3121
if message is not None:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3134
ui.ui_factory.show_warning(warning_msg)
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3142
2538
def get_message(commit_obj):
3143
2539
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
2540
my_message = message
2541
if my_message is None and not file:
2542
t = make_commit_message_template_encoded(tree,
3153
2543
selected_list, diff=show_diff,
3154
2544
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3160
2545
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
2546
my_message = edit_commit_message_encoded(t,
3162
2547
start_message=start_message)
3163
2548
if my_message is None:
3164
2549
raise errors.BzrCommandError("please specify a commit"
3165
2550
" message with either --message or --file")
2551
elif my_message and file:
2552
raise errors.BzrCommandError(
2553
"please specify either --message or --file")
2555
my_message = codecs.open(file, 'rt',
2556
osutils.get_user_encoding()).read()
3166
2557
if my_message == "":
3167
2558
raise errors.BzrCommandError("empty commit message specified")
3168
2559
return my_message
3170
# The API permits a commit with a filter of [] to mean 'select nothing'
3171
# but the command line should not do that.
3172
if not selected_list:
3173
selected_list = None
3175
2562
tree.commit(message_callback=get_message,
3176
2563
specific_files=selected_list,
3177
2564
allow_pointless=unchanged, strict=strict, local=local,
3178
2565
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
2567
exclude=safe_relpath_files(tree, exclude))
3182
2568
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
2569
# FIXME: This should really happen before the file is read in;
2570
# perhaps prepare the commit; get the message; then actually commit
2571
raise errors.BzrCommandError("no changes to commit."
2572
" use --unchanged to commit anyhow")
3185
2573
except ConflictsInTree:
3186
2574
raise errors.BzrCommandError('Conflicts detected in working '
3187
2575
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3573
2936
if cache_dir is not None:
3574
2937
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2939
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2940
print ' %s (%s python%s)' % (
2942
bzrlib.version_string,
2943
bzrlib._format_version_tuple(sys.version_info),
3575
2946
if testspecs_list is not None:
3576
2947
pattern = '|'.join(testspecs_list)
3581
from bzrlib.tests import SubUnitBzrRunner
3583
raise errors.BzrCommandError("subunit not available. subunit "
3584
"needs to be installed to use --subunit.")
3585
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
self.additional_selftest_args.setdefault(
3593
'suite_decorators', []).append(parallel)
3595
2951
test_suite_factory = benchmarks.test_suite
3596
2952
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
2953
verbose = not is_quiet()
3598
2954
# TODO: should possibly lock the history file...
3599
2955
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
2957
test_suite_factory = None
3603
2958
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
2960
result = selftest(verbose=verbose,
2962
stop_on_failure=one,
2963
transport=transport,
2964
test_suite_factory=test_suite_factory,
2965
lsprof_timed=lsprof_timed,
2966
bench_history=benchfile,
2967
matching_tests_first=first,
2968
list_only=list_only,
2969
random_seed=randomize,
2970
exclude_pattern=exclude,
2972
load_list=load_list,
2973
debug_flags=debugflag,
2974
starting_with=starting_with,
2977
if benchfile is not None:
2980
note('tests passed')
2982
note('tests failed')
3623
2983
return int(not result)
3626
2986
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
2987
"""Show version of bzr."""
3629
2989
encoding_type = 'replace'
3630
2990
takes_options = [
3792
3139
allow_pending = True
3793
3140
verified = 'inapplicable'
3794
3141
tree = WorkingTree.open_containing(directory)[0]
3142
change_reporter = delta._ChangeReporter(
3143
unversioned_filter=tree.is_ignored)
3797
basis_tree = tree.revision_tree(tree.last_revision())
3798
except errors.NoSuchRevision:
3799
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3804
raise errors.UncommittedChanges(tree)
3806
view_info = _get_view_info_for_change_reporter(tree)
3807
change_reporter = delta._ChangeReporter(
3808
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3146
pb = ui.ui_factory.nested_progress_bar()
3147
cleanups.append(pb.finished)
3149
cleanups.append(tree.unlock)
3150
if location is not None:
3152
mergeable = bundle.read_mergeable_from_url(location,
3153
possible_transports=possible_transports)
3154
except errors.NotABundle:
3158
raise errors.BzrCommandError('Cannot use --uncommitted'
3159
' with bundles or merge directives.')
3161
if revision is not None:
3162
raise errors.BzrCommandError(
3163
'Cannot use -r with merge directives or bundles')
3164
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3167
if merger is None and uncommitted:
3168
if revision is not None and len(revision) > 0:
3169
raise errors.BzrCommandError('Cannot use --uncommitted and'
3170
' --revision at the same time.')
3171
location = self._select_branch_location(tree, location)[0]
3172
other_tree, other_path = WorkingTree.open_containing(location)
3173
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3175
allow_pending = False
3176
if other_path != '':
3177
merger.interesting_files = [other_path]
3180
merger, allow_pending = self._get_merger_from_branch(tree,
3181
location, revision, remember, possible_transports, pb)
3183
merger.merge_type = merge_type
3184
merger.reprocess = reprocess
3185
merger.show_base = show_base
3186
self.sanity_check_merger(merger)
3187
if (merger.base_rev_id == merger.other_rev_id and
3188
merger.other_rev_id is not None):
3189
note('Nothing to do.')
3192
if merger.interesting_files is not None:
3193
raise errors.BzrCommandError('Cannot pull individual files')
3194
if (merger.base_rev_id == tree.last_revision()):
3195
result = tree.pull(merger.other_branch, False,
3196
merger.other_rev_id)
3197
result.report(self.outf)
3199
merger.check_basis(not force)
3201
return self._do_preview(merger)
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3861
return self._do_preview(merger)
3863
return self._do_interactive(merger)
3865
return self._do_merge(merger, change_reporter, allow_pending,
3868
def _get_preview(self, merger):
3203
return self._do_merge(merger, change_reporter, allow_pending,
3206
for cleanup in reversed(cleanups):
3209
def _do_preview(self, merger):
3210
from bzrlib.diff import show_diff_trees
3869
3211
tree_merger = merger.make_merger()
3870
3212
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3872
result_tree = tt.get_preview_tree()
3875
def _do_preview(self, merger):
3876
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3878
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
3214
result_tree = tt.get_preview_tree()
3215
show_diff_trees(merger.this_tree, result_tree, self.outf,
3216
old_label='', new_label='')
3881
3220
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3221
merger.change_reporter = change_reporter
4067
3374
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3375
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3376
if merge_type is None:
4071
3377
merge_type = _mod_merge.Merge3Merger
4072
3378
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4079
repository = tree.branch.repository
4080
interesting_ids = None
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3381
parents = tree.get_parent_ids()
3382
if len(parents) != 2:
3383
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3384
" merges. Not cherrypicking or"
3386
repository = tree.branch.repository
3387
interesting_ids = None
3389
conflicts = tree.conflicts()
3390
if file_list is not None:
3391
interesting_ids = set()
3392
for filename in file_list:
3393
file_id = tree.path2id(filename)
3395
raise errors.NotVersionedError(filename)
3396
interesting_ids.add(file_id)
3397
if tree.kind(file_id) != "directory":
3400
for name, ie in tree.inventory.iter_entries(file_id):
3401
interesting_ids.add(ie.file_id)
3402
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3404
# Remerge only supports resolving contents conflicts
3405
allowed_conflicts = ('text conflict', 'contents conflict')
3406
restore_files = [c.path for c in conflicts
3407
if c.typestring in allowed_conflicts]
3408
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3409
tree.set_conflicts(ConflictList(new_conflicts))
3410
if file_list is not None:
3411
restore_files = file_list
3412
for filename in restore_files:
3414
restore(tree.abspath(filename))
3415
except errors.NotConflicted:
3417
# Disable pending merges, because the file texts we are remerging
3418
# have not had those merges performed. If we use the wrong parents
3419
# list, we imply that the working tree text has seen and rejected
3420
# all the changes from the other tree, when in fact those changes
3421
# have not yet been seen.
3422
pb = ui.ui_factory.nested_progress_bar()
3423
tree.set_parent_ids(parents[:1])
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3425
merger = _mod_merge.Merger.from_revision_ids(pb,
3427
merger.interesting_ids = interesting_ids
3428
merger.merge_type = merge_type
3429
merger.show_base = show_base
3430
merger.reprocess = reprocess
3431
conflicts = merger.do_merge()
3433
tree.set_parent_ids(parents)
4124
tree.set_parent_ids(parents)
4125
3437
if conflicts > 0:
4149
3461
name. If you name a directory, all the contents of that directory will be
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
3464
Any files that have been newly added since that revision will be deleted,
3465
with a backup kept if appropriate. Directories containing unknown files
3466
will not be deleted.
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
3468
The working tree contains a list of pending merged revisions, which will
3469
be included as parents in the next commit. Normally, revert clears that
3470
list as well as reverting the files. If any files are specified, revert
3471
leaves the pending merge list alone and reverts only the files. Use "bzr
3472
revert ." in the tree root to revert all files but keep the merge record,
3473
and "bzr revert --forget-merges" to clear the pending merge list without
4164
3474
reverting any files.
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4177
3477
_see_also = ['cat', 'export']
4355
3653
_get_revision_range(revision,
4356
3654
remote_branch, self.name()))
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4370
show_timezone='original')
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4379
lf.log_revision(revision)
4380
printed_local = True
4383
printed_local = False
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4388
message("You are missing %d revision(s):\n" %
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4393
lf.log_revision(revision)
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4404
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
3656
local_branch.lock_read()
3658
remote_branch.lock_read()
3660
local_extra, remote_extra = find_unmerged(
3661
local_branch, remote_branch, restrict,
3662
backward=not reverse,
3663
include_merges=include_merges,
3664
local_revid_range=local_revid_range,
3665
remote_revid_range=remote_revid_range)
3667
if log_format is None:
3668
registry = log.log_formatter_registry
3669
log_format = registry.get_default(local_branch)
3670
lf = log_format(to_file=self.outf,
3672
show_timezone='original')
3675
if local_extra and not theirs_only:
3676
message("You have %d extra revision(s):\n" %
3678
for revision in iter_log_revisions(local_extra,
3679
local_branch.repository,
3681
lf.log_revision(revision)
3682
printed_local = True
3685
printed_local = False
3687
if remote_extra and not mine_only:
3688
if printed_local is True:
3690
message("You are missing %d revision(s):\n" %
3692
for revision in iter_log_revisions(remote_extra,
3693
remote_branch.repository,
3695
lf.log_revision(revision)
3698
if mine_only and not local_extra:
3699
# We checked local, and found nothing extra
3700
message('This branch is up to date.\n')
3701
elif theirs_only and not remote_extra:
3702
# We checked remote, and found nothing extra
3703
message('Other branch is up to date.\n')
3704
elif not (mine_only or theirs_only or local_extra or
3706
# We checked both branches, and neither one had extra
3708
message("Branches are up to date.\n")
3710
remote_branch.unlock()
3712
local_branch.unlock()
4408
3713
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
3714
local_branch.lock_write()
3716
# handle race conditions - a parent might be set while we run.
3717
if local_branch.get_parent() is None:
3718
local_branch.set_parent(remote_branch.base)
3720
local_branch.unlock()
4413
3721
return status_code
4416
3724
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
3725
"""Compress the data within a repository."""
4435
3727
_see_also = ['repositories']
4436
3728
takes_args = ['branch_or_repo?']
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
3730
def run(self, branch_or_repo='.'):
4442
3731
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
3733
branch = dir.open_branch()
4445
3734
repository = branch.repository
4446
3735
except errors.NotBranchError:
4447
3736
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
3740
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
3741
"""List the installed plugins.
4454
3743
This command displays the list of installed plugins including
4455
3744
version of plugin and a short description of each.
4552
3844
wt, branch, relpath = \
4553
3845
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
3846
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4561
file_id = wt.path2id(relpath)
4563
file_id = tree.path2id(relpath)
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
3851
tree = _get_one_revision_tree('annotate', revision, branch=branch)
3853
file_id = wt.path2id(relpath)
3855
file_id = tree.path2id(relpath)
3857
raise errors.NotVersionedError(filename)
3858
file_version = tree.inventory[file_id].revision
3859
if wt is not None and revision is None:
3860
# If there is a tree and we're not annotating historical
3861
# versions, annotate the working tree's content.
3862
annotate_file_tree(wt, file_id, self.outf, long, all,
3865
annotate_file(branch, file_version, file_id, long, all, self.outf,
4577
3874
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
3875
"""Create a digital signature for an existing revision."""
4579
3876
# TODO be able to replace existing ones.
4581
3878
hidden = True # is this right ?
4582
3879
takes_args = ['revision_id*']
4583
3880
takes_options = ['revision']
4585
3882
def run(self, revision_id_list=None, revision=None):
4586
3883
if revision_id_list is not None and revision is not None:
4587
3884
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
3885
if revision_id_list is None and revision is None:
4589
3886
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
3887
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4592
return self._run(b, revision_id_list, revision)
3890
return self._run(b, revision_id_list, revision)
4594
3894
def _run(self, b, revision_id_list, revision):
4595
3895
import bzrlib.gpg as gpg
4886
4198
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
4199
and port is an integer TCP/IP port.
4890
if port is not None:
4201
from bzrlib.smart import medium
4202
host = medium.BZR_DEFAULT_INTERFACE
4204
port = medium.BZR_DEFAULT_PORT
4891
4206
if ':' in port:
4892
4207
host, port = port.split(':')
4893
4208
port = int(port)
4894
4209
return host, port
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4898
from bzrlib.transport import get_transport, transport_server_registry
4211
def get_smart_server(self, transport, inet, port):
4212
"""Construct a smart server.
4214
:param transport: The base transport from which branches will be
4216
:param inet: If True, serve over stdin and stdout. Used for running
4218
:param port: The port to listen on. By default, it's `
4219
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4221
:return: A smart server.
4223
from bzrlib.smart import medium, server
4225
smart_server = medium.SmartServerPipeStreamMedium(
4226
sys.stdin, sys.stdout, transport)
4228
host, port = self.get_host_and_port(port)
4229
smart_server = server.SmartTCPServer(
4230
transport, host=host, port=port)
4231
note('listening on port: %s' % smart_server.port)
4234
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4235
from bzrlib.transport import get_transport
4236
from bzrlib.transport.chroot import ChrootServer
4899
4237
if directory is None:
4900
4238
directory = os.getcwd()
4901
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
4239
url = urlutils.local_path_to_url(directory)
4905
4240
if not allow_writes:
4906
4241
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
4242
chroot_server = ChrootServer(get_transport(url))
4243
chroot_server.setUp()
4244
t = get_transport(chroot_server.get_url())
4245
smart_server = self.get_smart_server(t, inet, port)
4246
self.run_smart_server(smart_server)
4911
4249
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4914
This command requires the target tree to be in a rich-root format.
4250
"""Combine a subtree into its containing tree.
4252
This command is for experimental use only. It requires the target tree
4253
to be in dirstate-with-subtree format, which cannot be converted into
4916
4256
The TREE argument should be an independent tree, inside another tree, but
4917
4257
not part of it. (Such trees can be produced by "bzr split", but also by
5092
4439
directly from the merge directive, without retrieving data from a
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4442
If --no-bundle is specified, then public_branch is needed (and must be
4443
up-to-date), so that the receiver can perform the merge using the
4444
public_branch. The public_branch is always included if known, so that
4445
people can check it later.
4447
The submit branch defaults to the parent, but can be overridden. Both
4448
submit branch and public branch will be remembered if supplied.
4450
If a public_branch is known for the submit_branch, that public submit
4451
branch is used in the merge instructions. This means that a local mirror
4452
can be used as your actual submit branch, once you have set public_branch
5122
4455
Mail is sent using your preferred mail program. This should be transparent
5123
4456
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5124
4457
If the preferred client can't be found (or used), your editor will be used.
5126
4459
To use a specific mail program, set the mail_client configuration option.
5127
4460
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5128
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5129
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5130
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4461
specific clients are "claws", "evolution", "kmail", "mutt", and
4462
"thunderbird"; generic options are "default", "editor", "emacsclient",
4463
"mapi", and "xdg-email". Plugins may also add supported clients.
5133
4465
If mail is being sent, a to address is required. This can be supplied
5134
4466
either on the commandline, by setting the submit_to configuration
5135
option in the branch itself or the child_submit_to configuration option
4467
option in the branch itself or the child_submit_to configuration option
5136
4468
in the submit branch.
5138
4470
Two formats are currently supported: "4" uses revision bundle format 4 and
5168
4495
short_name='f',
5170
4497
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
4498
help='Write merge directive to this file; '
5172
4499
'use - for stdout.',
5175
help='Refuse to send if there are uncommitted changes in'
5176
' the working tree, --no-strict disables the check.'),
5177
4501
Option('mail-to', help='Mail the request to this address.',
5181
Option('body', help='Body for the email.', type=unicode),
5182
RegistryOption('format',
5183
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
4505
RegistryOption.from_kwargs('format',
4506
'Use the specified output format.',
4507
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4508
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5187
4511
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
4512
no_patch=False, revision=None, remember=False, output=None,
5189
format=None, mail_to=None, message=None, body=None,
5190
strict=None, **kwargs):
5191
from bzrlib.send import send
5192
return send(submit_branch, revision, public_branch, remember,
5193
format, no_bundle, no_patch, output,
5194
kwargs.get('from', '.'), mail_to, message, body,
4513
format='4', mail_to=None, message=None, **kwargs):
4514
return self._run(submit_branch, revision, public_branch, remember,
4515
format, no_bundle, no_patch, output,
4516
kwargs.get('from', '.'), mail_to, message)
4518
def _run(self, submit_branch, revision, public_branch, remember, format,
4519
no_bundle, no_patch, output, from_, mail_to, message):
4520
from bzrlib.revision import NULL_REVISION
4521
branch = Branch.open_containing(from_)[0]
4523
outfile = cStringIO.StringIO()
4527
outfile = open(output, 'wb')
4528
# we may need to write data into branch's repository to calculate
4533
config = branch.get_config()
4535
mail_to = config.get_user_option('submit_to')
4536
mail_client = config.get_mail_client()
4537
if remember and submit_branch is None:
4538
raise errors.BzrCommandError(
4539
'--remember requires a branch to be specified.')
4540
stored_submit_branch = branch.get_submit_branch()
4541
remembered_submit_branch = None
4542
if submit_branch is None:
4543
submit_branch = stored_submit_branch
4544
remembered_submit_branch = "submit"
4546
if stored_submit_branch is None or remember:
4547
branch.set_submit_branch(submit_branch)
4548
if submit_branch is None:
4549
submit_branch = branch.get_parent()
4550
remembered_submit_branch = "parent"
4551
if submit_branch is None:
4552
raise errors.BzrCommandError('No submit branch known or'
4554
if remembered_submit_branch is not None:
4555
note('Using saved %s location "%s" to determine what '
4556
'changes to submit.', remembered_submit_branch,
4560
submit_config = Branch.open(submit_branch).get_config()
4561
mail_to = submit_config.get_user_option("child_submit_to")
4563
stored_public_branch = branch.get_public_branch()
4564
if public_branch is None:
4565
public_branch = stored_public_branch
4566
elif stored_public_branch is None or remember:
4567
branch.set_public_branch(public_branch)
4568
if no_bundle and public_branch is None:
4569
raise errors.BzrCommandError('No public branch specified or'
4571
base_revision_id = None
4573
if revision is not None:
4574
if len(revision) > 2:
4575
raise errors.BzrCommandError('bzr send takes '
4576
'at most two one revision identifiers')
4577
revision_id = revision[-1].as_revision_id(branch)
4578
if len(revision) == 2:
4579
base_revision_id = revision[0].as_revision_id(branch)
4580
if revision_id is None:
4581
revision_id = branch.last_revision()
4582
if revision_id == NULL_REVISION:
4583
raise errors.BzrCommandError('No revisions to submit.')
4585
directive = merge_directive.MergeDirective2.from_objects(
4586
branch.repository, revision_id, time.time(),
4587
osutils.local_time_offset(), submit_branch,
4588
public_branch=public_branch, include_patch=not no_patch,
4589
include_bundle=not no_bundle, message=message,
4590
base_revision_id=base_revision_id)
4591
elif format == '0.9':
4594
patch_type = 'bundle'
4596
raise errors.BzrCommandError('Format 0.9 does not'
4597
' permit bundle with no patch')
4603
directive = merge_directive.MergeDirective.from_objects(
4604
branch.repository, revision_id, time.time(),
4605
osutils.local_time_offset(), submit_branch,
4606
public_branch=public_branch, patch_type=patch_type,
4609
outfile.writelines(directive.to_lines())
4611
subject = '[MERGE] '
4612
if message is not None:
4615
revision = branch.repository.get_revision(revision_id)
4616
subject += revision.get_summary()
4617
basename = directive.get_disk_name(branch)
4618
mail_client.compose_merge_request(mail_to, subject,
4619
outfile.getvalue(), basename)
5199
4626
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
4628
"""Create a merge-directive for submitting changes.
5202
4630
A merge directive provides many things needed for requesting merges:
5431
4841
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
5432
4842
takes_args = ['location?']
5434
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
5438
value_switches=True, enum_switch=False,
5439
branch='Reconfigure to be an unbound branch with no working tree.',
5440
tree='Reconfigure to be an unbound branch with a working tree.',
5441
checkout='Reconfigure to be a bound branch with a working tree.',
5442
lightweight_checkout='Reconfigure to be a lightweight'
5443
' checkout (with no local history).',
5444
standalone='Reconfigure to be a standalone branch '
5445
'(i.e. stop using shared repository).',
5446
use_shared='Reconfigure to use a shared repository.',
5447
with_trees='Reconfigure repository to create '
5448
'working trees on branches by default.',
5449
with_no_trees='Reconfigure repository to not create '
5450
'working trees on branches by default.'
5452
Option('bind-to', help='Branch to bind checkout to.', type=str),
5454
help='Perform reconfiguration even if local changes'
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
4843
takes_options = [RegistryOption.from_kwargs('target_type',
4844
title='Target type',
4845
help='The type to reconfigure the directory to.',
4846
value_switches=True, enum_switch=False,
4847
branch='Reconfigure to be an unbound branch '
4848
'with no working tree.',
4849
tree='Reconfigure to be an unbound branch '
4850
'with a working tree.',
4851
checkout='Reconfigure to be a bound branch '
4852
'with a working tree.',
4853
lightweight_checkout='Reconfigure to be a lightweight'
4854
' checkout (with no local history).',
4855
standalone='Reconfigure to be a standalone branch '
4856
'(i.e. stop using shared repository).',
4857
use_shared='Reconfigure to use a shared repository.'),
4858
Option('bind-to', help='Branch to bind checkout to.',
4861
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
4865
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
4866
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5479
4867
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
4868
raise errors.BzrCommandError('No target configuration specified')
5485
4869
elif target_type == 'branch':
5486
4870
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
4871
elif target_type == 'tree':
5488
4872
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
4873
elif target_type == 'checkout':
5490
reconfiguration = reconfigure.Reconfigure.to_checkout(
4874
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
5492
4876
elif target_type == 'lightweight-checkout':
5493
4877
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
4878
directory, bind_to)
5524
4902
/path/to/newbranch.
5526
4904
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
4905
locally, in which case switching will update the the local nickname to be
5528
4906
that of the master.
5531
takes_args = ['to_location?']
4909
takes_args = ['to_location']
5532
4910
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
4911
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
4914
def run(self, to_location, force=False):
5542
4915
from bzrlib import switch
5543
4916
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
4917
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
4918
branch = control_dir.open_branch()
5552
branch = control_dir.open_branch()
5553
had_explicit_nick = branch.get_config().has_explicit_nickname()
4920
to_branch = Branch.open(to_location)
5554
4921
except errors.NotBranchError:
5556
had_explicit_nick = False
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5580
if had_explicit_nick:
4922
this_branch = control_dir.open_branch()
4923
# This may be a heavy checkout, where we want the master branch
4924
this_url = this_branch.get_bound_location()
4925
# If not, use a local sibling
4926
if this_url is None:
4927
this_url = this_branch.base
4928
to_branch = Branch.open(
4929
urlutils.join(this_url, '..', to_location))
4930
switch.switch(control_dir, to_branch, force)
4931
if branch.get_config().has_explicit_nickname():
5581
4932
branch = control_dir.open_branch() #get the new branch!
5582
4933
branch.nick = to_branch.nick
5583
4934
note('Switched to branch: %s',
5584
4935
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
5604
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5607
Views provide a mask over the tree so that users can focus on
5608
a subset of a tree when doing their work. After creating a view,
5609
commands that support a list of files - status, diff, commit, etc -
5610
effectively have that list of files implicitly given each time.
5611
An explicit list of files can still be given but those files
5612
must be within the current view.
5614
In most cases, a view has a short life-span: it is created to make
5615
a selected change and is deleted once that change is committed.
5616
At other times, you may wish to create one or more named views
5617
and switch between them.
5619
To disable the current view without deleting it, you can switch to
5620
the pseudo view called ``off``. This can be useful when you need
5621
to see the whole tree for an operation or two (e.g. merge) but
5622
want to switch back to your view after that.
5625
To define the current view::
5627
bzr view file1 dir1 ...
5629
To list the current view::
5633
To delete the current view::
5637
To disable the current view without deleting it::
5639
bzr view --switch off
5641
To define a named view and switch to it::
5643
bzr view --name view-name file1 dir1 ...
5645
To list a named view::
5647
bzr view --name view-name
5649
To delete a named view::
5651
bzr view --name view-name --delete
5653
To switch to a named view::
5655
bzr view --switch view-name
5657
To list all views defined::
5661
To delete all views::
5663
bzr view --delete --all
5667
takes_args = ['file*']
5670
help='Apply list or delete action to all views.',
5673
help='Delete the view.',
5676
help='Name of the view to define, list or delete.',
5680
help='Name of the view to switch to.',
5685
def run(self, file_list,
5691
tree, file_list = tree_files(file_list, apply_view=False)
5692
current_view, view_dict = tree.views.get_view_info()
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
5703
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
5706
raise errors.BzrCommandError("No current view to delete")
5708
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
5717
elif switch == 'off':
5718
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
5720
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
5723
tree.views.set_view_info(switch, view_dict)
5724
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
5728
self.outf.write('Views defined:\n')
5729
for view in sorted(view_dict):
5730
if view == current_view:
5734
view_str = views.view_display_str(view_dict[view])
5735
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5737
self.outf.write('No views defined.\n')
5740
# No name given and no current view set
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
5745
tree.views.set_view(name, sorted(file_list))
5746
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
5751
# No name given and no current view set
5752
self.outf.write('No current view.\n')
5754
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
5758
4938
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
4939
"""Show a branch's currently registered hooks.
5764
for hook_key in sorted(hooks.known_hooks.keys()):
5765
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5766
self.outf.write("%s:\n" % type(some_hooks).__name__)
5767
for hook_name, hook_point in sorted(some_hooks.items()):
5768
self.outf.write(" %s:\n" % (hook_name,))
5769
found_hooks = list(hook_point)
5771
for hook in found_hooks:
5772
self.outf.write(" %s\n" %
5773
(some_hooks.get_hook_name(hook),))
5775
self.outf.write(" <no hooks installed>\n")
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5786
Remove the branch at repo/trunk::
5788
bzr remove-branch repo/trunk
5792
takes_args = ["location?"]
5794
aliases = ["rmbranch"]
5796
def run(self, location=None):
5797
if location is None:
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
4943
takes_args = ['path?']
4945
def run(self, path=None):
4948
branch_hooks = Branch.open(path).hooks
4949
for hook_type in branch_hooks:
4950
hooks = branch_hooks[hook_type]
4951
self.outf.write("%s:\n" % (hook_type,))
4954
self.outf.write(" %s\n" %
4955
(branch_hooks.get_hook_name(hook),))
4957
self.outf.write(" <no hooks installed>\n")
5803
4960
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
4961
"""Temporarily set aside some changes from the current tree.
5806
4963
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
4964
ie. out of the way, until a later time when you can bring them back from
5808
the shelf with the 'unshelve' command. The changes are stored alongside
5809
your working tree, and so they aren't propagated along with your branch nor
5810
will they survive its deletion.
4965
the shelf with the 'unshelve' command.
5812
4967
If shelve --list is specified, previously-shelved changes are listed.
5836
4991
value_switches=True, enum_switch=False),
5838
4993
Option('list', help='List shelved changes.'),
5840
help='Destroy removed changes instead of shelving them.'),
5842
4995
_see_also = ['unshelve']
5844
4997
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
4998
writer=None, list=False):
5847
5000
return self.run_for_list()
5848
5001
from bzrlib.shelf_ui import Shelver
5849
5002
if writer is None:
5850
5003
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5005
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5858
5007
except errors.UserAbort:
5861
5010
def run_for_list(self):
5862
5011
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5014
manager = tree.get_shelf_manager()
5015
shelves = manager.active_shelves()
5016
if len(shelves) == 0:
5017
note('No shelved changes.')
5019
for shelf_id in reversed(shelves):
5020
message = manager.get_metadata(shelf_id).get('message')
5022
message = '<no message>'
5023
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5029
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5030
"""Restore shelved changes.
5880
5032
By default, the most recently shelved changes are restored. However if you
5881
specify a shelf by id those changes will be restored instead. This works
5882
best when the changes don't depend on each other.
5033
specify a patch by name those changes will be restored instead. This
5034
works best when the changes don't depend on each other.
5885
5037
takes_args = ['shelf_id?']
5889
5041
enum_switch=False, value_switches=True,
5890
5042
apply="Apply changes and remove from the shelf.",
5891
5043
dry_run="Show changes, but do not apply or remove them.",
5892
preview="Instead of unshelving the changes, show the diff that "
5893
"would result from unshelving.",
5894
delete_only="Delete changes without applying them.",
5895
keep="Apply changes but don't delete them.",
5044
delete_only="Delete changes without applying them."
5898
5047
_see_also = ['shelve']
5900
5049
def run(self, shelf_id=None, action='apply'):
5901
5050
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5051
Unshelver.from_args(shelf_id, action).run()
5054
def _create_prefix(cur_transport):
5055
needed = [cur_transport]
5056
# Recurse upwards until we can create a directory successfully
5058
new_transport = cur_transport.clone('..')
5059
if new_transport.base == cur_transport.base:
5060
raise errors.BzrCommandError(
5061
"Failed to create path prefix for %s."
5062
% cur_transport.base)
5906
unshelver.tree.unlock()
5909
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5912
By default, only unknown files, not ignored files, are deleted. Versioned
5913
files are never deleted.
5915
Another class is 'detritus', which includes files emitted by bzr during
5916
normal operations and selftests. (The value of these files decreases with
5919
If no options are specified, unknown files are deleted. Otherwise, option
5920
flags are respected, and may be combined.
5922
To check what clean-tree will do, use --dry-run.
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
Option('detritus', help='Delete conflict files, merge'
5926
' backups, and failed selftest dirs.'),
5928
help='Delete files unknown to bzr (default).'),
5929
Option('dry-run', help='Show files to delete instead of'
5931
Option('force', help='Do not prompt before deleting.')]
5932
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
from bzrlib.clean_tree import clean_tree
5935
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
5943
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5946
If no arguments are provided, lists the branch locations for nested trees.
5947
If one argument is provided, display the branch location for that tree.
5948
If two arguments are provided, set the branch location for that tree.
5953
takes_args = ['path?', 'location?']
5955
def run(self, path=None, location=None):
5957
if path is not None:
5959
tree, branch, relpath =(
5960
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5961
if path is not None:
5964
tree = branch.basis_tree()
5966
info = branch._get_all_reference_info().iteritems()
5967
self._display_reference_info(tree, branch, info)
5064
new_transport.mkdir('.')
5065
except errors.NoSuchFile:
5066
needed.append(new_transport)
5067
cur_transport = new_transport
5969
file_id = tree.path2id(path)
5971
raise errors.NotVersionedError(path)
5972
if location is None:
5973
info = [(file_id, branch.get_reference_info(file_id))]
5974
self._display_reference_info(tree, branch, info)
5976
branch.set_reference_info(file_id, path, location)
5978
def _display_reference_info(self, tree, branch, info):
5980
for file_id, (path, location) in info:
5982
path = tree.id2path(file_id)
5983
except errors.NoSuchId:
5985
ref_list.append((path, location))
5986
for path, location in sorted(ref_list):
5987
self.outf.write('%s %s\n' % (path, location))
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5070
# Now we only need to create child directories
5072
cur_transport = needed.pop()
5073
cur_transport.ensure_base()
5076
# these get imported and then picked up by the scan for cmd_*
5077
# TODO: Some more consistent way to split command definitions across files;
5078
# we do need to load at least some information about them to know of
5079
# aliases. ideally we would avoid loading the implementation until the
5080
# details were needed.
5081
from bzrlib.cmd_version_info import cmd_version_info
5082
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5083
from bzrlib.bundle.commands import (
5086
from bzrlib.sign_my_commits import cmd_sign_my_commits
5087
from bzrlib.weave_commands import cmd_versionedfile_list, \
5088
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
