72
66
_parse_revision_str,
74
68
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
81
71
def tree_files(file_list, default_branch=u'.', canonicalize=True,
83
return internal_tree_files(file_list, default_branch, canonicalize,
74
return internal_tree_files(file_list, default_branch, canonicalize,
76
except errors.FileInWrongBranch, e:
77
raise errors.BzrCommandError("%s is not in the same branch as %s" %
78
(e.path, file_list[0]))
87
81
def tree_files_for_add(file_list):
89
Return a tree and list of absolute paths from a file list.
91
Similar to tree_files, but add handles files a bit differently, so it a
92
custom implementation. In particular, MutableTreeTree.smart_add expects
93
absolute paths, which it immediately converts to relative paths.
95
# FIXME Would be nice to just return the relative paths like
96
# internal_tree_files does, but there are a large number of unit tests
97
# that assume the current interface to mutabletree.smart_add
82
"""Add handles files a bit differently so it a custom implementation."""
99
tree, relpath = WorkingTree.open_containing(file_list[0])
84
tree = WorkingTree.open_containing(file_list[0])[0]
100
85
if tree.supports_views():
101
86
view_files = tree.views.lookup_view()
103
88
for filename in file_list:
104
89
if not osutils.is_inside_any(view_files, filename):
105
90
raise errors.FileOutsideView(filename, view_files)
106
file_list = file_list[:]
107
file_list[0] = tree.abspath(relpath)
109
92
tree = WorkingTree.open_containing(u'.')[0]
110
93
if tree.supports_views():
174
145
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
147
if file_list is None or len(file_list) == 0:
148
tree = WorkingTree.open_containing(default_branch)[0]
149
if tree.supports_views() and apply_view:
150
view_files = tree.views.lookup_view()
152
file_list = view_files
153
view_str = views.view_display_str(view_files)
154
note("Ignoring files outside view. View is %s" % view_str)
155
return tree, file_list
156
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
157
return tree, safe_relpath_files(tree, file_list, canonicalize,
158
apply_view=apply_view)
161
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
162
"""Convert file_list into a list of relpaths in tree.
164
:param tree: A tree to operate on.
165
:param file_list: A list of user provided paths or None.
166
:param apply_view: if True and a view is set, apply it or check that
167
specified files are within it
168
:return: A list of relative paths.
169
:raises errors.PathNotChild: When a provided path is in a different tree
172
if file_list is None:
174
if tree.supports_views() and apply_view:
175
view_files = tree.views.lookup_view()
179
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
180
# doesn't - fix that up here before we enter the loop.
182
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
185
for filename in file_list:
187
relpath = fixer(osutils.dereference_path(filename))
188
if view_files and not osutils.is_inside_any(view_files, relpath):
189
raise errors.FileOutsideView(filename, view_files)
190
new_list.append(relpath)
191
except errors.PathNotChild:
192
raise errors.FileInWrongBranch(tree.branch, filename)
182
196
def _get_view_info_for_change_reporter(tree):
319
311
takes_args = ['revision_id?']
320
takes_options = ['directory', 'revision']
312
takes_options = ['revision']
321
313
# cat-revision is more for frontends so should be exact
322
314
encoding = 'strict'
324
def print_revision(self, revisions, revid):
325
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
326
record = stream.next()
327
if record.storage_kind == 'absent':
328
raise errors.NoSuchRevision(revisions, revid)
329
revtext = record.get_bytes_as('fulltext')
330
self.outf.write(revtext.decode('utf-8'))
333
def run(self, revision_id=None, revision=None, directory=u'.'):
317
def run(self, revision_id=None, revision=None):
334
318
if revision_id is not None and revision is not None:
335
319
raise errors.BzrCommandError('You can only supply one of'
336
320
' revision_id or --revision')
337
321
if revision_id is None and revision is None:
338
322
raise errors.BzrCommandError('You must supply either'
339
323
' --revision or a revision_id')
341
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
343
revisions = b.repository.revisions
344
if revisions is None:
345
raise errors.BzrCommandError('Repository %r does not support '
346
'access to raw revision texts')
348
b.repository.lock_read()
350
# TODO: jam 20060112 should cat-revision always output utf-8?
351
if revision_id is not None:
352
revision_id = osutils.safe_revision_id(revision_id, warn=False)
354
self.print_revision(revisions, revision_id)
355
except errors.NoSuchRevision:
356
msg = "The repository %s contains no revision %s." % (
357
b.repository.base, revision_id)
358
raise errors.BzrCommandError(msg)
359
elif revision is not None:
362
raise errors.BzrCommandError(
363
'You cannot specify a NULL revision.')
364
rev_id = rev.as_revision_id(b)
365
self.print_revision(revisions, rev_id)
367
b.repository.unlock()
324
b = WorkingTree.open_containing(u'.')[0].branch
326
# TODO: jam 20060112 should cat-revision always output utf-8?
327
if revision_id is not None:
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
334
raise errors.BzrCommandError(msg)
335
elif revision is not None:
338
raise errors.BzrCommandError('You cannot specify a NULL'
340
rev_id = rev.as_revision_id(b)
341
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
344
class cmd_dump_btree(Command):
371
__doc__ = """Dump the contents of a btree index file to stdout.
345
"""Dump the contents of a btree index file to stdout.
373
347
PATH is a btree index file, it can be any URL. This includes things like
374
348
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
424
To re-create the working tree, use "bzr checkout".
462
426
_see_also = ['checkout', 'working-trees']
463
takes_args = ['location*']
427
takes_args = ['location?']
464
428
takes_options = [
466
430
help='Remove the working tree even if it has '
467
'uncommitted or shelved changes.'),
431
'uncommitted changes.'),
470
def run(self, location_list, force=False):
471
if not location_list:
474
for location in location_list:
475
d = bzrdir.BzrDir.open(location)
478
working = d.open_workingtree()
479
except errors.NoWorkingTree:
480
raise errors.BzrCommandError("No working tree to remove")
481
except errors.NotLocalUrl:
482
raise errors.BzrCommandError("You cannot remove the working tree"
485
if (working.has_changes()):
486
raise errors.UncommittedChanges(working)
487
if working.get_shelf_manager().last_shelf() is not None:
488
raise errors.ShelvedChanges(working)
490
if working.user_url != working.branch.user_url:
491
raise errors.BzrCommandError("You cannot remove the working tree"
492
" from a lightweight checkout")
494
d.destroy_workingtree()
497
class cmd_repair_workingtree(Command):
498
__doc__ = """Reset the working tree state file.
500
This is not meant to be used normally, but more as a way to recover from
501
filesystem corruption, etc. This rebuilds the working inventory back to a
502
'known good' state. Any new modifications (adding a file, renaming, etc)
503
will be lost, though modified files will still be detected as such.
505
Most users will want something more like "bzr revert" or "bzr update"
506
unless the state file has become corrupted.
508
By default this attempts to recover the current state by looking at the
509
headers of the state file. If the state file is too corrupted to even do
510
that, you can supply --revision to force the state of the tree.
513
takes_options = ['revision', 'directory',
515
help='Reset the tree even if it doesn\'t appear to be'
520
def run(self, revision=None, directory='.', force=False):
521
tree, _ = WorkingTree.open_containing(directory)
522
self.add_cleanup(tree.lock_tree_write().unlock)
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
526
except errors.BzrError:
527
pass # There seems to be a real error here, so we'll reset
530
raise errors.BzrCommandError(
531
'The tree does not appear to be corrupt. You probably'
532
' want "bzr revert" instead. Use "--force" if you are'
533
' sure you want to reset the working tree.')
537
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
539
tree.reset_state(revision_ids)
540
except errors.BzrError, e:
541
if revision_ids is None:
542
extra = (', the header appears corrupt, try passing -r -1'
543
' to set the state to the last commit')
546
raise errors.BzrCommandError('failed to reset the tree state'
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
455
d.destroy_workingtree()
550
458
class cmd_revno(Command):
551
__doc__ = """Show current revision number.
459
"""Show current revision number.
553
461
This is equal to the number of revisions on this branch.
556
464
_see_also = ['info']
557
465
takes_args = ['location?']
559
Option('tree', help='Show revno of working tree'),
563
def run(self, tree=False, location=u'.'):
566
wt = WorkingTree.open_containing(location)[0]
567
self.add_cleanup(wt.lock_read().unlock)
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
569
raise errors.NoWorkingTree(location)
570
revid = wt.last_revision()
572
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
573
except errors.NoSuchRevision:
575
revno = ".".join(str(n) for n in revno_t)
577
b = Branch.open_containing(location)[0]
578
self.add_cleanup(b.lock_read().unlock)
581
self.outf.write(str(revno) + '\n')
468
def run(self, location=u'.'):
469
self.outf.write(str(Branch.open_containing(location)[0].revno()))
470
self.outf.write('\n')
584
473
class cmd_revision_info(Command):
585
__doc__ = """Show revision number and revision id for a given revision identifier.
474
"""Show revision number and revision id for a given revision identifier.
588
477
takes_args = ['revision_info*']
589
478
takes_options = [
591
custom_help('directory',
592
481
help='Branch to examine, '
593
'rather than the one containing the working directory.'),
594
Option('tree', help='Show revno of working tree'),
482
'rather than the one containing the working directory.',
598
def run(self, revision=None, directory=u'.', tree=False,
599
revision_info_list=[]):
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
602
wt = WorkingTree.open_containing(directory)[0]
604
self.add_cleanup(wt.lock_read().unlock)
605
except (errors.NoWorkingTree, errors.NotLocalUrl):
607
b = Branch.open_containing(directory)[0]
608
self.add_cleanup(b.lock_read().unlock)
610
492
if revision is not None:
611
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
493
revs.extend(revision)
612
494
if revision_info_list is not None:
613
for rev_str in revision_info_list:
614
rev_spec = RevisionSpec.from_string(rev_str)
615
revision_ids.append(rev_spec.as_revision_id(b))
616
# No arguments supplied, default to the last revision
617
if len(revision_ids) == 0:
620
raise errors.NoWorkingTree(directory)
621
revision_ids.append(wt.last_revision())
623
revision_ids.append(b.last_revision())
627
for revision_id in revision_ids:
495
for rev in revision_info_list:
496
revs.append(RevisionSpec.from_string(rev))
498
b = Branch.open_containing(directory)[0]
501
revs.append(RevisionSpec.from_string('-1'))
504
revision_id = rev.as_revision_id(b)
629
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
630
revno = '.'.join(str(i) for i in dotted_revno)
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
631
507
except errors.NoSuchRevision:
633
maxlen = max(maxlen, len(revno))
634
revinfos.append([revno, revision_id])
638
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
641
513
class cmd_add(Command):
642
__doc__ = """Add specified files or directories.
514
"""Add specified files or directories.
644
516
In non-recursive mode, all the named items are added, regardless
645
517
of whether they were previously ignored. A warning is given if
787
662
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
789
664
revision = _get_one_revision('inventory', revision)
790
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
791
self.add_cleanup(work_tree.lock_read().unlock)
792
if revision is not None:
793
tree = revision.as_tree(work_tree.branch)
795
extra_trees = [work_tree]
796
self.add_cleanup(tree.lock_read().unlock)
801
if file_list is not None:
802
file_ids = tree.paths2ids(file_list, trees=extra_trees,
803
require_versioned=True)
804
# find_ids_across_trees may include some paths that don't
807
(tree.id2path(file_id), tree.inventory[file_id])
808
for file_id in file_ids if tree.has_id(file_id))
810
entries = tree.inventory.entries()
665
work_tree, file_list = tree_files(file_list)
666
work_tree.lock_read()
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
671
extra_trees = [work_tree]
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
685
entries = tree.inventory.entries()
688
if tree is not work_tree:
813
691
for path, entry in entries:
814
692
if kind and kind != entry.kind:
952
834
dest = osutils.pathjoin(dest_parent, dest_tail)
953
835
mutter("attempting to move %s => %s", src, dest)
954
836
tree.rename_one(src, dest, after=after)
956
self.outf.write("%s => %s\n" % (src, dest))
837
self.outf.write("%s => %s\n" % (src, dest))
959
840
class cmd_pull(Command):
960
__doc__ = """Turn this branch into a mirror of another branch.
841
"""Turn this branch into a mirror of another branch.
962
By default, this command only works on branches that have not diverged.
963
Branches are considered diverged if the destination branch's most recent
964
commit is one that has not been merged (directly or indirectly) into the
843
This command only works on branches that have not diverged. Branches are
844
considered diverged if the destination branch's most recent commit is one
845
that has not been merged (directly or indirectly) into the parent.
967
847
If branches have diverged, you can use 'bzr merge' to integrate the changes
968
848
from one into the other. Once one branch has merged, the other should
969
849
be able to pull it again.
971
If you want to replace your local changes and just want your branch to
972
match the remote one, use pull --overwrite. This will work even if the two
973
branches have diverged.
851
If you want to forget your local changes and just update your branch to
852
match the remote one, use pull --overwrite.
975
If there is no default location set, the first pull will set it (use
976
--no-remember to avoid settting it). After that, you can omit the
977
location to use the default. To change the default, use --remember. The
978
value will only be saved if the remote location can be accessed.
854
If there is no default location set, the first pull will set it. After
855
that, you can omit the location to use the default. To change the
856
default, use --remember. The value will only be saved if the remote
857
location can be accessed.
980
859
Note: The location can be specified either in the form of a branch,
981
860
or in the form of a path to a file containing a merge directive generated
1057
923
branch_from = Branch.open(location,
1058
924
possible_transports=possible_transports)
1059
self.add_cleanup(branch_from.lock_read().unlock)
1060
# Remembers if asked explicitly or no previous location is set
1062
or (remember is None and branch_to.get_parent() is None)):
926
if branch_to.get_parent() is None or remember:
1063
927
branch_to.set_parent(branch_from.base)
1065
929
if revision is not None:
1066
930
revision_id = revision.as_revision_id(branch_from)
1068
if tree_to is not None:
1069
view_info = _get_view_info_for_change_reporter(tree_to)
1070
change_reporter = delta._ChangeReporter(
1071
unversioned_filter=tree_to.is_ignored,
1072
view_info=view_info)
1073
result = tree_to.pull(
1074
branch_from, overwrite, revision_id, change_reporter,
1075
possible_transports=possible_transports, local=local,
1076
show_base=show_base)
1078
result = branch_to.pull(
1079
branch_from, overwrite, revision_id, local=local)
932
branch_to.lock_write()
934
if tree_to is not None:
935
view_info = _get_view_info_for_change_reporter(tree_to)
936
change_reporter = delta._ChangeReporter(
937
unversioned_filter=tree_to.is_ignored, view_info=view_info)
938
result = tree_to.pull(branch_from, overwrite, revision_id,
940
possible_transports=possible_transports)
942
result = branch_to.pull(branch_from, overwrite, revision_id)
1081
result.report(self.outf)
1082
if verbose and result.old_revid != result.new_revid:
1083
log.show_branch_change(
1084
branch_to, self.outf, result.old_revno,
1086
if getattr(result, 'tag_conflicts', None):
944
result.report(self.outf)
945
if verbose and result.old_revid != result.new_revid:
946
log.show_branch_change(branch_to, self.outf, result.old_revno,
1092
952
class cmd_push(Command):
1093
__doc__ = """Update a mirror of this branch.
953
"""Update a mirror of this branch.
1095
955
The target branch will not have its working tree populated because this
1096
956
is both expensive, and is not supported on remote file systems.
1136
999
'for the commit history. Only the work not present in the '
1137
1000
'referenced branch is included in the branch created.',
1140
help='Refuse to push if there are uncommitted changes in'
1141
' the working tree, --no-strict disables the check.'),
1143
help="Don't populate the working tree, even for protocols"
1144
" that support it."),
1146
1003
takes_args = ['location?']
1147
1004
encoding_type = 'replace'
1149
def run(self, location=None, remember=None, overwrite=False,
1006
def run(self, location=None, remember=False, overwrite=False,
1150
1007
create_prefix=False, verbose=False, revision=None,
1151
1008
use_existing_dir=False, directory=None, stacked_on=None,
1152
stacked=False, strict=None, no_tree=False):
1153
1010
from bzrlib.push import _show_push_branch
1012
# Get the source branch and revision_id
1155
1013
if directory is None:
1156
1014
directory = '.'
1157
# Get the source branch
1159
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1160
# Get the tip's revision_id
1015
br_from = Branch.open_containing(directory)[0]
1161
1016
revision = _get_one_revision('push', revision)
1162
1017
if revision is not None:
1163
1018
revision_id = revision.in_history(br_from).rev_id
1166
if tree is not None and revision_id is None:
1167
tree.check_changed_or_out_of_date(
1168
strict, 'push_strict',
1169
more_error='Use --no-strict to force the push.',
1170
more_warning='Uncommitted changes will not be pushed.')
1020
revision_id = br_from.last_revision()
1171
1022
# Get the stacked_on branch, if any
1172
1023
if stacked_on is not None:
1173
1024
stacked_on = urlutils.normalize_url(stacked_on)
1217
1068
To retrieve the branch as of a particular revision, supply the --revision
1218
1069
parameter, as in "branch foo/bar -r 5".
1220
The synonyms 'clone' and 'get' for this command are deprecated.
1223
1072
_see_also = ['checkout']
1224
1073
takes_args = ['from_location', 'to_location?']
1225
takes_options = ['revision',
1226
Option('hardlink', help='Hard-link working tree files where possible.'),
1227
Option('files-from', type=str,
1228
help="Get file contents from this tree."),
1074
takes_options = ['revision', Option('hardlink',
1075
help='Hard-link working tree files where possible.'),
1229
1076
Option('no-tree',
1230
1077
help="Create a branch without a working-tree."),
1232
help="Switch the checkout in the current directory "
1233
"to the new branch."),
1234
1078
Option('stacked',
1235
1079
help='Create a stacked branch referring to the source branch. '
1236
1080
'The new branch will depend on the availability of the source '
1237
1081
'branch for all operations.'),
1238
1082
Option('standalone',
1239
1083
help='Do not use a shared repository, even if available.'),
1240
Option('use-existing-dir',
1241
help='By default branch will fail if the target'
1242
' directory exists, but does not already'
1243
' have a control directory. This flag will'
1244
' allow branch to proceed.'),
1246
help="Bind new branch to from location."),
1248
1085
aliases = ['get', 'clone']
1250
1087
def run(self, from_location, to_location=None, revision=None,
1251
hardlink=False, stacked=False, standalone=False, no_tree=False,
1252
use_existing_dir=False, switch=False, bind=False,
1254
from bzrlib import switch as _mod_switch
1088
hardlink=False, stacked=False, standalone=False, no_tree=False):
1255
1089
from bzrlib.tag import _merge_tags_if_possible
1256
if self.invoked_as in ['get', 'clone']:
1257
ui.ui_factory.show_user_warning(
1258
'deprecated_command',
1259
deprecated_name=self.invoked_as,
1260
recommended_name='branch',
1261
deprecated_in_version='2.4')
1262
1091
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1264
if not (hardlink or files_from):
1265
# accelerator_tree is usually slower because you have to read N
1266
# files (no readahead, lots of seeks, etc), but allow the user to
1267
# explicitly request it
1268
accelerator_tree = None
1269
if files_from is not None and files_from != from_location:
1270
accelerator_tree = WorkingTree.open(files_from)
1271
1093
revision = _get_one_revision('branch', revision)
1272
self.add_cleanup(br_from.lock_read().unlock)
1273
if revision is not None:
1274
revision_id = revision.as_revision_id(br_from)
1276
# FIXME - wt.last_revision, fallback to branch, fall back to
1277
# None or perhaps NULL_REVISION to mean copy nothing
1279
revision_id = br_from.last_revision()
1280
if to_location is None:
1281
to_location = urlutils.derive_to_location(from_location)
1282
to_transport = transport.get_transport(to_location)
1284
to_transport.mkdir('.')
1285
except errors.FileExists:
1286
if not use_existing_dir:
1287
raise errors.BzrCommandError('Target directory "%s" '
1288
'already exists.' % to_location)
1096
if revision is not None:
1097
revision_id = revision.as_revision_id(br_from)
1291
bzrdir.BzrDir.open_from_transport(to_transport)
1292
except errors.NotBranchError:
1295
raise errors.AlreadyBranchError(to_location)
1296
except errors.NoSuchFile:
1297
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1300
# preserve whatever source format we have.
1301
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1302
possible_transports=[to_transport],
1303
accelerator_tree=accelerator_tree,
1304
hardlink=hardlink, stacked=stacked,
1305
force_new_repo=standalone,
1306
create_tree_if_local=not no_tree,
1307
source_branch=br_from)
1308
branch = dir.open_branch()
1309
except errors.NoSuchRevision:
1310
to_transport.delete_tree('.')
1311
msg = "The branch %s has no revision %s." % (from_location,
1313
raise errors.BzrCommandError(msg)
1314
_merge_tags_if_possible(br_from, branch)
1315
# If the source branch is stacked, the new branch may
1316
# be stacked whether we asked for that explicitly or not.
1317
# We therefore need a try/except here and not just 'if stacked:'
1319
note('Created new stacked branch referring to %s.' %
1320
branch.get_stacked_on_url())
1321
except (errors.NotStacked, errors.UnstackableBranchFormat,
1322
errors.UnstackableRepositoryFormat), e:
1323
note('Branched %d revision(s).' % branch.revno())
1325
# Bind to the parent
1326
parent_branch = Branch.open(from_location)
1327
branch.bind(parent_branch)
1328
note('New branch bound to %s' % from_location)
1330
# Switch to the new branch
1331
wt, _ = WorkingTree.open_containing('.')
1332
_mod_switch.switch(wt.bzrdir, branch)
1333
note('Switched to branch: %s',
1334
urlutils.unescape_for_display(branch.base, 'utf-8'))
1099
# FIXME - wt.last_revision, fallback to branch, fall back to
1100
# None or perhaps NULL_REVISION to mean copy nothing
1102
revision_id = br_from.last_revision()
1103
if to_location is None:
1104
to_location = urlutils.derive_to_location(from_location)
1105
to_transport = transport.get_transport(to_location)
1107
to_transport.mkdir('.')
1108
except errors.FileExists:
1109
raise errors.BzrCommandError('Target directory "%s" already'
1110
' exists.' % to_location)
1111
except errors.NoSuchFile:
1112
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1115
# preserve whatever source format we have.
1116
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1117
possible_transports=[to_transport],
1118
accelerator_tree=accelerator_tree,
1119
hardlink=hardlink, stacked=stacked,
1120
force_new_repo=standalone,
1121
create_tree_if_local=not no_tree,
1122
source_branch=br_from)
1123
branch = dir.open_branch()
1124
except errors.NoSuchRevision:
1125
to_transport.delete_tree('.')
1126
msg = "The branch %s has no revision %s." % (from_location,
1128
raise errors.BzrCommandError(msg)
1129
_merge_tags_if_possible(br_from, branch)
1130
# If the source branch is stacked, the new branch may
1131
# be stacked whether we asked for that explicitly or not.
1132
# We therefore need a try/except here and not just 'if stacked:'
1134
note('Created new stacked branch referring to %s.' %
1135
branch.get_stacked_on_url())
1136
except (errors.NotStacked, errors.UnstackableBranchFormat,
1137
errors.UnstackableRepositoryFormat), e:
1138
note('Branched %d revision(s).' % branch.revno())
1337
1143
class cmd_checkout(Command):
1338
__doc__ = """Create a new checkout of an existing branch.
1144
"""Create a new checkout of an existing branch.
1340
1146
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1341
1147
the branch found in '.'. This is useful if you have removed the working tree
1420
1221
@display_command
1421
1222
def run(self, dir=u'.'):
1422
1223
tree = WorkingTree.open_containing(dir)[0]
1423
self.add_cleanup(tree.lock_read().unlock)
1424
new_inv = tree.inventory
1425
old_tree = tree.basis_tree()
1426
self.add_cleanup(old_tree.lock_read().unlock)
1427
old_inv = old_tree.inventory
1429
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1430
for f, paths, c, v, p, n, k, e in iterator:
1431
if paths[0] == paths[1]:
1435
renames.append(paths)
1437
for old_name, new_name in renames:
1438
self.outf.write("%s => %s\n" % (old_name, new_name))
1226
new_inv = tree.inventory
1227
old_tree = tree.basis_tree()
1228
old_tree.lock_read()
1230
old_inv = old_tree.inventory
1232
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1233
for f, paths, c, v, p, n, k, e in iterator:
1234
if paths[0] == paths[1]:
1238
renames.append(paths)
1240
for old_name, new_name in renames:
1241
self.outf.write("%s => %s\n" % (old_name, new_name))
1441
1248
class cmd_update(Command):
1442
__doc__ = """Update a tree to have the latest code committed to its branch.
1249
"""Update a tree to have the latest code committed to its branch.
1444
1251
This will perform a merge into the working tree, and may generate
1445
1252
conflicts. If you have any local changes, you will still
1448
1255
If you want to discard your local changes, you can just do a
1449
1256
'bzr revert' instead of 'bzr commit' after the update.
1451
If you want to restore a file that has been removed locally, use
1452
'bzr revert' instead of 'bzr update'.
1454
If the tree's branch is bound to a master branch, it will also update
1455
the branch from the master.
1458
1259
_see_also = ['pull', 'working-trees', 'status-flags']
1459
1260
takes_args = ['dir?']
1460
takes_options = ['revision',
1462
help="Show base revision text in conflicts."),
1464
1261
aliases = ['up']
1466
def run(self, dir='.', revision=None, show_base=None):
1467
if revision is not None and len(revision) != 1:
1468
raise errors.BzrCommandError(
1469
"bzr update --revision takes exactly one revision")
1263
def run(self, dir='.'):
1470
1264
tree = WorkingTree.open_containing(dir)[0]
1471
branch = tree.branch
1472
1265
possible_transports = []
1473
master = branch.get_master_branch(
1266
master = tree.branch.get_master_branch(
1474
1267
possible_transports=possible_transports)
1475
1268
if master is not None:
1476
branch_location = master.base
1477
1269
tree.lock_write()
1479
branch_location = tree.branch.base
1480
1271
tree.lock_tree_write()
1481
self.add_cleanup(tree.unlock)
1482
# get rid of the final '/' and be ready for display
1483
branch_location = urlutils.unescape_for_display(
1484
branch_location.rstrip('/'),
1486
existing_pending_merges = tree.get_parent_ids()[1:]
1490
# may need to fetch data into a heavyweight checkout
1491
# XXX: this may take some time, maybe we should display a
1493
old_tip = branch.update(possible_transports)
1494
if revision is not None:
1495
revision_id = revision[0].as_revision_id(branch)
1497
revision_id = branch.last_revision()
1498
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1499
revno = branch.revision_id_to_dotted_revno(revision_id)
1500
note("Tree is up to date at revision %s of branch %s" %
1501
('.'.join(map(str, revno)), branch_location))
1503
view_info = _get_view_info_for_change_reporter(tree)
1504
change_reporter = delta._ChangeReporter(
1505
unversioned_filter=tree.is_ignored,
1506
view_info=view_info)
1273
existing_pending_merges = tree.get_parent_ids()[1:]
1274
last_rev = _mod_revision.ensure_null(tree.last_revision())
1275
if last_rev == _mod_revision.ensure_null(
1276
tree.branch.last_revision()):
1277
# may be up to date, check master too.
1278
if master is None or last_rev == _mod_revision.ensure_null(
1279
master.last_revision()):
1280
revno = tree.branch.revision_id_to_revno(last_rev)
1281
note("Tree is up to date at revision %d." % (revno,))
1283
view_info = _get_view_info_for_change_reporter(tree)
1508
1284
conflicts = tree.update(
1510
possible_transports=possible_transports,
1511
revision=revision_id,
1513
show_base=show_base)
1514
except errors.NoSuchRevision, e:
1515
raise errors.BzrCommandError(
1516
"branch has no revision %s\n"
1517
"bzr update --revision only works"
1518
" for a revision in the branch history"
1520
revno = tree.branch.revision_id_to_dotted_revno(
1521
_mod_revision.ensure_null(tree.last_revision()))
1522
note('Updated to revision %s of branch %s' %
1523
('.'.join(map(str, revno)), branch_location))
1524
parent_ids = tree.get_parent_ids()
1525
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1526
note('Your local commits will now show as pending merges with '
1527
"'bzr status', and can be committed with 'bzr commit'.")
1285
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1286
view_info=view_info), possible_transports=possible_transports)
1287
revno = tree.branch.revision_id_to_revno(
1288
_mod_revision.ensure_null(tree.last_revision()))
1289
note('Updated to revision %d.' % (revno,))
1290
if tree.get_parent_ids()[1:] != existing_pending_merges:
1291
note('Your local commits will now show as pending merges with '
1292
"'bzr status', and can be committed with 'bzr commit'.")
1534
1301
class cmd_info(Command):
1535
__doc__ = """Show information about a working tree, branch or repository.
1302
"""Show information about a working tree, branch or repository.
1537
1304
This command will show all known locations and formats associated to the
1538
1305
tree, branch or repository.
1590
1356
RegistryOption.from_kwargs('file-deletion-strategy',
1591
1357
'The file deletion mode to be used.',
1592
1358
title='Deletion Strategy', value_switches=True, enum_switch=False,
1593
safe='Backup changed files (default).',
1594
keep='Delete from bzr but leave the working copy.',
1595
no_backup='Don\'t backup changed files.',
1359
safe='Only delete files if they can be'
1360
' safely recovered (default).',
1361
keep="Don't delete any files.",
1596
1362
force='Delete all the specified files, even if they can not be '
1597
'recovered and even if they are non-empty directories. '
1598
'(deprecated, use no-backup)')]
1363
'recovered and even if they are non-empty directories.')]
1599
1364
aliases = ['rm', 'del']
1600
1365
encoding_type = 'replace'
1602
1367
def run(self, file_list, verbose=False, new=False,
1603
1368
file_deletion_strategy='safe'):
1604
if file_deletion_strategy == 'force':
1605
note("(The --force option is deprecated, rather use --no-backup "
1607
file_deletion_strategy = 'no-backup'
1609
tree, file_list = WorkingTree.open_containing_paths(file_list)
1369
tree, file_list = tree_files(file_list)
1611
1371
if file_list is not None:
1612
1372
file_list = [f for f in file_list]
1614
self.add_cleanup(tree.lock_write().unlock)
1615
# Heuristics should probably all move into tree.remove_smart or
1618
added = tree.changes_from(tree.basis_tree(),
1619
specific_files=file_list).added
1620
file_list = sorted([f[0] for f in added], reverse=True)
1621
if len(file_list) == 0:
1622
raise errors.BzrCommandError('No matching files.')
1623
elif file_list is None:
1624
# missing files show up in iter_changes(basis) as
1625
# versioned-with-no-kind.
1627
for change in tree.iter_changes(tree.basis_tree()):
1628
# Find paths in the working tree that have no kind:
1629
if change[1][1] is not None and change[6][1] is None:
1630
missing.append(change[1][1])
1631
file_list = sorted(missing, reverse=True)
1632
file_deletion_strategy = 'keep'
1633
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1634
keep_files=file_deletion_strategy=='keep',
1635
force=(file_deletion_strategy=='no-backup'))
1376
# Heuristics should probably all move into tree.remove_smart or
1379
added = tree.changes_from(tree.basis_tree(),
1380
specific_files=file_list).added
1381
file_list = sorted([f[0] for f in added], reverse=True)
1382
if len(file_list) == 0:
1383
raise errors.BzrCommandError('No matching files.')
1384
elif file_list is None:
1385
# missing files show up in iter_changes(basis) as
1386
# versioned-with-no-kind.
1388
for change in tree.iter_changes(tree.basis_tree()):
1389
# Find paths in the working tree that have no kind:
1390
if change[1][1] is not None and change[6][1] is None:
1391
missing.append(change[1][1])
1392
file_list = sorted(missing, reverse=True)
1393
file_deletion_strategy = 'keep'
1394
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1395
keep_files=file_deletion_strategy=='keep',
1396
force=file_deletion_strategy=='force')
1638
1401
class cmd_file_id(Command):
1639
__doc__ = """Print file_id of a particular file or directory.
1402
"""Print file_id of a particular file or directory.
1641
1404
The file_id is assigned when the file is first added and remains the
1642
1405
same through all revisions where the file exists, even when it is
2077
1780
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2078
1781
' one or two revision specifiers')
2080
if using is not None and format is not None:
2081
raise errors.BzrCommandError('--using and --format are mutually '
2084
(old_tree, new_tree,
2085
old_branch, new_branch,
2086
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2087
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2088
# GNU diff on Windows uses ANSI encoding for filenames
2089
path_encoding = osutils.get_diff_header_encoding()
1783
old_tree, new_tree, specific_files, extra_trees = \
1784
_get_trees_to_diff(file_list, revision, old, new,
2090
1786
return show_diff_trees(old_tree, new_tree, sys.stdout,
2091
1787
specific_files=specific_files,
2092
1788
external_diff_options=diff_options,
2093
1789
old_label=old_label, new_label=new_label,
2094
extra_trees=extra_trees,
2095
path_encoding=path_encoding,
1790
extra_trees=extra_trees, using=using)
2100
1793
class cmd_deleted(Command):
2101
__doc__ = """List files deleted in the working tree.
1794
"""List files deleted in the working tree.
2103
1796
# TODO: Show files deleted since a previous revision, or
2104
1797
# between two revisions.
2107
1800
# level of effort but possibly much less IO. (Or possibly not,
2108
1801
# if the directories are very large...)
2109
1802
_see_also = ['status', 'ls']
2110
takes_options = ['directory', 'show-ids']
1803
takes_options = ['show-ids']
2112
1805
@display_command
2113
def run(self, show_ids=False, directory=u'.'):
2114
tree = WorkingTree.open_containing(directory)[0]
2115
self.add_cleanup(tree.lock_read().unlock)
2116
old = tree.basis_tree()
2117
self.add_cleanup(old.lock_read().unlock)
2118
for path, ie in old.inventory.iter_entries():
2119
if not tree.has_id(ie.file_id):
2120
self.outf.write(path)
2122
self.outf.write(' ')
2123
self.outf.write(ie.file_id)
2124
self.outf.write('\n')
1806
def run(self, show_ids=False):
1807
tree = WorkingTree.open_containing(u'.')[0]
1810
old = tree.basis_tree()
1813
for path, ie in old.inventory.iter_entries():
1814
if not tree.has_id(ie.file_id):
1815
self.outf.write(path)
1817
self.outf.write(' ')
1818
self.outf.write(ie.file_id)
1819
self.outf.write('\n')
2127
1826
class cmd_modified(Command):
2128
__doc__ = """List files modified in working tree.
1827
"""List files modified in working tree.
2132
1831
_see_also = ['status', 'ls']
2133
takes_options = ['directory', 'null']
1834
help='Write an ascii NUL (\\0) separator '
1835
'between files rather than a newline.')
2135
1838
@display_command
2136
def run(self, null=False, directory=u'.'):
2137
tree = WorkingTree.open_containing(directory)[0]
2138
self.add_cleanup(tree.lock_read().unlock)
1839
def run(self, null=False):
1840
tree = WorkingTree.open_containing(u'.')[0]
2139
1841
td = tree.changes_from(tree.basis_tree())
2141
1842
for path, id, kind, text_modified, meta_modified in td.modified:
2143
1844
self.outf.write(path + '\0')
2148
1849
class cmd_added(Command):
2149
__doc__ = """List files added in working tree.
1850
"""List files added in working tree.
2153
1854
_see_also = ['status', 'ls']
2154
takes_options = ['directory', 'null']
1857
help='Write an ascii NUL (\\0) separator '
1858
'between files rather than a newline.')
2156
1861
@display_command
2157
def run(self, null=False, directory=u'.'):
2158
wt = WorkingTree.open_containing(directory)[0]
2159
self.add_cleanup(wt.lock_read().unlock)
2160
basis = wt.basis_tree()
2161
self.add_cleanup(basis.lock_read().unlock)
2162
basis_inv = basis.inventory
2165
if basis_inv.has_id(file_id):
2167
if inv.is_root(file_id) and len(basis_inv) == 0:
2169
path = inv.id2path(file_id)
2170
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2173
self.outf.write(path + '\0')
2175
self.outf.write(osutils.quotefn(path) + '\n')
1862
def run(self, null=False):
1863
wt = WorkingTree.open_containing(u'.')[0]
1866
basis = wt.basis_tree()
1869
basis_inv = basis.inventory
1872
if file_id in basis_inv:
1874
if inv.is_root(file_id) and len(basis_inv) == 0:
1876
path = inv.id2path(file_id)
1877
if not os.access(osutils.abspath(path), os.F_OK):
1880
self.outf.write(path + '\0')
1882
self.outf.write(osutils.quotefn(path) + '\n')
2178
1889
class cmd_root(Command):
2179
__doc__ = """Show the tree root directory.
1890
"""Show the tree root directory.
2181
1892
The root is the nearest enclosing directory with a .bzr control
2532
2181
diff_type = 'full'
2534
# Build the log formatter
2535
if log_format is None:
2536
log_format = log.log_formatter_registry.get_default(b)
2537
# Make a non-encoding output to include the diffs - bug 328007
2538
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2539
lf = log_format(show_ids=show_ids, to_file=self.outf,
2540
to_exact_file=unencoded_output,
2541
show_timezone=timezone,
2542
delta_format=get_verbosity_level(),
2544
show_advice=levels is None,
2545
author_list_handler=authors)
2547
# Choose the algorithm for doing the logging. It's annoying
2548
# having multiple code paths like this but necessary until
2549
# the underlying repository format is faster at generating
2550
# deltas or can provide everything we need from the indices.
2551
# The default algorithm - match-using-deltas - works for
2552
# multiple files and directories and is faster for small
2553
# amounts of history (200 revisions say). However, it's too
2554
# slow for logging a single file in a repository with deep
2555
# history, i.e. > 10K revisions. In the spirit of "do no
2556
# evil when adding features", we continue to use the
2557
# original algorithm - per-file-graph - for the "single
2558
# file that isn't a directory without showing a delta" case.
2559
partial_history = revision and b.repository._format.supports_chks
2560
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2561
or delta_type or partial_history)
2565
match_dict[''] = match
2567
match_dict['message'] = match_message
2569
match_dict['committer'] = match_committer
2571
match_dict['author'] = match_author
2573
match_dict['bugs'] = match_bugs
2575
# Build the LogRequest and execute it
2576
if len(file_ids) == 0:
2578
rqst = make_log_request_dict(
2579
direction=direction, specific_fileids=file_ids,
2580
start_revision=rev1, end_revision=rev2, limit=limit,
2581
message_search=message, delta_type=delta_type,
2582
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2583
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2584
signature=signatures
2586
Logger(b, rqst).show(lf)
2185
# Build the log formatter
2186
if log_format is None:
2187
log_format = log.log_formatter_registry.get_default(b)
2188
lf = log_format(show_ids=show_ids, to_file=self.outf,
2189
show_timezone=timezone,
2190
delta_format=get_verbosity_level(),
2193
# Choose the algorithm for doing the logging. It's annoying
2194
# having multiple code paths like this but necessary until
2195
# the underlying repository format is faster at generating
2196
# deltas or can provide everything we need from the indices.
2197
# The default algorithm - match-using-deltas - works for
2198
# multiple files and directories and is faster for small
2199
# amounts of history (200 revisions say). However, it's too
2200
# slow for logging a single file in a repository with deep
2201
# history, i.e. > 10K revisions. In the spirit of "do no
2202
# evil when adding features", we continue to use the
2203
# original algorithm - per-file-graph - for the "single
2204
# file that isn't a directory without showing a delta" case.
2205
partial_history = revision and b.repository._format.supports_chks
2206
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2207
or delta_type or partial_history)
2209
# Build the LogRequest and execute it
2210
if len(file_ids) == 0:
2212
rqst = make_log_request_dict(
2213
direction=direction, specific_fileids=file_ids,
2214
start_revision=rev1, end_revision=rev2, limit=limit,
2215
message_search=message, delta_type=delta_type,
2216
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2217
Logger(b, rqst).show(lf)
2589
2222
def _get_revision_range(revisionspec_list, branch, command_name):
2678
2305
help='Recurse into subdirectories.'),
2679
2306
Option('from-root',
2680
2307
help='Print paths relative to the root of the branch.'),
2681
Option('unknown', short_name='u',
2682
help='Print unknown files.'),
2308
Option('unknown', help='Print unknown files.'),
2683
2309
Option('versioned', help='Print versioned files.',
2684
2310
short_name='V'),
2685
Option('ignored', short_name='i',
2686
help='Print ignored files.'),
2687
Option('kind', short_name='k',
2311
Option('ignored', help='Print ignored files.'),
2313
help='Write an ascii NUL (\\0) separator '
2314
'between files rather than a newline.'),
2688
2316
help='List entries of a particular kind: file, directory, symlink.',
2694
2320
@display_command
2695
2321
def run(self, revision=None, verbose=False,
2696
2322
recursive=False, from_root=False,
2697
2323
unknown=False, versioned=False, ignored=False,
2698
null=False, kind=None, show_ids=False, path=None, directory=None):
2324
null=False, kind=None, show_ids=False, path=None):
2700
2326
if kind and kind not in ('file', 'directory', 'symlink'):
2701
2327
raise errors.BzrCommandError('invalid kind specified')
2735
2358
view_str = views.view_display_str(view_files)
2736
2359
note("Ignoring files outside view. View is %s" % view_str)
2738
self.add_cleanup(tree.lock_read().unlock)
2739
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2740
from_dir=relpath, recursive=recursive):
2741
# Apply additional masking
2742
if not all and not selection[fc]:
2744
if kind is not None and fkind != kind:
2749
fullpath = osutils.pathjoin(relpath, fp)
2752
views.check_path_in_view(tree, fullpath)
2753
except errors.FileOutsideView:
2758
fp = osutils.pathjoin(prefix, fp)
2759
kindch = entry.kind_character()
2760
outstring = fp + kindch
2761
ui.ui_factory.clear_term()
2763
outstring = '%-8s %s' % (fc, outstring)
2764
if show_ids and fid is not None:
2765
outstring = "%-50s %s" % (outstring, fid)
2766
self.outf.write(outstring + '\n')
2768
self.outf.write(fp + '\0')
2771
self.outf.write(fid)
2772
self.outf.write('\0')
2780
self.outf.write('%-50s %s\n' % (outstring, my_id))
2782
self.outf.write(outstring + '\n')
2363
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2364
if fp.startswith(relpath):
2365
rp = fp[len(relpath):]
2366
fp = osutils.pathjoin(prefix, rp)
2367
if not recursive and '/' in rp:
2369
if not all and not selection[fc]:
2371
if kind is not None and fkind != kind:
2375
views.check_path_in_view(tree, fp)
2376
except errors.FileOutsideView:
2378
kindch = entry.kind_character()
2379
outstring = fp + kindch
2381
outstring = '%-8s %s' % (fc, outstring)
2382
if show_ids and fid is not None:
2383
outstring = "%-50s %s" % (outstring, fid)
2384
self.outf.write(outstring + '\n')
2386
self.outf.write(fp + '\0')
2389
self.outf.write(fid)
2390
self.outf.write('\0')
2398
self.outf.write('%-50s %s\n' % (outstring, my_id))
2400
self.outf.write(outstring + '\n')
2785
2405
class cmd_unknowns(Command):
2786
__doc__ = """List unknown files.
2406
"""List unknown files.
2790
2410
_see_also = ['ls']
2791
takes_options = ['directory']
2793
2412
@display_command
2794
def run(self, directory=u'.'):
2795
for f in WorkingTree.open_containing(directory)[0].unknowns():
2414
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2796
2415
self.outf.write(osutils.quotefn(f) + '\n')
2799
2418
class cmd_ignore(Command):
2800
__doc__ = """Ignore specified files or patterns.
2419
"""Ignore specified files or patterns.
2802
2421
See ``bzr help patterns`` for details on the syntax of patterns.
2804
If a .bzrignore file does not exist, the ignore command
2805
will create one and add the specified files or patterns to the newly
2806
created file. The ignore command will also automatically add the
2807
.bzrignore file to be versioned. Creating a .bzrignore file without
2808
the use of the ignore command will require an explicit add command.
2810
2423
To remove patterns from the ignore list, edit the .bzrignore file.
2811
2424
After adding, editing or deleting that file either indirectly by
2812
2425
using this command or directly by using an editor, be sure to commit
2815
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2816
the global ignore file can be found in the application data directory as
2817
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2818
Global ignores are not touched by this command. The global ignore file
2819
can be edited directly using an editor.
2821
Patterns prefixed with '!' are exceptions to ignore patterns and take
2822
precedence over regular ignores. Such exceptions are used to specify
2823
files that should be versioned which would otherwise be ignored.
2825
Patterns prefixed with '!!' act as regular ignore patterns, but have
2826
precedence over the '!' exception patterns.
2830
* Ignore patterns containing shell wildcards must be quoted from
2833
* Ignore patterns starting with "#" act as comments in the ignore file.
2834
To ignore patterns that begin with that character, use the "RE:" prefix.
2428
Note: ignore patterns containing shell wildcards must be quoted from
2837
2432
Ignore the top level Makefile::
2839
2434
bzr ignore ./Makefile
2841
Ignore .class files in all directories...::
2436
Ignore class files in all directories::
2843
2438
bzr ignore "*.class"
2845
...but do not ignore "special.class"::
2847
bzr ignore "!special.class"
2849
Ignore files whose name begins with the "#" character::
2853
2440
Ignore .o files under the lib directory::
2855
2442
bzr ignore "lib/**/*.o"
2861
2448
Ignore everything but the "debian" toplevel directory::
2863
2450
bzr ignore "RE:(?!debian/).*"
2865
Ignore everything except the "local" toplevel directory,
2866
but always ignore autosave files ending in ~, even under local/::
2869
bzr ignore "!./local"
2873
2453
_see_also = ['status', 'ignored', 'patterns']
2874
2454
takes_args = ['name_pattern*']
2875
takes_options = ['directory',
2876
Option('default-rules',
2877
help='Display the default ignore rules that bzr uses.')
2456
Option('old-default-rules',
2457
help='Write out the ignore rules bzr < 0.9 always used.')
2880
def run(self, name_pattern_list=None, default_rules=None,
2460
def run(self, name_pattern_list=None, old_default_rules=None):
2882
2461
from bzrlib import ignores
2883
if default_rules is not None:
2884
# dump the default rules and exit
2885
for pattern in ignores.USER_DEFAULTS:
2886
self.outf.write("%s\n" % pattern)
2462
if old_default_rules is not None:
2463
# dump the rules and exit
2464
for pattern in ignores.OLD_DEFAULTS:
2888
2467
if not name_pattern_list:
2889
2468
raise errors.BzrCommandError("ignore requires at least one "
2890
"NAME_PATTERN or --default-rules.")
2469
"NAME_PATTERN or --old-default-rules")
2891
2470
name_pattern_list = [globbing.normalize_pattern(p)
2892
2471
for p in name_pattern_list]
2894
for p in name_pattern_list:
2895
if not globbing.Globster.is_pattern_valid(p):
2896
bad_patterns += ('\n %s' % p)
2898
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2899
ui.ui_factory.show_error(msg)
2900
raise errors.InvalidPattern('')
2901
2472
for name_pattern in name_pattern_list:
2902
2473
if (name_pattern[0] == '/' or
2903
2474
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2904
2475
raise errors.BzrCommandError(
2905
2476
"NAME_PATTERN should not be an absolute path")
2906
tree, relpath = WorkingTree.open_containing(directory)
2477
tree, relpath = WorkingTree.open_containing(u'.')
2907
2478
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2908
2479
ignored = globbing.Globster(name_pattern_list)
2910
self.add_cleanup(tree.lock_read().unlock)
2911
2482
for entry in tree.list_files():
2913
2484
if id is not None:
2914
2485
filename = entry[0]
2915
2486
if ignored.match(filename):
2916
matches.append(filename)
2487
matches.append(filename.encode('utf-8'))
2917
2489
if len(matches) > 0:
2918
self.outf.write("Warning: the following files are version controlled and"
2919
" match your ignore pattern:\n%s"
2920
"\nThese files will continue to be version controlled"
2921
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2490
print "Warning: the following files are version controlled and" \
2491
" match your ignore pattern:\n%s" \
2492
"\nThese files will continue to be version controlled" \
2493
" unless you 'bzr remove' them." % ("\n".join(matches),)
2924
2496
class cmd_ignored(Command):
2925
__doc__ = """List ignored files and the patterns that matched them.
2497
"""List ignored files and the patterns that matched them.
2927
2499
List all the ignored files and the ignore pattern that caused the file to
2935
2507
encoding_type = 'replace'
2936
2508
_see_also = ['ignore', 'ls']
2937
takes_options = ['directory']
2939
2510
@display_command
2940
def run(self, directory=u'.'):
2941
tree = WorkingTree.open_containing(directory)[0]
2942
self.add_cleanup(tree.lock_read().unlock)
2943
for path, file_class, kind, file_id, entry in tree.list_files():
2944
if file_class != 'I':
2946
## XXX: Slightly inefficient since this was already calculated
2947
pat = tree.is_ignored(path)
2948
self.outf.write('%-50s %s\n' % (path, pat))
2512
tree = WorkingTree.open_containing(u'.')[0]
2515
for path, file_class, kind, file_id, entry in tree.list_files():
2516
if file_class != 'I':
2518
## XXX: Slightly inefficient since this was already calculated
2519
pat = tree.is_ignored(path)
2520
self.outf.write('%-50s %s\n' % (path, pat))
2951
2525
class cmd_lookup_revision(Command):
2952
__doc__ = """Lookup the revision-id from a revision-number
2526
"""Lookup the revision-id from a revision-number
2955
2529
bzr lookup-revision 33
2958
2532
takes_args = ['revno']
2959
takes_options = ['directory']
2961
2534
@display_command
2962
def run(self, revno, directory=u'.'):
2535
def run(self, revno):
2964
2537
revno = int(revno)
2965
2538
except ValueError:
2966
raise errors.BzrCommandError("not a valid revision-number: %r"
2968
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2969
self.outf.write("%s\n" % revid)
2539
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2541
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2972
2544
class cmd_export(Command):
2973
__doc__ = """Export current or past revision to a destination directory or archive.
2545
"""Export current or past revision to a destination directory or archive.
2975
2547
If no revision is specified this exports the last committed revision.
3055
2622
@display_command
3056
2623
def run(self, filename, revision=None, name_from_revision=False,
3057
filters=False, directory=None):
3058
2625
if revision is not None and len(revision) != 1:
3059
2626
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3060
2627
" one revision specifier")
3061
2628
tree, branch, relpath = \
3062
_open_directory_or_containing_tree_or_branch(filename, directory)
3063
self.add_cleanup(branch.lock_read().unlock)
3064
return self._run(tree, branch, relpath, filename, revision,
3065
name_from_revision, filters)
2629
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2632
return self._run(tree, branch, relpath, filename, revision,
2633
name_from_revision, filters)
3067
2637
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3069
2639
if tree is None:
3070
2640
tree = b.basis_tree()
3071
2641
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3072
self.add_cleanup(rev_tree.lock_read().unlock)
3074
2643
old_file_id = rev_tree.path2id(relpath)
3076
# TODO: Split out this code to something that generically finds the
3077
# best id for a path across one or more trees; it's like
3078
# find_ids_across_trees but restricted to find just one. -- mbp
3080
2645
if name_from_revision:
3081
2646
# Try in revision if requested
3082
2647
if old_file_id is None:
3084
2649
"%r is not present in revision %s" % (
3085
2650
filename, rev_tree.get_revision_id()))
3087
actual_file_id = old_file_id
2652
content = rev_tree.get_file_text(old_file_id)
3089
2654
cur_file_id = tree.path2id(relpath)
3090
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3091
actual_file_id = cur_file_id
3092
elif old_file_id is not None:
3093
actual_file_id = old_file_id
2656
if cur_file_id is not None:
2657
# Then try with the actual file id
2659
content = rev_tree.get_file_text(cur_file_id)
2661
except errors.NoSuchId:
2662
# The actual file id didn't exist at that time
2664
if not found and old_file_id is not None:
2665
# Finally try with the old file id
2666
content = rev_tree.get_file_text(old_file_id)
2669
# Can't be found anywhere
3095
2670
raise errors.BzrCommandError(
3096
2671
"%r is not present in revision %s" % (
3097
2672
filename, rev_tree.get_revision_id()))
3099
from bzrlib.filter_tree import ContentFilterTree
3100
filter_tree = ContentFilterTree(rev_tree,
3101
rev_tree._content_filter_stack)
3102
content = filter_tree.get_file_text(actual_file_id)
2674
from bzrlib.filters import (
2675
ContentFilterContext,
2676
filtered_output_bytes,
2678
filters = rev_tree._content_filter_stack(relpath)
2679
chunks = content.splitlines(True)
2680
content = filtered_output_bytes(chunks, filters,
2681
ContentFilterContext(relpath, rev_tree))
2682
self.outf.writelines(content)
3104
content = rev_tree.get_file_text(actual_file_id)
3106
self.outf.write(content)
2684
self.outf.write(content)
3109
2687
class cmd_local_time_offset(Command):
3110
__doc__ = """Show the offset in seconds from GMT to local time."""
2688
"""Show the offset in seconds from GMT to local time."""
3112
2690
@display_command
3114
self.outf.write("%s\n" % osutils.local_time_offset())
2692
print osutils.local_time_offset()
3118
2696
class cmd_commit(Command):
3119
__doc__ = """Commit changes into a new revision.
3121
An explanatory message needs to be given for each commit. This is
3122
often done by using the --message option (getting the message from the
3123
command line) or by using the --file option (getting the message from
3124
a file). If neither of these options is given, an editor is opened for
3125
the user to enter the message. To see the changed files in the
3126
boilerplate text loaded into the editor, use the --show-diff option.
3128
By default, the entire tree is committed and the person doing the
3129
commit is assumed to be the author. These defaults can be overridden
3134
If selected files are specified, only changes to those files are
3135
committed. If a directory is specified then the directory and
3136
everything within it is committed.
3138
When excludes are given, they take precedence over selected files.
3139
For example, to commit only changes within foo, but not changes
3142
bzr commit foo -x foo/bar
3144
A selective commit after a merge is not yet supported.
3148
If the author of the change is not the same person as the committer,
3149
you can specify the author's name using the --author option. The
3150
name should be in the same format as a committer-id, e.g.
3151
"John Doe <jdoe@example.com>". If there is more than one author of
3152
the change you can specify the option multiple times, once for each
3157
A common mistake is to forget to add a new file or directory before
3158
running the commit command. The --strict option checks for unknown
3159
files and aborts the commit if any are found. More advanced pre-commit
3160
checks can be implemented by defining hooks. See ``bzr help hooks``
3165
If you accidentially commit the wrong changes or make a spelling
3166
mistake in the commit message say, you can use the uncommit command
3167
to undo it. See ``bzr help uncommit`` for details.
3169
Hooks can also be configured to run after a commit. This allows you
3170
to trigger updates to external systems like bug trackers. The --fixes
3171
option can be used to record the association between a revision and
3172
one or more bugs. See ``bzr help bugs`` for details.
2697
"""Commit changes into a new revision.
2699
If no arguments are given, the entire tree is committed.
2701
If selected files are specified, only changes to those files are
2702
committed. If a directory is specified then the directory and everything
2703
within it is committed.
2705
When excludes are given, they take precedence over selected files.
2706
For example, too commit only changes within foo, but not changes within
2709
bzr commit foo -x foo/bar
2711
If author of the change is not the same person as the committer, you can
2712
specify the author's name using the --author option. The name should be
2713
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2714
If there is more than one author of the change you can specify the option
2715
multiple times, once for each author.
2717
A selected-file commit may fail in some cases where the committed
2718
tree would be invalid. Consider::
2723
bzr commit foo -m "committing foo"
2724
bzr mv foo/bar foo/baz
2727
bzr commit foo/bar -m "committing bar but not baz"
2729
In the example above, the last commit will fail by design. This gives
2730
the user the opportunity to decide whether they want to commit the
2731
rename at the same time, separately first, or not at all. (As a general
2732
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2734
Note: A selected-file commit after a merge is not yet supported.
3175
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
2736
# TODO: Run hooks on tree to-be-committed, and after commit.
2738
# TODO: Strict commit that fails if there are deleted files.
2739
# (what does "deleted files" mean ??)
2741
# TODO: Give better message for -s, --summary, used by tla people
2743
# XXX: verbose currently does nothing
2745
_see_also = ['bugs', 'uncommit']
3176
2746
takes_args = ['selected*']
3177
2747
takes_options = [
3178
2748
ListOption('exclude', type=str, short_name='x',
3277
2836
if local and not tree.branch.get_bound_location():
3278
2837
raise errors.LocalRequiresBoundBranch()
3280
if message is not None:
3282
file_exists = osutils.lexists(message)
3283
except UnicodeError:
3284
# The commit message contains unicode characters that can't be
3285
# represented in the filesystem encoding, so that can't be a
3290
'The commit message is a file name: "%(f)s".\n'
3291
'(use --file "%(f)s" to take commit message from that file)'
3293
ui.ui_factory.show_warning(warning_msg)
3295
message = message.replace('\r\n', '\n')
3296
message = message.replace('\r', '\n')
3298
raise errors.BzrCommandError(
3299
"please specify either --message or --file")
3301
2839
def get_message(commit_obj):
3302
2840
"""Callback to get commit message"""
3306
my_message = f.read().decode(osutils.get_user_encoding())
3309
elif message is not None:
3310
my_message = message
3312
# No message supplied: make one up.
3313
# text is the status of the tree
3314
text = make_commit_message_template_encoded(tree,
2841
my_message = message
2842
if my_message is None and not file:
2843
t = make_commit_message_template_encoded(tree,
3315
2844
selected_list, diff=show_diff,
3316
2845
output_encoding=osutils.get_user_encoding())
3317
# start_message is the template generated from hooks
3318
# XXX: Warning - looks like hooks return unicode,
3319
# make_commit_message_template_encoded returns user encoding.
3320
# We probably want to be using edit_commit_message instead to
3322
my_message = set_commit_message(commit_obj)
3323
if my_message is None:
3324
start_message = generate_commit_message_template(commit_obj)
3325
my_message = edit_commit_message_encoded(text,
3326
start_message=start_message)
2846
start_message = generate_commit_message_template(commit_obj)
2847
my_message = edit_commit_message_encoded(t,
2848
start_message=start_message)
3327
2849
if my_message is None:
3328
2850
raise errors.BzrCommandError("please specify a commit"
3329
2851
" message with either --message or --file")
2852
elif my_message and file:
2853
raise errors.BzrCommandError(
2854
"please specify either --message or --file")
2856
my_message = codecs.open(file, 'rt',
2857
osutils.get_user_encoding()).read()
3330
2858
if my_message == "":
3331
raise errors.BzrCommandError("Empty commit message specified."
3332
" Please specify a commit message with either"
3333
" --message or --file or leave a blank message"
3334
" with --message \"\".")
2859
raise errors.BzrCommandError("empty commit message specified")
3335
2860
return my_message
3337
# The API permits a commit with a filter of [] to mean 'select nothing'
3338
# but the command line should not do that.
3339
if not selected_list:
3340
selected_list = None
3342
2863
tree.commit(message_callback=get_message,
3343
2864
specific_files=selected_list,
3344
2865
allow_pointless=unchanged, strict=strict, local=local,
3345
2866
reporter=None, verbose=verbose, revprops=properties,
3346
authors=author, timestamp=commit_stamp,
3348
exclude=tree.safe_relpath_files(exclude),
2868
exclude=safe_relpath_files(tree, exclude))
3350
2869
except PointlessCommit:
3351
raise errors.BzrCommandError("No changes to commit."
3352
" Please 'bzr add' the files you want to commit, or use"
3353
" --unchanged to force an empty commit.")
2870
# FIXME: This should really happen before the file is read in;
2871
# perhaps prepare the commit; get the message; then actually commit
2872
raise errors.BzrCommandError("no changes to commit."
2873
" use --unchanged to commit anyhow")
3354
2874
except ConflictsInTree:
3355
2875
raise errors.BzrCommandError('Conflicts detected in working '
3356
2876
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3375
2894
The working tree and branch checks will only give output if a problem is
3376
2895
detected. The output fields of the repository check are:
3379
This is just the number of revisions checked. It doesn't
3383
This is just the number of versionedfiles checked. It
3384
doesn't indicate a problem.
3386
unreferenced ancestors
3387
Texts that are ancestors of other texts, but
3388
are not properly referenced by the revision ancestry. This is a
3389
subtle problem that Bazaar can work around.
3392
This is the total number of unique file contents
3393
seen in the checked revisions. It does not indicate a problem.
3396
This is the total number of repeated texts seen
3397
in the checked revisions. Texts can be repeated when their file
3398
entries are modified, but the file contents are not. It does not
2897
revisions: This is just the number of revisions checked. It doesn't
2899
versionedfiles: This is just the number of versionedfiles checked. It
2900
doesn't indicate a problem.
2901
unreferenced ancestors: Texts that are ancestors of other texts, but
2902
are not properly referenced by the revision ancestry. This is a
2903
subtle problem that Bazaar can work around.
2904
unique file texts: This is the total number of unique file contents
2905
seen in the checked revisions. It does not indicate a problem.
2906
repeated file texts: This is the total number of repeated texts seen
2907
in the checked revisions. Texts can be repeated when their file
2908
entries are modified, but the file contents are not. It does not
3401
2911
If no restrictions are specified, all Bazaar data that is found at the given
3402
2912
location will be checked.
3439
2949
class cmd_upgrade(Command):
3440
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3442
When the default format has changed after a major new release of
3443
Bazaar, you may be informed during certain operations that you
3444
should upgrade. Upgrading to a newer format may improve performance
3445
or make new features available. It may however limit interoperability
3446
with older repositories or with older versions of Bazaar.
3448
If you wish to upgrade to a particular format rather than the
3449
current default, that can be specified using the --format option.
3450
As a consequence, you can use the upgrade command this way to
3451
"downgrade" to an earlier format, though some conversions are
3452
a one way process (e.g. changing from the 1.x default to the
3453
2.x default) so downgrading is not always possible.
3455
A backup.bzr.~#~ directory is created at the start of the conversion
3456
process (where # is a number). By default, this is left there on
3457
completion. If the conversion fails, delete the new .bzr directory
3458
and rename this one back in its place. Use the --clean option to ask
3459
for the backup.bzr directory to be removed on successful conversion.
3460
Alternatively, you can delete it by hand if everything looks good
3463
If the location given is a shared repository, dependent branches
3464
are also converted provided the repository converts successfully.
3465
If the conversion of a branch fails, remaining branches are still
3468
For more information on upgrades, see the Bazaar Upgrade Guide,
3469
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
2950
"""Upgrade branch storage to current format.
2952
The check command or bzr developers may sometimes advise you to run
2953
this command. When the default format has changed you may also be warned
2954
during other operations to upgrade.
3472
_see_also = ['check', 'reconcile', 'formats']
2957
_see_also = ['check']
3473
2958
takes_args = ['url?']
3474
2959
takes_options = [
3475
RegistryOption('format',
3476
help='Upgrade to a specific format. See "bzr help'
3477
' formats" for details.',
3478
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3479
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3480
value_switches=True, title='Branch format'),
3482
help='Remove the backup.bzr directory if successful.'),
3484
help="Show what would be done, but don't actually do anything."),
2960
RegistryOption('format',
2961
help='Upgrade to a specific format. See "bzr help'
2962
' formats" for details.',
2963
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
2964
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
2965
value_switches=True, title='Branch format'),
3487
def run(self, url='.', format=None, clean=False, dry_run=False):
2968
def run(self, url='.', format=None):
3488
2969
from bzrlib.upgrade import upgrade
3489
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3491
if len(exceptions) == 1:
3492
# Compatibility with historical behavior
2970
upgrade(url, format)
3498
2973
class cmd_whoami(Command):
3499
__doc__ = """Show or set bzr user id.
2974
"""Show or set bzr user id.
3502
2977
Show the email of the current user::
3518
2992
encoding_type = 'replace'
3520
2994
@display_command
3521
def run(self, email=False, branch=False, name=None, directory=None):
2995
def run(self, email=False, branch=False, name=None):
3522
2996
if name is None:
3523
if directory is None:
3524
# use branch if we're inside one; otherwise global config
3526
c = Branch.open_containing(u'.')[0].get_config()
3527
except errors.NotBranchError:
3528
c = _mod_config.GlobalConfig()
3530
c = Branch.open(directory).get_config()
2997
# use branch if we're inside one; otherwise global config
2999
c = Branch.open_containing('.')[0].get_config()
3000
except errors.NotBranchError:
3001
c = config.GlobalConfig()
3532
3003
self.outf.write(c.user_email() + '\n')
3534
3005
self.outf.write(c.username() + '\n')
3538
raise errors.BzrCommandError("--email can only be used to display existing "
3541
3008
# display a warning if an email address isn't included in the given name.
3543
_mod_config.extract_email_address(name)
3010
config.extract_email_address(name)
3544
3011
except errors.NoEmailInUsername, e:
3545
3012
warning('"%s" does not seem to contain an email address. '
3546
3013
'This is allowed, but not recommended.', name)
3548
3015
# use global config unless --branch given
3550
if directory is None:
3551
c = Branch.open_containing(u'.')[0].get_config()
3553
c = Branch.open(directory).get_config()
3017
c = Branch.open_containing('.')[0].get_config()
3555
c = _mod_config.GlobalConfig()
3019
c = config.GlobalConfig()
3556
3020
c.set_user_option('email', name)
3559
3023
class cmd_nick(Command):
3560
__doc__ = """Print or set the branch nickname.
3024
"""Print or set the branch nickname.
3562
3026
If unset, the tree root directory name is used as the nickname.
3563
3027
To print the current nickname, execute with no argument.
3793
3257
raise errors.BzrCommandError("subunit not available. subunit "
3794
3258
"needs to be installed to use --subunit.")
3795
3259
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3796
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3797
# stdout, which would corrupt the subunit stream.
3798
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3799
# following code can be deleted when it's sufficiently deployed
3800
# -- vila/mgz 20100514
3801
if (sys.platform == "win32"
3802
and getattr(sys.stdout, 'fileno', None) is not None):
3804
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3806
3261
self.additional_selftest_args.setdefault(
3807
3262
'suite_decorators', []).append(parallel)
3809
raise errors.BzrCommandError(
3810
"--benchmark is no longer supported from bzr 2.2; "
3811
"use bzr-usertest instead")
3812
test_suite_factory = None
3814
exclude_pattern = None
3264
test_suite_factory = benchmarks.test_suite
3265
# Unless user explicitly asks for quiet, be verbose in benchmarks
3266
verbose = not is_quiet()
3267
# TODO: should possibly lock the history file...
3268
benchfile = open(".perf_history", "at", buffering=1)
3816
exclude_pattern = '(' + '|'.join(exclude) + ')'
3817
selftest_kwargs = {"verbose": verbose,
3819
"stop_on_failure": one,
3820
"transport": transport,
3821
"test_suite_factory": test_suite_factory,
3822
"lsprof_timed": lsprof_timed,
3823
"lsprof_tests": lsprof_tests,
3824
"matching_tests_first": first,
3825
"list_only": list_only,
3826
"random_seed": randomize,
3827
"exclude_pattern": exclude_pattern,
3829
"load_list": load_list,
3830
"debug_flags": debugflag,
3831
"starting_with": starting_with
3833
selftest_kwargs.update(self.additional_selftest_args)
3835
# Make deprecation warnings visible, unless -Werror is set
3836
cleanup = symbol_versioning.activate_deprecation_warnings(
3270
test_suite_factory = None
3839
result = tests.selftest(**selftest_kwargs)
3273
selftest_kwargs = {"verbose": verbose,
3275
"stop_on_failure": one,
3276
"transport": transport,
3277
"test_suite_factory": test_suite_factory,
3278
"lsprof_timed": lsprof_timed,
3279
"bench_history": benchfile,
3280
"matching_tests_first": first,
3281
"list_only": list_only,
3282
"random_seed": randomize,
3283
"exclude_pattern": exclude,
3285
"load_list": load_list,
3286
"debug_flags": debugflag,
3287
"starting_with": starting_with
3289
selftest_kwargs.update(self.additional_selftest_args)
3290
result = selftest(**selftest_kwargs)
3292
if benchfile is not None:
3842
3294
return int(not result)
3845
3297
class cmd_version(Command):
3846
__doc__ = """Show version of bzr."""
3298
"""Show version of bzr."""
3848
3300
encoding_type = 'replace'
3849
3301
takes_options = [
3883
3335
branch1 = Branch.open_containing(branch)[0]
3884
3336
branch2 = Branch.open_containing(other)[0]
3885
self.add_cleanup(branch1.lock_read().unlock)
3886
self.add_cleanup(branch2.lock_read().unlock)
3887
last1 = ensure_null(branch1.last_revision())
3888
last2 = ensure_null(branch2.last_revision())
3890
graph = branch1.repository.get_graph(branch2.repository)
3891
base_rev_id = graph.find_unique_lca(last1, last2)
3893
self.outf.write('merge base is revision %s\n' % base_rev_id)
3341
last1 = ensure_null(branch1.last_revision())
3342
last2 = ensure_null(branch2.last_revision())
3344
graph = branch1.repository.get_graph(branch2.repository)
3345
base_rev_id = graph.find_unique_lca(last1, last2)
3347
print 'merge base is revision %s' % base_rev_id
3896
3354
class cmd_merge(Command):
3897
__doc__ = """Perform a three-way merge.
3355
"""Perform a three-way merge.
3899
3357
The source of the merge can be specified either in the form of a branch,
3900
3358
or in the form of a path to a file containing a merge directive generated
3901
3359
with bzr send. If neither is specified, the default is the upstream branch
3902
or the branch most recently merged using --remember. The source of the
3903
merge may also be specified in the form of a path to a file in another
3904
branch: in this case, only the modifications to that file are merged into
3905
the current working tree.
3907
When merging from a branch, by default bzr will try to merge in all new
3908
work from the other branch, automatically determining an appropriate base
3909
revision. If this fails, you may need to give an explicit base.
3911
To pick a different ending revision, pass "--revision OTHER". bzr will
3912
try to merge in all new work up to and including revision OTHER.
3914
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3915
through OTHER, excluding BASE but including OTHER, will be merged. If this
3916
causes some revisions to be skipped, i.e. if the destination branch does
3917
not already contain revision BASE, such a merge is commonly referred to as
3918
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3919
cherrypicks. The changes look like a normal commit, and the history of the
3920
changes from the other branch is not stored in the commit.
3922
Revision numbers are always relative to the source branch.
3360
or the branch most recently merged using --remember.
3362
When merging a branch, by default the tip will be merged. To pick a different
3363
revision, pass --revision. If you specify two values, the first will be used as
3364
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3365
available revisions, like this is commonly referred to as "cherrypicking".
3367
Revision numbers are always relative to the branch being merged.
3369
By default, bzr will try to merge in all new work from the other
3370
branch, automatically determining an appropriate base. If this
3371
fails, you may need to give an explicit base.
3924
3373
Merge will do its best to combine the changes in two branches, but there
3925
3374
are some kinds of problems only a human can fix. When it encounters those,
3929
3378
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3931
If there is no default branch set, the first merge will set it (use
3932
--no-remember to avoid settting it). After that, you can omit the branch
3933
to use the default. To change the default, use --remember. The value will
3934
only be saved if the remote location can be accessed.
3380
If there is no default branch set, the first merge will set it. After
3381
that, you can omit the branch to use the default. To change the
3382
default, use --remember. The value will only be saved if the remote
3383
location can be accessed.
3936
3385
The results of the merge are placed into the destination working
3937
3386
directory, where they can be reviewed (with bzr diff), tested, and then
3938
3387
committed to record the result of the merge.
3940
3389
merge refuses to run if there are any uncommitted changes, unless
3941
--force is given. If --force is given, then the changes from the source
3942
will be merged with the current working tree, including any uncommitted
3943
changes in the tree. The --force option can also be used to create a
3944
merge revision which has more than two parents.
3946
If one would like to merge changes from the working tree of the other
3947
branch without merging any committed revisions, the --uncommitted option
3950
To select only some changes to merge, use "merge -i", which will prompt
3951
you to apply each diff hunk and file change, similar to "shelve".
3954
To merge all new revisions from bzr.dev::
3393
To merge the latest revision from bzr.dev::
3956
3395
bzr merge ../bzr.dev
4019
3450
allow_pending = True
4020
3451
verified = 'inapplicable'
4022
3452
tree = WorkingTree.open_containing(directory)[0]
4023
if tree.branch.revno() == 0:
4024
raise errors.BzrCommandError('Merging into empty branches not currently supported, '
4025
'https://bugs.launchpad.net/bzr/+bug/308562')
3454
# die as quickly as possible if there are uncommitted changes
4028
3456
basis_tree = tree.revision_tree(tree.last_revision())
4029
3457
except errors.NoSuchRevision:
4030
3458
basis_tree = tree.basis_tree()
4032
# die as quickly as possible if there are uncommitted changes
4034
if tree.has_changes():
3460
changes = tree.changes_from(basis_tree)
3461
if changes.has_changed():
4035
3462
raise errors.UncommittedChanges(tree)
4037
3464
view_info = _get_view_info_for_change_reporter(tree)
4038
3465
change_reporter = delta._ChangeReporter(
4039
3466
unversioned_filter=tree.is_ignored, view_info=view_info)
4040
pb = ui.ui_factory.nested_progress_bar()
4041
self.add_cleanup(pb.finished)
4042
self.add_cleanup(tree.lock_write().unlock)
4043
if location is not None:
4045
mergeable = bundle.read_mergeable_from_url(location,
4046
possible_transports=possible_transports)
4047
except errors.NotABundle:
3469
pb = ui.ui_factory.nested_progress_bar()
3470
cleanups.append(pb.finished)
3472
cleanups.append(tree.unlock)
3473
if location is not None:
3475
mergeable = bundle.read_mergeable_from_url(location,
3476
possible_transports=possible_transports)
3477
except errors.NotABundle:
3481
raise errors.BzrCommandError('Cannot use --uncommitted'
3482
' with bundles or merge directives.')
3484
if revision is not None:
3485
raise errors.BzrCommandError(
3486
'Cannot use -r with merge directives or bundles')
3487
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3490
if merger is None and uncommitted:
3491
if revision is not None and len(revision) > 0:
3492
raise errors.BzrCommandError('Cannot use --uncommitted and'
3493
' --revision at the same time.')
3494
location = self._select_branch_location(tree, location)[0]
3495
other_tree, other_path = WorkingTree.open_containing(location)
3496
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3498
allow_pending = False
3499
if other_path != '':
3500
merger.interesting_files = [other_path]
3503
merger, allow_pending = self._get_merger_from_branch(tree,
3504
location, revision, remember, possible_transports, pb)
3506
merger.merge_type = merge_type
3507
merger.reprocess = reprocess
3508
merger.show_base = show_base
3509
self.sanity_check_merger(merger)
3510
if (merger.base_rev_id == merger.other_rev_id and
3511
merger.other_rev_id is not None):
3512
note('Nothing to do.')
3515
if merger.interesting_files is not None:
3516
raise errors.BzrCommandError('Cannot pull individual files')
3517
if (merger.base_rev_id == tree.last_revision()):
3518
result = tree.pull(merger.other_branch, False,
3519
merger.other_rev_id)
3520
result.report(self.outf)
3522
merger.check_basis(False)
3524
return self._do_preview(merger)
4051
raise errors.BzrCommandError('Cannot use --uncommitted'
4052
' with bundles or merge directives.')
4054
if revision is not None:
4055
raise errors.BzrCommandError(
4056
'Cannot use -r with merge directives or bundles')
4057
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4060
if merger is None and uncommitted:
4061
if revision is not None and len(revision) > 0:
4062
raise errors.BzrCommandError('Cannot use --uncommitted and'
4063
' --revision at the same time.')
4064
merger = self.get_merger_from_uncommitted(tree, location, None)
4065
allow_pending = False
4068
merger, allow_pending = self._get_merger_from_branch(tree,
4069
location, revision, remember, possible_transports, None)
4071
merger.merge_type = merge_type
4072
merger.reprocess = reprocess
4073
merger.show_base = show_base
4074
self.sanity_check_merger(merger)
4075
if (merger.base_rev_id == merger.other_rev_id and
4076
merger.other_rev_id is not None):
4077
# check if location is a nonexistent file (and not a branch) to
4078
# disambiguate the 'Nothing to do'
4079
if merger.interesting_files:
4080
if not merger.other_tree.has_filename(
4081
merger.interesting_files[0]):
4082
note("merger: " + str(merger))
4083
raise errors.PathsDoNotExist([location])
4084
note('Nothing to do.')
4086
if pull and not preview:
4087
if merger.interesting_files is not None:
4088
raise errors.BzrCommandError('Cannot pull individual files')
4089
if (merger.base_rev_id == tree.last_revision()):
4090
result = tree.pull(merger.other_branch, False,
4091
merger.other_rev_id)
4092
result.report(self.outf)
4094
if merger.this_basis is None:
4095
raise errors.BzrCommandError(
4096
"This branch has no commits."
4097
" (perhaps you would prefer 'bzr pull')")
4099
return self._do_preview(merger)
4101
return self._do_interactive(merger)
4103
return self._do_merge(merger, change_reporter, allow_pending,
4106
def _get_preview(self, merger):
3526
return self._do_merge(merger, change_reporter, allow_pending,
3529
for cleanup in reversed(cleanups):
3532
def _do_preview(self, merger):
3533
from bzrlib.diff import show_diff_trees
4107
3534
tree_merger = merger.make_merger()
4108
3535
tt = tree_merger.make_preview_transform()
4109
self.add_cleanup(tt.finalize)
4110
result_tree = tt.get_preview_tree()
4113
def _do_preview(self, merger):
4114
from bzrlib.diff import show_diff_trees
4115
result_tree = self._get_preview(merger)
4116
path_encoding = osutils.get_diff_header_encoding()
4117
show_diff_trees(merger.this_tree, result_tree, self.outf,
4118
old_label='', new_label='',
4119
path_encoding=path_encoding)
3537
result_tree = tt.get_preview_tree()
3538
show_diff_trees(merger.this_tree, result_tree, self.outf,
3539
old_label='', new_label='')
4121
3543
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4122
3544
merger.change_reporter = change_reporter
4188
3592
base_branch, base_path = Branch.open_containing(base_loc,
4189
3593
possible_transports)
4190
3594
# Find the revision ids
4191
other_revision_id = None
4192
base_revision_id = None
4193
if revision is not None:
4194
if len(revision) >= 1:
4195
other_revision_id = revision[-1].as_revision_id(other_branch)
4196
if len(revision) == 2:
4197
base_revision_id = revision[0].as_revision_id(base_branch)
4198
if other_revision_id is None:
3595
if revision is None or len(revision) < 1 or revision[-1] is None:
4199
3596
other_revision_id = _mod_revision.ensure_null(
4200
3597
other_branch.last_revision())
4201
# Remember where we merge from. We need to remember if:
4202
# - user specify a location (and we don't merge from the parent
4204
# - user ask to remember or there is no previous location set to merge
4205
# from and user didn't ask to *not* remember
4206
if (user_location is not None
4208
or (remember is None
4209
and tree.branch.get_submit_branch() is None)))):
3599
other_revision_id = revision[-1].as_revision_id(other_branch)
3600
if (revision is not None and len(revision) == 2
3601
and revision[0] is not None):
3602
base_revision_id = revision[0].as_revision_id(base_branch)
3604
base_revision_id = None
3605
# Remember where we merge from
3606
if ((remember or tree.branch.get_submit_branch() is None) and
3607
user_location is not None):
4210
3608
tree.branch.set_submit_branch(other_branch.base)
4211
# Merge tags (but don't set them in the master branch yet, the user
4212
# might revert this merge). Commit will propagate them.
4213
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3609
_merge_tags_if_possible(other_branch, tree.branch)
4214
3610
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4215
3611
other_revision_id, base_revision_id, other_branch, base_branch)
4216
3612
if other_path != '':
4315
3697
def run(self, file_list=None, merge_type=None, show_base=False,
4316
3698
reprocess=False):
4317
from bzrlib.conflicts import restore
4318
3699
if merge_type is None:
4319
3700
merge_type = _mod_merge.Merge3Merger
4320
tree, file_list = WorkingTree.open_containing_paths(file_list)
4321
self.add_cleanup(tree.lock_write().unlock)
4322
parents = tree.get_parent_ids()
4323
if len(parents) != 2:
4324
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4325
" merges. Not cherrypicking or"
4327
repository = tree.branch.repository
4328
interesting_ids = None
4330
conflicts = tree.conflicts()
4331
if file_list is not None:
4332
interesting_ids = set()
4333
for filename in file_list:
4334
file_id = tree.path2id(filename)
4336
raise errors.NotVersionedError(filename)
4337
interesting_ids.add(file_id)
4338
if tree.kind(file_id) != "directory":
3701
tree, file_list = tree_files(file_list)
3704
parents = tree.get_parent_ids()
3705
if len(parents) != 2:
3706
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3707
" merges. Not cherrypicking or"
3709
repository = tree.branch.repository
3710
interesting_ids = None
3712
conflicts = tree.conflicts()
3713
if file_list is not None:
3714
interesting_ids = set()
3715
for filename in file_list:
3716
file_id = tree.path2id(filename)
3718
raise errors.NotVersionedError(filename)
3719
interesting_ids.add(file_id)
3720
if tree.kind(file_id) != "directory":
4341
for name, ie in tree.inventory.iter_entries(file_id):
4342
interesting_ids.add(ie.file_id)
4343
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4345
# Remerge only supports resolving contents conflicts
4346
allowed_conflicts = ('text conflict', 'contents conflict')
4347
restore_files = [c.path for c in conflicts
4348
if c.typestring in allowed_conflicts]
4349
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4350
tree.set_conflicts(ConflictList(new_conflicts))
4351
if file_list is not None:
4352
restore_files = file_list
4353
for filename in restore_files:
3723
for name, ie in tree.inventory.iter_entries(file_id):
3724
interesting_ids.add(ie.file_id)
3725
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3727
# Remerge only supports resolving contents conflicts
3728
allowed_conflicts = ('text conflict', 'contents conflict')
3729
restore_files = [c.path for c in conflicts
3730
if c.typestring in allowed_conflicts]
3731
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3732
tree.set_conflicts(ConflictList(new_conflicts))
3733
if file_list is not None:
3734
restore_files = file_list
3735
for filename in restore_files:
3737
restore(tree.abspath(filename))
3738
except errors.NotConflicted:
3740
# Disable pending merges, because the file texts we are remerging
3741
# have not had those merges performed. If we use the wrong parents
3742
# list, we imply that the working tree text has seen and rejected
3743
# all the changes from the other tree, when in fact those changes
3744
# have not yet been seen.
3745
pb = ui.ui_factory.nested_progress_bar()
3746
tree.set_parent_ids(parents[:1])
4355
restore(tree.abspath(filename))
4356
except errors.NotConflicted:
4358
# Disable pending merges, because the file texts we are remerging
4359
# have not had those merges performed. If we use the wrong parents
4360
# list, we imply that the working tree text has seen and rejected
4361
# all the changes from the other tree, when in fact those changes
4362
# have not yet been seen.
4363
tree.set_parent_ids(parents[:1])
4365
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4366
merger.interesting_ids = interesting_ids
4367
merger.merge_type = merge_type
4368
merger.show_base = show_base
4369
merger.reprocess = reprocess
4370
conflicts = merger.do_merge()
3748
merger = _mod_merge.Merger.from_revision_ids(pb,
3750
merger.interesting_ids = interesting_ids
3751
merger.merge_type = merge_type
3752
merger.show_base = show_base
3753
merger.reprocess = reprocess
3754
conflicts = merger.do_merge()
3756
tree.set_parent_ids(parents)
4372
tree.set_parent_ids(parents)
4373
3760
if conflicts > 0:
4398
3784
name. If you name a directory, all the contents of that directory will be
4401
If you have newly added files since the target revision, they will be
4402
removed. If the files to be removed have been changed, backups will be
4403
created as above. Directories containing unknown files will not be
3787
Any files that have been newly added since that revision will be deleted,
3788
with a backup kept if appropriate. Directories containing unknown files
3789
will not be deleted.
4406
The working tree contains a list of revisions that have been merged but
4407
not yet committed. These revisions will be included as additional parents
4408
of the next commit. Normally, using revert clears that list as well as
4409
reverting the files. If any files are specified, revert leaves the list
4410
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4411
.`` in the tree root to revert all files but keep the recorded merges,
4412
and ``bzr revert --forget-merges`` to clear the pending merge list without
3791
The working tree contains a list of pending merged revisions, which will
3792
be included as parents in the next commit. Normally, revert clears that
3793
list as well as reverting the files. If any files are specified, revert
3794
leaves the pending merge list alone and reverts only the files. Use "bzr
3795
revert ." in the tree root to revert all files but keep the merge record,
3796
and "bzr revert --forget-merges" to clear the pending merge list without
4413
3797
reverting any files.
4415
Using "bzr revert --forget-merges", it is possible to apply all of the
4416
changes from a branch in a single revision. To do this, perform the merge
4417
as desired. Then doing revert with the "--forget-merges" option will keep
4418
the content of the tree as it was, but it will clear the list of pending
4419
merges. The next commit will then contain all of the changes that are
4420
present in the other branch, but without any other parent revisions.
4421
Because this technique forgets where these changes originated, it may
4422
cause additional conflicts on later merges involving the same source and
4426
_see_also = ['cat', 'export', 'merge', 'shelve']
3800
_see_also = ['cat', 'export']
4427
3801
takes_options = [
4429
3803
Option('no-backup', "Do not save backups of reverted files."),
4435
3809
def run(self, revision=None, no_backup=False, file_list=None,
4436
3810
forget_merges=None):
4437
tree, file_list = WorkingTree.open_containing_paths(file_list)
4438
self.add_cleanup(tree.lock_tree_write().unlock)
4440
tree.set_parent_ids(tree.get_parent_ids()[:1])
4442
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3811
tree, file_list = tree_files(file_list)
3815
tree.set_parent_ids(tree.get_parent_ids()[:1])
3817
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4445
3822
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4446
3823
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4447
tree.revert(file_list, rev_tree, not no_backup, None,
4448
report_changes=True)
3824
pb = ui.ui_factory.nested_progress_bar()
3826
tree.revert(file_list, rev_tree, not no_backup, pb,
3827
report_changes=True)
4451
3832
class cmd_assert_fail(Command):
4452
__doc__ = """Test reporting of assertion failures"""
3833
"""Test reporting of assertion failures"""
4453
3834
# intended just for use in testing
4606
3977
_get_revision_range(revision,
4607
3978
remote_branch, self.name()))
4609
local_extra, remote_extra = find_unmerged(
4610
local_branch, remote_branch, restrict,
4611
backward=not reverse,
4612
include_merges=include_merges,
4613
local_revid_range=local_revid_range,
4614
remote_revid_range=remote_revid_range)
4616
if log_format is None:
4617
registry = log.log_formatter_registry
4618
log_format = registry.get_default(local_branch)
4619
lf = log_format(to_file=self.outf,
4621
show_timezone='original')
4624
if local_extra and not theirs_only:
4625
message("You have %d extra revision(s):\n" %
4627
for revision in iter_log_revisions(local_extra,
4628
local_branch.repository,
4630
lf.log_revision(revision)
4631
printed_local = True
4634
printed_local = False
4636
if remote_extra and not mine_only:
4637
if printed_local is True:
4639
message("You are missing %d revision(s):\n" %
4641
for revision in iter_log_revisions(remote_extra,
4642
remote_branch.repository,
4644
lf.log_revision(revision)
4647
if mine_only and not local_extra:
4648
# We checked local, and found nothing extra
4649
message('This branch is up to date.\n')
4650
elif theirs_only and not remote_extra:
4651
# We checked remote, and found nothing extra
4652
message('Other branch is up to date.\n')
4653
elif not (mine_only or theirs_only or local_extra or
4655
# We checked both branches, and neither one had extra
4657
message("Branches are up to date.\n")
3980
local_branch.lock_read()
3982
remote_branch.lock_read()
3984
local_extra, remote_extra = find_unmerged(
3985
local_branch, remote_branch, restrict,
3986
backward=not reverse,
3987
include_merges=include_merges,
3988
local_revid_range=local_revid_range,
3989
remote_revid_range=remote_revid_range)
3991
if log_format is None:
3992
registry = log.log_formatter_registry
3993
log_format = registry.get_default(local_branch)
3994
lf = log_format(to_file=self.outf,
3996
show_timezone='original')
3999
if local_extra and not theirs_only:
4000
message("You have %d extra revision(s):\n" %
4002
for revision in iter_log_revisions(local_extra,
4003
local_branch.repository,
4005
lf.log_revision(revision)
4006
printed_local = True
4009
printed_local = False
4011
if remote_extra and not mine_only:
4012
if printed_local is True:
4014
message("You are missing %d revision(s):\n" %
4016
for revision in iter_log_revisions(remote_extra,
4017
remote_branch.repository,
4019
lf.log_revision(revision)
4022
if mine_only and not local_extra:
4023
# We checked local, and found nothing extra
4024
message('This branch is up to date.\n')
4025
elif theirs_only and not remote_extra:
4026
# We checked remote, and found nothing extra
4027
message('Other branch is up to date.\n')
4028
elif not (mine_only or theirs_only or local_extra or
4030
# We checked both branches, and neither one had extra
4032
message("Branches are up to date.\n")
4034
remote_branch.unlock()
4036
local_branch.unlock()
4659
4037
if not status_code and parent is None and other_branch is not None:
4660
self.add_cleanup(local_branch.lock_write().unlock)
4661
# handle race conditions - a parent might be set while we run.
4662
if local_branch.get_parent() is None:
4663
local_branch.set_parent(remote_branch.base)
4038
local_branch.lock_write()
4040
# handle race conditions - a parent might be set while we run.
4041
if local_branch.get_parent() is None:
4042
local_branch.set_parent(remote_branch.base)
4044
local_branch.unlock()
4664
4045
return status_code
4667
4048
class cmd_pack(Command):
4668
__doc__ = """Compress the data within a repository.
4670
This operation compresses the data within a bazaar repository. As
4671
bazaar supports automatic packing of repository, this operation is
4672
normally not required to be done manually.
4674
During the pack operation, bazaar takes a backup of existing repository
4675
data, i.e. pack files. This backup is eventually removed by bazaar
4676
automatically when it is safe to do so. To save disk space by removing
4677
the backed up pack files, the --clean-obsolete-packs option may be
4680
Warning: If you use --clean-obsolete-packs and your machine crashes
4681
during or immediately after repacking, you may be left with a state
4682
where the deletion has been written to disk but the new packs have not
4683
been. In this case the repository may be unusable.
4049
"""Compress the data within a repository."""
4686
4051
_see_also = ['repositories']
4687
4052
takes_args = ['branch_or_repo?']
4689
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4692
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4054
def run(self, branch_or_repo='.'):
4693
4055
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4695
4057
branch = dir.open_branch()
4696
4058
repository = branch.repository
4697
4059
except errors.NotBranchError:
4698
4060
repository = dir.open_repository()
4699
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4702
4064
class cmd_plugins(Command):
4703
__doc__ = """List the installed plugins.
4065
"""List the installed plugins.
4705
4067
This command displays the list of installed plugins including
4706
4068
version of plugin and a short description of each.
4713
4075
adding new commands, providing additional network transports and
4714
4076
customizing log output.
4716
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4717
for further information on plugins including where to find them and how to
4718
install them. Instructions are also provided there on how to write new
4719
plugins using the Python programming language.
4078
See the Bazaar web site, http://bazaar-vcs.org, for further
4079
information on plugins including where to find them and how to
4080
install them. Instructions are also provided there on how to
4081
write new plugins using the Python programming language.
4721
4083
takes_options = ['verbose']
4723
4085
@display_command
4724
4086
def run(self, verbose=False):
4725
from bzrlib import plugin
4726
# Don't give writelines a generator as some codecs don't like that
4727
self.outf.writelines(
4728
list(plugin.describe_plugins(show_paths=verbose)))
4087
import bzrlib.plugin
4088
from inspect import getdoc
4090
for name, plugin in bzrlib.plugin.plugins().items():
4091
version = plugin.__version__
4092
if version == 'unknown':
4094
name_ver = '%s %s' % (name, version)
4095
d = getdoc(plugin.module)
4097
doc = d.split('\n')[0]
4099
doc = '(no description)'
4100
result.append((name_ver, doc, plugin.path()))
4101
for name_ver, doc, path in sorted(result):
4731
4109
class cmd_testament(Command):
4732
__doc__ = """Show testament (signing-form) of a revision."""
4110
"""Show testament (signing-form) of a revision."""
4733
4111
takes_options = [
4735
4113
Option('long', help='Produce long-format testament.'),
4777
4158
Option('long', help='Show commit date in annotations.'),
4782
4162
encoding_type = 'exact'
4784
4164
@display_command
4785
4165
def run(self, filename, all=False, long=False, revision=None,
4786
show_ids=False, directory=None):
4787
from bzrlib.annotate import (
4167
from bzrlib.annotate import annotate_file, annotate_file_tree
4790
4168
wt, branch, relpath = \
4791
_open_directory_or_containing_tree_or_branch(filename, directory)
4169
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4792
4170
if wt is not None:
4793
self.add_cleanup(wt.lock_read().unlock)
4795
self.add_cleanup(branch.lock_read().unlock)
4796
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4797
self.add_cleanup(tree.lock_read().unlock)
4798
if wt is not None and revision is None:
4799
file_id = wt.path2id(relpath)
4801
file_id = tree.path2id(relpath)
4803
raise errors.NotVersionedError(filename)
4804
if wt is not None and revision is None:
4805
# If there is a tree and we're not annotating historical
4806
# versions, annotate the working tree's content.
4807
annotate_file_tree(wt, file_id, self.outf, long, all,
4810
annotate_file_tree(tree, file_id, self.outf, long, all,
4811
show_ids=show_ids, branch=branch)
4175
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4177
file_id = wt.path2id(relpath)
4179
file_id = tree.path2id(relpath)
4181
raise errors.NotVersionedError(filename)
4182
file_version = tree.inventory[file_id].revision
4183
if wt is not None and revision is None:
4184
# If there is a tree and we're not annotating historical
4185
# versions, annotate the working tree's content.
4186
annotate_file_tree(wt, file_id, self.outf, long, all,
4189
annotate_file(branch, file_version, file_id, long, all, self.outf,
4814
4198
class cmd_re_sign(Command):
4815
__doc__ = """Create a digital signature for an existing revision."""
4199
"""Create a digital signature for an existing revision."""
4816
4200
# TODO be able to replace existing ones.
4818
4202
hidden = True # is this right ?
4819
4203
takes_args = ['revision_id*']
4820
takes_options = ['directory', 'revision']
4204
takes_options = ['revision']
4822
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4206
def run(self, revision_id_list=None, revision=None):
4823
4207
if revision_id_list is not None and revision is not None:
4824
4208
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4825
4209
if revision_id_list is None and revision is None:
4826
4210
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4827
b = WorkingTree.open_containing(directory)[0].branch
4828
self.add_cleanup(b.lock_write().unlock)
4829
return self._run(b, revision_id_list, revision)
4211
b = WorkingTree.open_containing(u'.')[0].branch
4214
return self._run(b, revision_id_list, revision)
4831
4218
def _run(self, b, revision_id_list, revision):
4832
4219
import bzrlib.gpg as gpg
5022
4412
end_revision=last_revno)
5025
self.outf.write('Dry-run, pretending to remove'
5026
' the above revisions.\n')
4415
print 'Dry-run, pretending to remove the above revisions.'
4417
val = raw_input('Press <enter> to continue')
5028
self.outf.write('The above revision(s) will be removed.\n')
5031
if not ui.ui_factory.confirm_action(
5032
u'Uncommit these revisions',
5033
'bzrlib.builtins.uncommit',
5035
self.outf.write('Canceled\n')
4419
print 'The above revision(s) will be removed.'
4421
val = raw_input('Are you sure [y/N]? ')
4422
if val.lower() not in ('y', 'yes'):
5038
4426
mutter('Uncommitting from {%s} to {%s}',
5039
4427
last_rev_id, rev_id)
5040
4428
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5041
4429
revno=revno, local=local)
5042
self.outf.write('You can restore the old tip by running:\n'
5043
' bzr pull . -r revid:%s\n' % last_rev_id)
4430
note('You can restore the old tip by running:\n'
4431
' bzr pull . -r revid:%s', last_rev_id)
5046
4434
class cmd_break_lock(Command):
5047
__doc__ = """Break a dead lock.
5049
This command breaks a lock on a repository, branch, working directory or
4435
"""Break a dead lock on a repository, branch or working directory.
5052
4437
CAUTION: Locks should only be broken when you are sure that the process
5053
4438
holding the lock has been stopped.
5055
You can get information on what locks are open via the 'bzr info
5056
[location]' command.
4440
You can get information on what locks are open via the 'bzr info' command.
5060
bzr break-lock bzr+ssh://example.com/bzr/foo
5061
bzr break-lock --conf ~/.bazaar
5064
4445
takes_args = ['location?']
5067
help='LOCATION is the directory where the config lock is.'),
5069
help='Do not ask for confirmation before breaking the lock.'),
5072
def run(self, location=None, config=False, force=False):
4447
def run(self, location=None, show=False):
5073
4448
if location is None:
5074
4449
location = u'.'
5076
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5078
{'bzrlib.lockdir.break': True})
5080
conf = _mod_config.LockableConfig(file_name=location)
5083
control, relpath = bzrdir.BzrDir.open_containing(location)
5085
control.break_lock()
5086
except NotImplementedError:
4450
control, relpath = bzrdir.BzrDir.open_containing(location)
4452
control.break_lock()
4453
except NotImplementedError:
5090
4457
class cmd_wait_until_signalled(Command):
5091
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4458
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5093
4460
This just prints a line to signal when it is ready, then blocks on stdin.
5104
4471
class cmd_serve(Command):
5105
__doc__ = """Run the bzr server."""
4472
"""Run the bzr server."""
5107
4474
aliases = ['server']
5109
4476
takes_options = [
5111
4478
help='Serve on stdin/out for use from inetd or sshd.'),
5112
RegistryOption('protocol',
5113
help="Protocol to serve.",
5114
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5115
value_switches=True),
5117
4480
help='Listen for connections on nominated port of the form '
5118
4481
'[hostname:]portnumber. Passing 0 as the port number will '
5119
'result in a dynamically allocated port. The default port '
5120
'depends on the protocol.',
4482
'result in a dynamically allocated port. The default port is '
5122
custom_help('directory',
5123
help='Serve contents of this directory.'),
4486
help='Serve contents of this directory.',
5124
4488
Option('allow-writes',
5125
4489
help='By default the server is a readonly server. Supplying '
5126
4490
'--allow-writes enables write access to the contents of '
5127
'the served directory and below. Note that ``bzr serve`` '
5128
'does not perform authentication, so unless some form of '
5129
'external authentication is arranged supplying this '
5130
'option leads to global uncontrolled write access to your '
4491
'the served directory and below.'
4495
def run_smart_server(self, smart_server):
4496
"""Run 'smart_server' forever, with no UI output at all."""
4497
# For the duration of this server, no UI output is permitted. note
4498
# that this may cause problems with blackbox tests. This should be
4499
# changed with care though, as we dont want to use bandwidth sending
4500
# progress over stderr to smart server clients!
4501
from bzrlib import lockdir
4502
old_factory = ui.ui_factory
4503
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4505
ui.ui_factory = ui.SilentUIFactory()
4506
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4507
smart_server.serve()
4509
ui.ui_factory = old_factory
4510
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
5135
4512
def get_host_and_port(self, port):
5136
4513
"""Return the host and port to run the smart server on.
5138
If 'port' is None, None will be returned for the host and port.
4515
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4516
and port (`medium.BZR_DEFAULT_PORT`) will be used.
5140
4518
If 'port' has a colon in it, the string before the colon will be
5141
4519
interpreted as the host.
5144
4522
:return: A tuple of (host, port), where 'host' is a host name or IP,
5145
4523
and port is an integer TCP/IP port.
5148
if port is not None:
4525
from bzrlib.smart import medium
4526
host = medium.BZR_DEFAULT_INTERFACE
4528
port = medium.BZR_DEFAULT_PORT
5149
4530
if ':' in port:
5150
4531
host, port = port.split(':')
5151
4532
port = int(port)
5152
4533
return host, port
5154
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5156
from bzrlib import transport
4535
def get_smart_server(self, transport, inet, port):
4536
"""Construct a smart server.
4538
:param transport: The base transport from which branches will be
4540
:param inet: If True, serve over stdin and stdout. Used for running
4542
:param port: The port to listen on. By default, it's `
4543
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4545
:return: A smart server.
4547
from bzrlib.smart import medium, server
4549
smart_server = medium.SmartServerPipeStreamMedium(
4550
sys.stdin, sys.stdout, transport)
4552
host, port = self.get_host_and_port(port)
4553
smart_server = server.SmartTCPServer(
4554
transport, host=host, port=port)
4555
note('listening on port: %s' % smart_server.port)
4558
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4559
from bzrlib.transport import get_transport
4560
from bzrlib.transport.chroot import ChrootServer
5157
4561
if directory is None:
5158
4562
directory = os.getcwd()
5159
if protocol is None:
5160
protocol = transport.transport_server_registry.get()
5161
host, port = self.get_host_and_port(port)
5162
4563
url = urlutils.local_path_to_url(directory)
5163
4564
if not allow_writes:
5164
4565
url = 'readonly+' + url
5165
t = transport.get_transport(url)
5166
protocol(t, host, port, inet)
4566
chroot_server = ChrootServer(get_transport(url))
4567
chroot_server.setUp()
4568
t = get_transport(chroot_server.get_url())
4569
smart_server = self.get_smart_server(t, inet, port)
4570
self.run_smart_server(smart_server)
5169
4573
class cmd_join(Command):
5170
__doc__ = """Combine a tree into its containing tree.
4574
"""Combine a tree into its containing tree.
5172
4576
This command requires the target tree to be in a rich-root format.
5352
4754
directly from the merge directive, without retrieving data from a
5355
`bzr send` creates a compact data set that, when applied using bzr
5356
merge, has the same effect as merging from the source branch.
5358
By default the merge directive is self-contained and can be applied to any
5359
branch containing submit_branch in its ancestory without needing access to
5362
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5363
revisions, but only a structured request to merge from the
5364
public_location. In that case the public_branch is needed and it must be
5365
up-to-date and accessible to the recipient. The public_branch is always
5366
included if known, so that people can check it later.
5368
The submit branch defaults to the parent of the source branch, but can be
5369
overridden. Both submit branch and public branch will be remembered in
5370
branch.conf the first time they are used for a particular branch. The
5371
source branch defaults to that containing the working directory, but can
5372
be changed using --from.
5374
Both the submit branch and the public branch follow the usual behavior with
5375
respect to --remember: If there is no default location set, the first send
5376
will set it (use --no-remember to avoid settting it). After that, you can
5377
omit the location to use the default. To change the default, use
5378
--remember. The value will only be saved if the location can be accessed.
5380
In order to calculate those changes, bzr must analyse the submit branch.
5381
Therefore it is most efficient for the submit branch to be a local mirror.
5382
If a public location is known for the submit_branch, that location is used
5383
in the merge directive.
5385
The default behaviour is to send the merge directive by mail, unless -o is
5386
given, in which case it is sent to a file.
4757
If --no-bundle is specified, then public_branch is needed (and must be
4758
up-to-date), so that the receiver can perform the merge using the
4759
public_branch. The public_branch is always included if known, so that
4760
people can check it later.
4762
The submit branch defaults to the parent, but can be overridden. Both
4763
submit branch and public branch will be remembered if supplied.
4765
If a public_branch is known for the submit_branch, that public submit
4766
branch is used in the merge instructions. This means that a local mirror
4767
can be used as your actual submit branch, once you have set public_branch
5388
4770
Mail is sent using your preferred mail program. This should be transparent
5389
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
4771
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5390
4772
If the preferred client can't be found (or used), your editor will be used.
5392
4774
To use a specific mail program, set the mail_client configuration option.
5393
4775
(For Thunderbird 1.5, this works around some bugs.) Supported values for
5394
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5395
Mail.app), "mutt", and "thunderbird"; generic options are "default",
5396
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
4776
specific clients are "claws", "evolution", "kmail", "mutt", and
4777
"thunderbird"; generic options are "default", "editor", "emacsclient",
4778
"mapi", and "xdg-email". Plugins may also add supported clients.
5399
4780
If mail is being sent, a to address is required. This can be supplied
5400
4781
either on the commandline, by setting the submit_to configuration
5434
4811
short_name='f',
5436
4813
Option('output', short_name='o',
5437
help='Write merge directive to this file or directory; '
4814
help='Write merge directive to this file; '
5438
4815
'use - for stdout.',
5441
help='Refuse to send if there are uncommitted changes in'
5442
' the working tree, --no-strict disables the check.'),
5443
4817
Option('mail-to', help='Mail the request to this address.',
5447
4821
Option('body', help='Body for the email.', type=unicode),
5448
RegistryOption('format',
5449
help='Use the specified output format.',
5450
lazy_registry=('bzrlib.send', 'format_registry')),
4822
RegistryOption.from_kwargs('format',
4823
'Use the specified output format.',
4824
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4825
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5453
4828
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5454
no_patch=False, revision=None, remember=None, output=None,
5455
format=None, mail_to=None, message=None, body=None,
5456
strict=None, **kwargs):
5457
from bzrlib.send import send
5458
return send(submit_branch, revision, public_branch, remember,
5459
format, no_bundle, no_patch, output,
5460
kwargs.get('from', '.'), mail_to, message, body,
4829
no_patch=False, revision=None, remember=False, output=None,
4830
format='4', mail_to=None, message=None, body=None, **kwargs):
4831
return self._run(submit_branch, revision, public_branch, remember,
4832
format, no_bundle, no_patch, output,
4833
kwargs.get('from', '.'), mail_to, message, body)
4835
def _run(self, submit_branch, revision, public_branch, remember, format,
4836
no_bundle, no_patch, output, from_, mail_to, message, body):
4837
from bzrlib.revision import NULL_REVISION
4838
branch = Branch.open_containing(from_)[0]
4840
outfile = cStringIO.StringIO()
4844
outfile = open(output, 'wb')
4845
# we may need to write data into branch's repository to calculate
4850
config = branch.get_config()
4852
mail_to = config.get_user_option('submit_to')
4853
mail_client = config.get_mail_client()
4854
if (not getattr(mail_client, 'supports_body', False)
4855
and body is not None):
4856
raise errors.BzrCommandError(
4857
'Mail client "%s" does not support specifying body' %
4858
mail_client.__class__.__name__)
4859
if remember and submit_branch is None:
4860
raise errors.BzrCommandError(
4861
'--remember requires a branch to be specified.')
4862
stored_submit_branch = branch.get_submit_branch()
4863
remembered_submit_branch = None
4864
if submit_branch is None:
4865
submit_branch = stored_submit_branch
4866
remembered_submit_branch = "submit"
4868
if stored_submit_branch is None or remember:
4869
branch.set_submit_branch(submit_branch)
4870
if submit_branch is None:
4871
submit_branch = branch.get_parent()
4872
remembered_submit_branch = "parent"
4873
if submit_branch is None:
4874
raise errors.BzrCommandError('No submit branch known or'
4876
if remembered_submit_branch is not None:
4877
note('Using saved %s location "%s" to determine what '
4878
'changes to submit.', remembered_submit_branch,
4882
submit_config = Branch.open(submit_branch).get_config()
4883
mail_to = submit_config.get_user_option("child_submit_to")
4885
stored_public_branch = branch.get_public_branch()
4886
if public_branch is None:
4887
public_branch = stored_public_branch
4888
elif stored_public_branch is None or remember:
4889
branch.set_public_branch(public_branch)
4890
if no_bundle and public_branch is None:
4891
raise errors.BzrCommandError('No public branch specified or'
4893
base_revision_id = None
4895
if revision is not None:
4896
if len(revision) > 2:
4897
raise errors.BzrCommandError('bzr send takes '
4898
'at most two one revision identifiers')
4899
revision_id = revision[-1].as_revision_id(branch)
4900
if len(revision) == 2:
4901
base_revision_id = revision[0].as_revision_id(branch)
4902
if revision_id is None:
4903
revision_id = branch.last_revision()
4904
if revision_id == NULL_REVISION:
4905
raise errors.BzrCommandError('No revisions to submit.')
4907
directive = merge_directive.MergeDirective2.from_objects(
4908
branch.repository, revision_id, time.time(),
4909
osutils.local_time_offset(), submit_branch,
4910
public_branch=public_branch, include_patch=not no_patch,
4911
include_bundle=not no_bundle, message=message,
4912
base_revision_id=base_revision_id)
4913
elif format == '0.9':
4916
patch_type = 'bundle'
4918
raise errors.BzrCommandError('Format 0.9 does not'
4919
' permit bundle with no patch')
4925
directive = merge_directive.MergeDirective.from_objects(
4926
branch.repository, revision_id, time.time(),
4927
osutils.local_time_offset(), submit_branch,
4928
public_branch=public_branch, patch_type=patch_type,
4931
outfile.writelines(directive.to_lines())
4933
subject = '[MERGE] '
4934
if message is not None:
4937
revision = branch.repository.get_revision(revision_id)
4938
subject += revision.get_summary()
4939
basename = directive.get_disk_name(branch)
4940
mail_client.compose_merge_request(mail_to, subject,
5465
4949
class cmd_bundle_revisions(cmd_send):
5466
__doc__ = """Create a merge-directive for submitting changes.
4951
"""Create a merge-directive for submitting changes.
5468
4953
A merge directive provides many things needed for requesting merges:
5526
5009
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5527
5010
no_patch=False, revision=None, remember=False, output=None,
5528
format=None, strict=None, **kwargs):
5011
format='4', **kwargs):
5529
5012
if output is None:
5531
from bzrlib.send import send
5532
return send(submit_branch, revision, public_branch, remember,
5014
return self._run(submit_branch, revision, public_branch, remember,
5533
5015
format, no_bundle, no_patch, output,
5534
kwargs.get('from', '.'), None, None, None,
5535
self.outf, strict=strict)
5016
kwargs.get('from', '.'), None, None, None)
5538
5019
class cmd_tag(Command):
5539
__doc__ = """Create, remove or modify a tag naming a revision.
5020
"""Create, remove or modify a tag naming a revision.
5541
5022
Tags give human-meaningful names to revisions. Commands that take a -r
5542
5023
(--revision) option can be given -rtag:X, where X is any previously
5551
5032
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5552
5033
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5554
If no tag name is specified it will be determined through the
5555
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5556
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5560
5036
_see_also = ['commit', 'tags']
5561
takes_args = ['tag_name?']
5037
takes_args = ['tag_name']
5562
5038
takes_options = [
5563
5039
Option('delete',
5564
5040
help='Delete this tag rather than placing it.',
5566
custom_help('directory',
5567
help='Branch in which to place the tag.'),
5043
help='Branch in which to place the tag.',
5568
5047
Option('force',
5569
5048
help='Replace existing tags.',
5574
def run(self, tag_name=None,
5053
def run(self, tag_name,
5580
5059
branch, relpath = Branch.open_containing(directory)
5581
self.add_cleanup(branch.lock_write().unlock)
5583
if tag_name is None:
5584
raise errors.BzrCommandError("No tag specified to delete.")
5585
branch.tags.delete_tag(tag_name)
5586
note('Deleted tag %s.' % tag_name)
5589
if len(revision) != 1:
5590
raise errors.BzrCommandError(
5591
"Tags can only be placed on a single revision, "
5593
revision_id = revision[0].as_revision_id(branch)
5063
branch.tags.delete_tag(tag_name)
5064
self.outf.write('Deleted tag %s.\n' % tag_name)
5595
revision_id = branch.last_revision()
5596
if tag_name is None:
5597
tag_name = branch.automatic_tag_name(revision_id)
5598
if tag_name is None:
5599
raise errors.BzrCommandError(
5600
"Please specify a tag name.")
5601
if (not force) and branch.tags.has_tag(tag_name):
5602
raise errors.TagAlreadyExists(tag_name)
5603
branch.tags.set_tag(tag_name, revision_id)
5604
note('Created tag %s.' % tag_name)
5067
if len(revision) != 1:
5068
raise errors.BzrCommandError(
5069
"Tags can only be placed on a single revision, "
5071
revision_id = revision[0].as_revision_id(branch)
5073
revision_id = branch.last_revision()
5074
if (not force) and branch.tags.has_tag(tag_name):
5075
raise errors.TagAlreadyExists(tag_name)
5076
branch.tags.set_tag(tag_name, revision_id)
5077
self.outf.write('Created tag %s.\n' % tag_name)
5607
5082
class cmd_tags(Command):
5608
__doc__ = """List tags.
5610
5085
This command shows a table of tag names and the revisions they reference.
5613
5088
_see_also = ['tag']
5614
5089
takes_options = [
5615
custom_help('directory',
5616
help='Branch whose tags should be displayed.'),
5617
RegistryOption('sort',
5091
help='Branch whose tags should be displayed.',
5095
RegistryOption.from_kwargs('sort',
5618
5096
'Sort tags by different criteria.', title='Sorting',
5619
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5097
alpha='Sort tags lexicographically (default).',
5098
time='Sort tags chronologically.',
5625
5104
@display_command
5626
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5627
from bzrlib.tag import tag_sort_methods
5628
5111
branch, relpath = Branch.open_containing(directory)
5630
5113
tags = branch.tags.get_tag_dict().items()
5634
self.add_cleanup(branch.lock_read().unlock)
5636
graph = branch.repository.get_graph()
5637
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5638
revid1, revid2 = rev1.rev_id, rev2.rev_id
5639
# only show revisions between revid1 and revid2 (inclusive)
5640
tags = [(tag, revid) for tag, revid in tags if
5641
graph.is_between(revid, revid1, revid2)]
5643
sort = tag_sort_methods.get()
5120
graph = branch.repository.get_graph()
5121
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5122
revid1, revid2 = rev1.rev_id, rev2.rev_id
5123
# only show revisions between revid1 and revid2 (inclusive)
5124
tags = [(tag, revid) for tag, revid in tags if
5125
graph.is_between(revid, revid1, revid2)]
5130
elif sort == 'time':
5132
for tag, revid in tags:
5134
revobj = branch.repository.get_revision(revid)
5135
except errors.NoSuchRevision:
5136
timestamp = sys.maxint # place them at the end
5138
timestamp = revobj.timestamp
5139
timestamps[revid] = timestamp
5140
tags.sort(key=lambda x: timestamps[x[1]])
5645
5141
if not show_ids:
5646
5142
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5647
for index, (tag, revid) in enumerate(tags):
5649
revno = branch.revision_id_to_dotted_revno(revid)
5650
if isinstance(revno, tuple):
5651
revno = '.'.join(map(str, revno))
5652
except (errors.NoSuchRevision, errors.GhostRevisionsHaveNoRevno):
5653
# Bad tag data/merges can lead to tagged revisions
5654
# which are not in this branch. Fail gracefully ...
5656
tags[index] = (tag, revno)
5143
revno_map = branch.get_revision_id_to_revno_map()
5144
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5145
for tag, revid in tags ]
5658
5146
for tag, revspec in tags:
5659
5147
self.outf.write('%-20s %s\n' % (tag, revspec))
5662
5150
class cmd_reconfigure(Command):
5663
__doc__ = """Reconfigure the type of a bzr directory.
5151
"""Reconfigure the type of a bzr directory.
5665
5153
A target configuration must be specified.
5697
5185
Option('bind-to', help='Branch to bind checkout to.', type=str),
5698
5186
Option('force',
5699
help='Perform reconfiguration even if local changes'
5701
Option('stacked-on',
5702
help='Reconfigure a branch to be stacked on another branch.',
5706
help='Reconfigure a branch to be unstacked. This '
5707
'may require copying substantial data into it.',
5187
help='Perform reconfiguration even if local changes'
5711
def run(self, location=None, target_type=None, bind_to=None, force=False,
5191
def run(self, location=None, target_type=None, bind_to=None, force=False):
5714
5192
directory = bzrdir.BzrDir.open(location)
5715
if stacked_on and unstacked:
5716
raise errors.BzrCommandError("Can't use both --stacked-on and --unstacked")
5717
elif stacked_on is not None:
5718
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5720
reconfigure.ReconfigureUnstacked().apply(directory)
5721
# At the moment you can use --stacked-on and a different
5722
# reconfiguration shape at the same time; there seems no good reason
5724
5193
if target_type is None:
5725
if stacked_on or unstacked:
5728
raise errors.BzrCommandError('No target configuration '
5194
raise errors.BzrCommandError('No target configuration specified')
5730
5195
elif target_type == 'branch':
5731
5196
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5732
5197
elif target_type == 'tree':
5769
5234
/path/to/newbranch.
5771
5236
Bound branches use the nickname of its master branch unless it is set
5772
locally, in which case switching will update the local nickname to be
5237
locally, in which case switching will update the the local nickname to be
5773
5238
that of the master.
5776
takes_args = ['to_location?']
5777
takes_options = ['directory',
5779
help='Switch even if local commits will be lost.'),
5781
Option('create-branch', short_name='b',
5782
help='Create the target branch from this one before'
5783
' switching to it.'),
5241
takes_args = ['to_location']
5242
takes_options = [Option('force',
5243
help='Switch even if local commits will be lost.')
5786
def run(self, to_location=None, force=False, create_branch=False,
5787
revision=None, directory=u'.'):
5246
def run(self, to_location, force=False):
5788
5247
from bzrlib import switch
5789
tree_location = directory
5790
revision = _get_one_revision('switch', revision)
5791
5249
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5792
if to_location is None:
5793
if revision is None:
5794
raise errors.BzrCommandError('You must supply either a'
5795
' revision or a location')
5796
to_location = tree_location
5250
branch = control_dir.open_branch()
5798
branch = control_dir.open_branch()
5799
had_explicit_nick = branch.get_config().has_explicit_nickname()
5252
to_branch = Branch.open(to_location)
5800
5253
except errors.NotBranchError:
5802
had_explicit_nick = False
5805
raise errors.BzrCommandError('cannot create branch without'
5807
to_location = directory_service.directories.dereference(
5809
if '/' not in to_location and '\\' not in to_location:
5810
# This path is meant to be relative to the existing branch
5811
this_url = self._get_branch_location(control_dir)
5812
to_location = urlutils.join(this_url, '..', to_location)
5813
to_branch = branch.bzrdir.sprout(to_location,
5814
possible_transports=[branch.bzrdir.root_transport],
5815
source_branch=branch).open_branch()
5818
to_branch = Branch.open(to_location)
5819
except errors.NotBranchError:
5820
this_url = self._get_branch_location(control_dir)
5821
to_branch = Branch.open(
5822
urlutils.join(this_url, '..', to_location))
5823
if revision is not None:
5824
revision = revision.as_revision_id(to_branch)
5825
switch.switch(control_dir, to_branch, force, revision_id=revision)
5826
if had_explicit_nick:
5254
this_branch = control_dir.open_branch()
5255
# This may be a heavy checkout, where we want the master branch
5256
this_url = this_branch.get_bound_location()
5257
# If not, use a local sibling
5258
if this_url is None:
5259
this_url = this_branch.base
5260
to_branch = Branch.open(
5261
urlutils.join(this_url, '..', to_location))
5262
switch.switch(control_dir, to_branch, force)
5263
if branch.get_config().has_explicit_nickname():
5827
5264
branch = control_dir.open_branch() #get the new branch!
5828
5265
branch.nick = to_branch.nick
5829
5266
note('Switched to branch: %s',
5830
5267
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5832
def _get_branch_location(self, control_dir):
5833
"""Return location of branch for this control dir."""
5835
this_branch = control_dir.open_branch()
5836
# This may be a heavy checkout, where we want the master branch
5837
master_location = this_branch.get_bound_location()
5838
if master_location is not None:
5839
return master_location
5840
# If not, use a local sibling
5841
return this_branch.base
5842
except errors.NotBranchError:
5843
format = control_dir.find_branch_format()
5844
if getattr(format, 'get_reference', None) is not None:
5845
return format.get_reference(control_dir)
5847
return control_dir.root_transport.base
5850
5270
class cmd_view(Command):
5851
__doc__ = """Manage filtered views.
5271
"""Manage filtered views.
5853
5273
Views provide a mask over the tree so that users can focus on
5854
5274
a subset of a tree when doing their work. After creating a view,
6099
5480
Option('destroy',
6100
5481
help='Destroy removed changes instead of shelving them.'),
6102
_see_also = ['unshelve', 'configuration']
5483
_see_also = ['unshelve']
6104
5485
def run(self, revision=None, all=False, file_list=None, message=None,
6105
writer=None, list=False, destroy=False, directory=None):
5486
writer=None, list=False, destroy=False):
6107
return self.run_for_list(directory=directory)
5488
return self.run_for_list()
6108
5489
from bzrlib.shelf_ui import Shelver
6109
5490
if writer is None:
6110
5491
writer = bzrlib.option.diff_writer_registry.get()
6112
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6113
file_list, message, destroy=destroy, directory=directory)
5493
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5494
message, destroy=destroy).run()
6118
5495
except errors.UserAbort:
6121
def run_for_list(self, directory=None):
6122
if directory is None:
6124
tree = WorkingTree.open_containing(directory)[0]
6125
self.add_cleanup(tree.lock_read().unlock)
6126
manager = tree.get_shelf_manager()
6127
shelves = manager.active_shelves()
6128
if len(shelves) == 0:
6129
note('No shelved changes.')
6131
for shelf_id in reversed(shelves):
6132
message = manager.get_metadata(shelf_id).get('message')
6134
message = '<no message>'
6135
self.outf.write('%3d: %s\n' % (shelf_id, message))
5498
def run_for_list(self):
5499
tree = WorkingTree.open_containing('.')[0]
5502
manager = tree.get_shelf_manager()
5503
shelves = manager.active_shelves()
5504
if len(shelves) == 0:
5505
note('No shelved changes.')
5507
for shelf_id in reversed(shelves):
5508
message = manager.get_metadata(shelf_id).get('message')
5510
message = '<no message>'
5511
self.outf.write('%3d: %s\n' % (shelf_id, message))
6139
5517
class cmd_unshelve(Command):
6140
__doc__ = """Restore shelved changes.
5518
"""Restore shelved changes.
6142
5520
By default, the most recently shelved changes are restored. However if you
6143
5521
specify a shelf by id those changes will be restored instead. This works
6147
5525
takes_args = ['shelf_id?']
6148
5526
takes_options = [
6150
5527
RegistryOption.from_kwargs(
6151
5528
'action', help="The action to perform.",
6152
5529
enum_switch=False, value_switches=True,
6153
5530
apply="Apply changes and remove from the shelf.",
6154
5531
dry_run="Show changes, but do not apply or remove them.",
6155
preview="Instead of unshelving the changes, show the diff that "
6156
"would result from unshelving.",
6157
delete_only="Delete changes without applying them.",
6158
keep="Apply changes but don't delete them.",
5532
delete_only="Delete changes without applying them."
6161
5535
_see_also = ['shelve']
6163
def run(self, shelf_id=None, action='apply', directory=u'.'):
5537
def run(self, shelf_id=None, action='apply'):
6164
5538
from bzrlib.shelf_ui import Unshelver
6165
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
6169
unshelver.tree.unlock()
5539
Unshelver.from_args(shelf_id, action).run()
6172
5542
class cmd_clean_tree(Command):
6173
__doc__ = """Remove unwanted files from working tree.
5543
"""Remove unwanted files from working tree.
6175
5545
By default, only unknown files, not ignored files, are deleted. Versioned
6176
5546
files are never deleted.
6194
5563
' deleting them.'),
6195
5564
Option('force', help='Do not prompt before deleting.')]
6196
5565
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6197
force=False, directory=u'.'):
6198
5567
from bzrlib.clean_tree import clean_tree
6199
5568
if not (unknown or ignored or detritus):
6203
clean_tree(directory, unknown=unknown, ignored=ignored,
6204
detritus=detritus, dry_run=dry_run, no_prompt=force)
6207
class cmd_reference(Command):
6208
__doc__ = """list, view and set branch locations for nested trees.
6210
If no arguments are provided, lists the branch locations for nested trees.
6211
If one argument is provided, display the branch location for that tree.
6212
If two arguments are provided, set the branch location for that tree.
6217
takes_args = ['path?', 'location?']
6219
def run(self, path=None, location=None):
6221
if path is not None:
6223
tree, branch, relpath =(
6224
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6225
if path is not None:
6228
tree = branch.basis_tree()
6230
info = branch._get_all_reference_info().iteritems()
6231
self._display_reference_info(tree, branch, info)
5572
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5573
dry_run=dry_run, no_prompt=force)
5576
def _create_prefix(cur_transport):
5577
needed = [cur_transport]
5578
# Recurse upwards until we can create a directory successfully
5580
new_transport = cur_transport.clone('..')
5581
if new_transport.base == cur_transport.base:
5582
raise errors.BzrCommandError(
5583
"Failed to create path prefix for %s."
5584
% cur_transport.base)
5586
new_transport.mkdir('.')
5587
except errors.NoSuchFile:
5588
needed.append(new_transport)
5589
cur_transport = new_transport
6233
file_id = tree.path2id(path)
6235
raise errors.NotVersionedError(path)
6236
if location is None:
6237
info = [(file_id, branch.get_reference_info(file_id))]
6238
self._display_reference_info(tree, branch, info)
6240
branch.set_reference_info(file_id, path, location)
6242
def _display_reference_info(self, tree, branch, info):
6244
for file_id, (path, location) in info:
6246
path = tree.id2path(file_id)
6247
except errors.NoSuchId:
6249
ref_list.append((path, location))
6250
for path, location in sorted(ref_list):
6251
self.outf.write('%s %s\n' % (path, location))
6254
class cmd_export_pot(Command):
6255
__doc__ = """Export command helps and error messages in po format."""
6260
from bzrlib.export_pot import export_pot
6261
export_pot(self.outf)
6264
def _register_lazy_builtins():
6265
# register lazy builtins from other modules; called at startup and should
6266
# be only called once.
6267
for (name, aliases, module_name) in [
6268
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6269
('cmd_config', [], 'bzrlib.config'),
6270
('cmd_dpush', [], 'bzrlib.foreign'),
6271
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6272
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6273
('cmd_conflicts', [], 'bzrlib.conflicts'),
6274
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6275
('cmd_verify_signatures', [],
6276
'bzrlib.commit_signature_commands'),
6277
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6279
builtin_command_registry.register_lazy(name, aliases, module_name)
5592
# Now we only need to create child directories
5594
cur_transport = needed.pop()
5595
cur_transport.ensure_base()
5598
# these get imported and then picked up by the scan for cmd_*
5599
# TODO: Some more consistent way to split command definitions across files;
5600
# we do need to load at least some information about them to know of
5601
# aliases. ideally we would avoid loading the implementation until the
5602
# details were needed.
5603
from bzrlib.cmd_version_info import cmd_version_info
5604
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5605
from bzrlib.bundle.commands import (
5608
from bzrlib.sign_my_commits import cmd_sign_my_commits
5609
from bzrlib.weave_commands import cmd_versionedfile_list, \
5610
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
