174
155
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
157
if file_list is None or len(file_list) == 0:
158
tree = WorkingTree.open_containing(default_branch)[0]
159
if tree.supports_views() and apply_view:
160
view_files = tree.views.lookup_view()
162
file_list = view_files
163
view_str = views.view_display_str(view_files)
164
note("Ignoring files outside view. View is %s" % view_str)
165
return tree, file_list
166
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
167
return tree, safe_relpath_files(tree, file_list, canonicalize,
168
apply_view=apply_view)
171
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
172
"""Convert file_list into a list of relpaths in tree.
174
:param tree: A tree to operate on.
175
:param file_list: A list of user provided paths or None.
176
:param apply_view: if True and a view is set, apply it or check that
177
specified files are within it
178
:return: A list of relative paths.
179
:raises errors.PathNotChild: When a provided path is in a different tree
182
if file_list is None:
184
if tree.supports_views() and apply_view:
185
view_files = tree.views.lookup_view()
189
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
190
# doesn't - fix that up here before we enter the loop.
192
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
195
for filename in file_list:
197
relpath = fixer(osutils.dereference_path(filename))
198
if view_files and not osutils.is_inside_any(view_files, relpath):
199
raise errors.FileOutsideView(filename, view_files)
200
new_list.append(relpath)
201
except errors.PathNotChild:
202
raise errors.FileInWrongBranch(tree.branch, filename)
182
206
def _get_view_info_for_change_reporter(tree):
319
321
takes_args = ['revision_id?']
320
takes_options = ['directory', 'revision']
322
takes_options = ['revision']
321
323
# cat-revision is more for frontends so should be exact
322
324
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'.'):
327
def run(self, revision_id=None, revision=None):
334
328
if revision_id is not None and revision is not None:
335
329
raise errors.BzrCommandError('You can only supply one of'
336
330
' revision_id or --revision')
337
331
if revision_id is None and revision is None:
338
332
raise errors.BzrCommandError('You must supply either'
339
333
' --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()
334
b = WorkingTree.open_containing(u'.')[0].branch
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
340
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (b.repository.base,
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
348
raise errors.BzrCommandError('You cannot specify a NULL'
350
rev_id = rev.as_revision_id(b)
351
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
354
class cmd_dump_btree(Command):
371
__doc__ = """Dump the contents of a btree index file to stdout.
355
"""Dump the contents of a btree index file to stdout.
373
357
PATH is a btree index file, it can be any URL. This includes things like
374
358
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
434
To re-create the working tree, use "bzr checkout".
462
436
_see_also = ['checkout', 'working-trees']
463
takes_args = ['location*']
437
takes_args = ['location?']
464
438
takes_options = [
466
440
help='Remove the working tree even if it has '
467
'uncommitted or shelved changes.'),
441
'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)
444
def run(self, location='.', force=False):
445
d = bzrdir.BzrDir.open(location)
448
working = d.open_workingtree()
449
except errors.NoWorkingTree:
450
raise errors.BzrCommandError("No working tree to remove")
451
except errors.NotLocalUrl:
452
raise errors.BzrCommandError("You cannot remove the working tree"
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'
455
# XXX: What about pending merges ? -- vila 20090629
456
if working.has_changes(working.basis_tree()):
457
raise errors.UncommittedChanges(working)
459
working_path = working.bzrdir.root_transport.base
460
branch_path = working.branch.bzrdir.root_transport.base
461
if working_path != branch_path:
462
raise errors.BzrCommandError("You cannot remove the working tree"
463
" from a lightweight checkout")
465
d.destroy_workingtree()
550
468
class cmd_revno(Command):
551
__doc__ = """Show current revision number.
469
"""Show current revision number.
553
471
This is equal to the number of revisions on this branch.
566
484
wt = WorkingTree.open_containing(location)[0]
567
self.add_cleanup(wt.lock_read().unlock)
568
486
except (errors.NoWorkingTree, errors.NotLocalUrl):
569
487
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)
489
revid = wt.last_revision()
491
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
492
except errors.NoSuchRevision:
494
revno = ".".join(str(n) for n in revno_t)
577
498
b = Branch.open_containing(location)[0]
578
self.add_cleanup(b.lock_read().unlock)
581
505
self.outf.write(str(revno) + '\n')
584
508
class cmd_revision_info(Command):
585
__doc__ = """Show revision number and revision id for a given revision identifier.
509
"""Show revision number and revision id for a given revision identifier.
588
512
takes_args = ['revision_info*']
589
513
takes_options = [
591
custom_help('directory',
592
516
help='Branch to examine, '
593
'rather than the one containing the working directory.'),
517
'rather than the one containing the working directory.',
594
521
Option('tree', help='Show revno of working tree'),
602
529
wt = WorkingTree.open_containing(directory)[0]
604
self.add_cleanup(wt.lock_read().unlock)
605
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
607
534
b = Branch.open_containing(directory)[0]
608
self.add_cleanup(b.lock_read().unlock)
610
if revision is not None:
611
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
612
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())
538
if revision is not None:
539
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
540
if revision_info_list is not None:
541
for rev_str in revision_info_list:
542
rev_spec = RevisionSpec.from_string(rev_str)
543
revision_ids.append(rev_spec.as_revision_id(b))
544
# No arguments supplied, default to the last revision
545
if len(revision_ids) == 0:
548
raise errors.NoWorkingTree(directory)
549
revision_ids.append(wt.last_revision())
551
revision_ids.append(b.last_revision())
555
for revision_id in revision_ids:
557
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
558
revno = '.'.join(str(i) for i in dotted_revno)
559
except errors.NoSuchRevision:
561
maxlen = max(maxlen, len(revno))
562
revinfos.append([revno, revision_id])
623
revision_ids.append(b.last_revision())
627
for revision_id in revision_ids:
629
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
630
revno = '.'.join(str(i) for i in dotted_revno)
631
except errors.NoSuchRevision:
633
maxlen = max(maxlen, len(revno))
634
revinfos.append([revno, revision_id])
637
569
for ri in revinfos:
638
570
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
641
573
class cmd_add(Command):
642
__doc__ = """Add specified files or directories.
574
"""Add specified files or directories.
644
576
In non-recursive mode, all the named items are added, regardless
645
577
of whether they were previously ignored. A warning is given if
787
718
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
789
720
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()
721
work_tree, file_list = tree_files(file_list)
722
work_tree.lock_read()
724
if revision is not None:
725
tree = revision.as_tree(work_tree.branch)
727
extra_trees = [work_tree]
733
if file_list is not None:
734
file_ids = tree.paths2ids(file_list, trees=extra_trees,
735
require_versioned=True)
736
# find_ids_across_trees may include some paths that don't
738
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
739
for file_id in file_ids if file_id in tree)
741
entries = tree.inventory.entries()
744
if tree is not work_tree:
813
747
for path, entry in entries:
814
748
if kind and kind != entry.kind:
952
890
dest = osutils.pathjoin(dest_parent, dest_tail)
953
891
mutter("attempting to move %s => %s", src, dest)
954
892
tree.rename_one(src, dest, after=after)
956
self.outf.write("%s => %s\n" % (src, dest))
893
self.outf.write("%s => %s\n" % (src, dest))
959
896
class cmd_pull(Command):
960
__doc__ = """Turn this branch into a mirror of another branch.
897
"""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
899
This command only works on branches that have not diverged. Branches are
900
considered diverged if the destination branch's most recent commit is one
901
that has not been merged (directly or indirectly) into the parent.
967
903
If branches have diverged, you can use 'bzr merge' to integrate the changes
968
904
from one into the other. Once one branch has merged, the other should
969
905
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.
907
If you want to forget your local changes and just update your branch to
908
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.
910
If there is no default location set, the first pull will set it. After
911
that, you can omit the location to use the default. To change the
912
default, use --remember. The value will only be saved if the remote
913
location can be accessed.
980
915
Note: The location can be specified either in the form of a branch,
981
916
or in the form of a path to a file containing a merge directive generated
986
921
takes_options = ['remember', 'overwrite', 'revision',
987
922
custom_help('verbose',
988
923
help='Show logs of pulled revisions.'),
989
custom_help('directory',
990
925
help='Branch to pull into, '
991
'rather than the one containing the working directory.'),
926
'rather than the one containing the working directory.',
993
931
help="Perform a local pull in a bound "
994
932
"branch. Local pulls are not applied to "
995
933
"the master branch."
998
help="Show base revision text in conflicts.")
1000
936
takes_args = ['location?']
1001
937
encoding_type = 'replace'
1003
def run(self, location=None, remember=None, overwrite=False,
939
def run(self, location=None, remember=False, overwrite=False,
1004
940
revision=None, verbose=False,
1005
directory=None, local=False,
941
directory=None, local=False):
1007
942
# FIXME: too much stuff is in the command class
1008
943
revision_id = None
1009
944
mergeable = None
1057
987
branch_from = Branch.open(location,
1058
988
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)):
990
if branch_to.get_parent() is None or remember:
1063
991
branch_to.set_parent(branch_from.base)
1065
if revision is not None:
1066
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)
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):
993
if branch_from is not branch_to:
994
branch_from.lock_read()
996
if revision is not None:
997
revision_id = revision.as_revision_id(branch_from)
999
branch_to.lock_write()
1001
if tree_to is not None:
1002
view_info = _get_view_info_for_change_reporter(tree_to)
1003
change_reporter = delta._ChangeReporter(
1004
unversioned_filter=tree_to.is_ignored,
1005
view_info=view_info)
1006
result = tree_to.pull(
1007
branch_from, overwrite, revision_id, change_reporter,
1008
possible_transports=possible_transports, local=local)
1010
result = branch_to.pull(
1011
branch_from, overwrite, revision_id, local=local)
1013
result.report(self.outf)
1014
if verbose and result.old_revid != result.new_revid:
1015
log.show_branch_change(
1016
branch_to, self.outf, result.old_revno,
1021
if branch_from is not branch_to:
1022
branch_from.unlock()
1092
1025
class cmd_push(Command):
1093
__doc__ = """Update a mirror of this branch.
1026
"""Update a mirror of this branch.
1095
1028
The target branch will not have its working tree populated because this
1096
1029
is both expensive, and is not supported on remote file systems.
1157
1090
# Get the source branch
1158
1091
(tree, br_from,
1159
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1160
1096
# Get the tip's revision_id
1161
1097
revision = _get_one_revision('push', revision)
1162
1098
if revision is not None:
1163
1099
revision_id = revision.in_history(br_from).rev_id
1165
1101
revision_id = None
1166
if tree is not None and revision_id is None:
1167
tree.check_changed_or_out_of_date(
1168
strict, 'push_strict',
1169
more_error='Use --no-strict to force the push.',
1170
more_warning='Uncommitted changes will not be pushed.')
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes(tree.basis_tree())
1104
or len(tree.get_parent_ids()) > 1):
1105
raise errors.UncommittedChanges(
1106
tree, more='Use --no-strict to force the push.')
1107
if tree.last_revision() != tree.branch.last_revision():
1108
# The tree has lost sync with its branch, there is little
1109
# chance that the user is aware of it but he can still force
1110
# the push with --no-strict
1111
raise errors.OutOfDateTree(
1112
tree, more='Use --no-strict to force the push.')
1171
1114
# Get the stacked_on branch, if any
1172
1115
if stacked_on is not None:
1173
1116
stacked_on = urlutils.normalize_url(stacked_on)
1242
1178
' directory exists, but does not already'
1243
1179
' have a control directory. This flag will'
1244
1180
' allow branch to proceed.'),
1246
help="Bind new branch to from location."),
1248
1182
aliases = ['get', 'clone']
1250
1184
def run(self, from_location, to_location=None, revision=None,
1251
1185
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
1186
use_existing_dir=False):
1255
1187
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
1189
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
1191
if (accelerator_tree is not None and
1192
accelerator_tree.supports_content_filtering()):
1268
1193
accelerator_tree = None
1269
if files_from is not None and files_from != from_location:
1270
accelerator_tree = WorkingTree.open(files_from)
1271
1194
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)
1197
if revision is not None:
1198
revision_id = revision.as_revision_id(br_from)
1291
bzrdir.BzrDir.open_from_transport(to_transport)
1292
except errors.NotBranchError:
1200
# FIXME - wt.last_revision, fallback to branch, fall back to
1201
# None or perhaps NULL_REVISION to mean copy nothing
1203
revision_id = br_from.last_revision()
1204
if to_location is None:
1205
to_location = urlutils.derive_to_location(from_location)
1206
to_transport = transport.get_transport(to_location)
1208
to_transport.mkdir('.')
1209
except errors.FileExists:
1210
if not use_existing_dir:
1211
raise errors.BzrCommandError('Target directory "%s" '
1212
'already exists.' % to_location)
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'))
1215
bzrdir.BzrDir.open_from_transport(to_transport)
1216
except errors.NotBranchError:
1219
raise errors.AlreadyBranchError(to_location)
1220
except errors.NoSuchFile:
1221
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1224
# preserve whatever source format we have.
1225
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1226
possible_transports=[to_transport],
1227
accelerator_tree=accelerator_tree,
1228
hardlink=hardlink, stacked=stacked,
1229
force_new_repo=standalone,
1230
create_tree_if_local=not no_tree,
1231
source_branch=br_from)
1232
branch = dir.open_branch()
1233
except errors.NoSuchRevision:
1234
to_transport.delete_tree('.')
1235
msg = "The branch %s has no revision %s." % (from_location,
1237
raise errors.BzrCommandError(msg)
1238
_merge_tags_if_possible(br_from, branch)
1239
# If the source branch is stacked, the new branch may
1240
# be stacked whether we asked for that explicitly or not.
1241
# We therefore need a try/except here and not just 'if stacked:'
1243
note('Created new stacked branch referring to %s.' %
1244
branch.get_stacked_on_url())
1245
except (errors.NotStacked, errors.UnstackableBranchFormat,
1246
errors.UnstackableRepositoryFormat), e:
1247
note('Branched %d revision(s).' % branch.revno())
1337
1252
class cmd_checkout(Command):
1338
__doc__ = """Create a new checkout of an existing branch.
1253
"""Create a new checkout of an existing branch.
1340
1255
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1341
1256
the branch found in '.'. This is useful if you have removed the working tree
1420
1330
@display_command
1421
1331
def run(self, dir=u'.'):
1422
1332
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))
1335
new_inv = tree.inventory
1336
old_tree = tree.basis_tree()
1337
old_tree.lock_read()
1339
old_inv = old_tree.inventory
1341
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1342
for f, paths, c, v, p, n, k, e in iterator:
1343
if paths[0] == paths[1]:
1347
renames.append(paths)
1349
for old_name, new_name in renames:
1350
self.outf.write("%s => %s\n" % (old_name, new_name))
1441
1357
class cmd_update(Command):
1442
__doc__ = """Update a tree to have the latest code committed to its branch.
1358
"""Update a tree to have the latest code committed to its branch.
1444
1360
This will perform a merge into the working tree, and may generate
1445
1361
conflicts. If you have any local changes, you will still
1448
1364
If you want to discard your local changes, you can just do a
1449
1365
'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
1368
_see_also = ['pull', 'working-trees', 'status-flags']
1459
1369
takes_args = ['dir?']
1460
takes_options = ['revision',
1462
help="Show base revision text in conflicts."),
1464
1370
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")
1372
def run(self, dir='.'):
1470
1373
tree = WorkingTree.open_containing(dir)[0]
1471
branch = tree.branch
1472
1374
possible_transports = []
1473
master = branch.get_master_branch(
1375
master = tree.branch.get_master_branch(
1474
1376
possible_transports=possible_transports)
1475
1377
if master is not None:
1476
branch_location = master.base
1477
1378
tree.lock_write()
1479
branch_location = tree.branch.base
1480
1380
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)
1382
existing_pending_merges = tree.get_parent_ids()[1:]
1383
last_rev = _mod_revision.ensure_null(tree.last_revision())
1384
if last_rev == _mod_revision.ensure_null(
1385
tree.branch.last_revision()):
1386
# may be up to date, check master too.
1387
if master is None or last_rev == _mod_revision.ensure_null(
1388
master.last_revision()):
1389
revno = tree.branch.revision_id_to_revno(last_rev)
1390
note("Tree is up to date at revision %d." % (revno,))
1392
view_info = _get_view_info_for_change_reporter(tree)
1508
1393
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'.")
1394
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1395
view_info=view_info), possible_transports=possible_transports)
1396
revno = tree.branch.revision_id_to_revno(
1397
_mod_revision.ensure_null(tree.last_revision()))
1398
note('Updated to revision %d.' % (revno,))
1399
if tree.get_parent_ids()[1:] != existing_pending_merges:
1400
note('Your local commits will now show as pending merges with '
1401
"'bzr status', and can be committed with 'bzr commit'.")
1534
1410
class cmd_info(Command):
1535
__doc__ = """Show information about a working tree, branch or repository.
1411
"""Show information about a working tree, branch or repository.
1537
1413
This command will show all known locations and formats associated to the
1538
1414
tree, branch or repository.
1590
1465
RegistryOption.from_kwargs('file-deletion-strategy',
1591
1466
'The file deletion mode to be used.',
1592
1467
title='Deletion Strategy', value_switches=True, enum_switch=False,
1593
safe='Backup changed files (default).',
1468
safe='Only delete files if they can be'
1469
' safely recovered (default).',
1594
1470
keep='Delete from bzr but leave the working copy.',
1595
no_backup='Don\'t backup changed files.',
1596
1471
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)')]
1472
'recovered and even if they are non-empty directories.')]
1599
1473
aliases = ['rm', 'del']
1600
1474
encoding_type = 'replace'
1602
1476
def run(self, file_list, verbose=False, new=False,
1603
1477
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)
1478
tree, file_list = tree_files(file_list)
1611
1480
if file_list is not None:
1612
1481
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'))
1485
# Heuristics should probably all move into tree.remove_smart or
1488
added = tree.changes_from(tree.basis_tree(),
1489
specific_files=file_list).added
1490
file_list = sorted([f[0] for f in added], reverse=True)
1491
if len(file_list) == 0:
1492
raise errors.BzrCommandError('No matching files.')
1493
elif file_list is None:
1494
# missing files show up in iter_changes(basis) as
1495
# versioned-with-no-kind.
1497
for change in tree.iter_changes(tree.basis_tree()):
1498
# Find paths in the working tree that have no kind:
1499
if change[1][1] is not None and change[6][1] is None:
1500
missing.append(change[1][1])
1501
file_list = sorted(missing, reverse=True)
1502
file_deletion_strategy = 'keep'
1503
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1504
keep_files=file_deletion_strategy=='keep',
1505
force=file_deletion_strategy=='force')
1638
1510
class cmd_file_id(Command):
1639
__doc__ = """Print file_id of a particular file or directory.
1511
"""Print file_id of a particular file or directory.
1641
1513
The file_id is assigned when the file is first added and remains the
1642
1514
same through all revisions where the file exists, even when it is
2077
1889
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2078
1890
' 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()
1892
old_tree, new_tree, specific_files, extra_trees = \
1893
_get_trees_to_diff(file_list, revision, old, new,
2090
1895
return show_diff_trees(old_tree, new_tree, sys.stdout,
2091
1896
specific_files=specific_files,
2092
1897
external_diff_options=diff_options,
2093
1898
old_label=old_label, new_label=new_label,
2094
extra_trees=extra_trees,
2095
path_encoding=path_encoding,
1899
extra_trees=extra_trees, using=using)
2100
1902
class cmd_deleted(Command):
2101
__doc__ = """List files deleted in the working tree.
1903
"""List files deleted in the working tree.
2103
1905
# TODO: Show files deleted since a previous revision, or
2104
1906
# between two revisions.
2107
1909
# level of effort but possibly much less IO. (Or possibly not,
2108
1910
# if the directories are very large...)
2109
1911
_see_also = ['status', 'ls']
2110
takes_options = ['directory', 'show-ids']
1912
takes_options = ['show-ids']
2112
1914
@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')
1915
def run(self, show_ids=False):
1916
tree = WorkingTree.open_containing(u'.')[0]
1919
old = tree.basis_tree()
1922
for path, ie in old.inventory.iter_entries():
1923
if not tree.has_id(ie.file_id):
1924
self.outf.write(path)
1926
self.outf.write(' ')
1927
self.outf.write(ie.file_id)
1928
self.outf.write('\n')
2127
1935
class cmd_modified(Command):
2128
__doc__ = """List files modified in working tree.
1936
"""List files modified in working tree.
2132
1940
_see_also = ['status', 'ls']
2133
takes_options = ['directory', 'null']
1943
help='Write an ascii NUL (\\0) separator '
1944
'between files rather than a newline.')
2135
1947
@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)
1948
def run(self, null=False):
1949
tree = WorkingTree.open_containing(u'.')[0]
2139
1950
td = tree.changes_from(tree.basis_tree())
2141
1951
for path, id, kind, text_modified, meta_modified in td.modified:
2143
1953
self.outf.write(path + '\0')
2148
1958
class cmd_added(Command):
2149
__doc__ = """List files added in working tree.
1959
"""List files added in working tree.
2153
1963
_see_also = ['status', 'ls']
2154
takes_options = ['directory', 'null']
1966
help='Write an ascii NUL (\\0) separator '
1967
'between files rather than a newline.')
2156
1970
@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')
1971
def run(self, null=False):
1972
wt = WorkingTree.open_containing(u'.')[0]
1975
basis = wt.basis_tree()
1978
basis_inv = basis.inventory
1981
if file_id in basis_inv:
1983
if inv.is_root(file_id) and len(basis_inv) == 0:
1985
path = inv.id2path(file_id)
1986
if not os.access(osutils.abspath(path), os.F_OK):
1989
self.outf.write(path + '\0')
1991
self.outf.write(osutils.quotefn(path) + '\n')
2178
1998
class cmd_root(Command):
2179
__doc__ = """Show the tree root directory.
1999
"""Show the tree root directory.
2181
2001
The root is the nearest enclosing directory with a .bzr control
2318
2138
:Other filtering:
2320
The --match option can be used for finding revisions that match a
2321
regular expression in a commit message, committer, author or bug.
2322
Specifying the option several times will match any of the supplied
2323
expressions. --match-author, --match-bugs, --match-committer and
2324
--match-message can be used to only match a specific field.
2140
The --message option can be used for finding revisions that match a
2141
regular expression in a commit message.
2326
2143
:Tips & tricks:
2328
2145
GUI tools and IDEs are often better at exploring history than command
2329
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2330
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2331
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2332
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2146
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2147
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2148
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2150
Web interfaces are often better at exploring history than command line
2151
tools, particularly for branches on servers. You may prefer Loggerhead
2152
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2334
2154
You may find it useful to add the aliases below to ``bazaar.conf``::
2532
2299
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)
2303
# Build the log formatter
2304
if log_format is None:
2305
log_format = log.log_formatter_registry.get_default(b)
2306
lf = log_format(show_ids=show_ids, to_file=self.outf,
2307
show_timezone=timezone,
2308
delta_format=get_verbosity_level(),
2310
show_advice=levels is None)
2312
# Choose the algorithm for doing the logging. It's annoying
2313
# having multiple code paths like this but necessary until
2314
# the underlying repository format is faster at generating
2315
# deltas or can provide everything we need from the indices.
2316
# The default algorithm - match-using-deltas - works for
2317
# multiple files and directories and is faster for small
2318
# amounts of history (200 revisions say). However, it's too
2319
# slow for logging a single file in a repository with deep
2320
# history, i.e. > 10K revisions. In the spirit of "do no
2321
# evil when adding features", we continue to use the
2322
# original algorithm - per-file-graph - for the "single
2323
# file that isn't a directory without showing a delta" case.
2324
partial_history = revision and b.repository._format.supports_chks
2325
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2326
or delta_type or partial_history)
2328
# Build the LogRequest and execute it
2329
if len(file_ids) == 0:
2331
rqst = make_log_request_dict(
2332
direction=direction, specific_fileids=file_ids,
2333
start_revision=rev1, end_revision=rev2, limit=limit,
2334
message_search=message, delta_type=delta_type,
2335
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2336
Logger(b, rqst).show(lf)
2589
2341
def _get_revision_range(revisionspec_list, branch, command_name):
2678
2424
help='Recurse into subdirectories.'),
2679
2425
Option('from-root',
2680
2426
help='Print paths relative to the root of the branch.'),
2681
Option('unknown', short_name='u',
2682
help='Print unknown files.'),
2427
Option('unknown', help='Print unknown files.'),
2683
2428
Option('versioned', help='Print versioned files.',
2684
2429
short_name='V'),
2685
Option('ignored', short_name='i',
2686
help='Print ignored files.'),
2687
Option('kind', short_name='k',
2430
Option('ignored', help='Print ignored files.'),
2432
help='Write an ascii NUL (\\0) separator '
2433
'between files rather than a newline.'),
2688
2435
help='List entries of a particular kind: file, directory, symlink.',
2694
2439
@display_command
2695
2440
def run(self, revision=None, verbose=False,
2696
2441
recursive=False, from_root=False,
2697
2442
unknown=False, versioned=False, ignored=False,
2698
null=False, kind=None, show_ids=False, path=None, directory=None):
2443
null=False, kind=None, show_ids=False, path=None):
2700
2445
if kind and kind not in ('file', 'directory', 'symlink'):
2701
2446
raise errors.BzrCommandError('invalid kind specified')
2735
2480
view_str = views.view_display_str(view_files)
2736
2481
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:
2485
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2486
from_dir=relpath, recursive=recursive):
2487
# Apply additional masking
2488
if not all and not selection[fc]:
2490
if kind is not None and fkind != kind:
2495
fullpath = osutils.pathjoin(relpath, fp)
2498
views.check_path_in_view(tree, fullpath)
2499
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))
2504
fp = osutils.pathjoin(prefix, fp)
2505
kindch = entry.kind_character()
2506
outstring = fp + kindch
2507
ui.ui_factory.clear_term()
2509
outstring = '%-8s %s' % (fc, outstring)
2510
if show_ids and fid is not None:
2511
outstring = "%-50s %s" % (outstring, fid)
2782
2512
self.outf.write(outstring + '\n')
2514
self.outf.write(fp + '\0')
2517
self.outf.write(fid)
2518
self.outf.write('\0')
2526
self.outf.write('%-50s %s\n' % (outstring, my_id))
2528
self.outf.write(outstring + '\n')
2785
2533
class cmd_unknowns(Command):
2786
__doc__ = """List unknown files.
2534
"""List unknown files.
2790
2538
_see_also = ['ls']
2791
takes_options = ['directory']
2793
2540
@display_command
2794
def run(self, directory=u'.'):
2795
for f in WorkingTree.open_containing(directory)[0].unknowns():
2542
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2796
2543
self.outf.write(osutils.quotefn(f) + '\n')
2799
2546
class cmd_ignore(Command):
2800
__doc__ = """Ignore specified files or patterns.
2547
"""Ignore specified files or patterns.
2802
2549
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
2551
To remove patterns from the ignore list, edit the .bzrignore file.
2811
2552
After adding, editing or deleting that file either indirectly by
2812
2553
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.
2556
Note: ignore patterns containing shell wildcards must be quoted from
2837
2560
Ignore the top level Makefile::
2839
2562
bzr ignore ./Makefile
2841
Ignore .class files in all directories...::
2564
Ignore class files in all directories::
2843
2566
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
2568
Ignore .o files under the lib directory::
2855
2570
bzr ignore "lib/**/*.o"
2861
2576
Ignore everything but the "debian" toplevel directory::
2863
2578
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
2581
_see_also = ['status', 'ignored', 'patterns']
2874
2582
takes_args = ['name_pattern*']
2875
takes_options = ['directory',
2876
Option('default-rules',
2877
help='Display the default ignore rules that bzr uses.')
2584
Option('old-default-rules',
2585
help='Write out the ignore rules bzr < 0.9 always used.')
2880
def run(self, name_pattern_list=None, default_rules=None,
2588
def run(self, name_pattern_list=None, old_default_rules=None):
2882
2589
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)
2590
if old_default_rules is not None:
2591
# dump the rules and exit
2592
for pattern in ignores.OLD_DEFAULTS:
2888
2595
if not name_pattern_list:
2889
2596
raise errors.BzrCommandError("ignore requires at least one "
2890
"NAME_PATTERN or --default-rules.")
2597
"NAME_PATTERN or --old-default-rules")
2891
2598
name_pattern_list = [globbing.normalize_pattern(p)
2892
2599
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
2600
for name_pattern in name_pattern_list:
2902
2601
if (name_pattern[0] == '/' or
2903
2602
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2904
2603
raise errors.BzrCommandError(
2905
2604
"NAME_PATTERN should not be an absolute path")
2906
tree, relpath = WorkingTree.open_containing(directory)
2605
tree, relpath = WorkingTree.open_containing(u'.')
2907
2606
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2908
2607
ignored = globbing.Globster(name_pattern_list)
2910
self.add_cleanup(tree.lock_read().unlock)
2911
2610
for entry in tree.list_files():
2913
2612
if id is not None:
2914
2613
filename = entry[0]
2915
2614
if ignored.match(filename):
2916
matches.append(filename)
2615
matches.append(filename.encode('utf-8'))
2917
2617
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),))
2618
print "Warning: the following files are version controlled and" \
2619
" match your ignore pattern:\n%s" \
2620
"\nThese files will continue to be version controlled" \
2621
" unless you 'bzr remove' them." % ("\n".join(matches),)
2924
2624
class cmd_ignored(Command):
2925
__doc__ = """List ignored files and the patterns that matched them.
2625
"""List ignored files and the patterns that matched them.
2927
2627
List all the ignored files and the ignore pattern that caused the file to
2935
2635
encoding_type = 'replace'
2936
2636
_see_also = ['ignore', 'ls']
2937
takes_options = ['directory']
2939
2638
@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))
2640
tree = WorkingTree.open_containing(u'.')[0]
2643
for path, file_class, kind, file_id, entry in tree.list_files():
2644
if file_class != 'I':
2646
## XXX: Slightly inefficient since this was already calculated
2647
pat = tree.is_ignored(path)
2648
self.outf.write('%-50s %s\n' % (path, pat))
2951
2653
class cmd_lookup_revision(Command):
2952
__doc__ = """Lookup the revision-id from a revision-number
2654
"""Lookup the revision-id from a revision-number
2955
2657
bzr lookup-revision 33
2958
2660
takes_args = ['revno']
2959
takes_options = ['directory']
2961
2662
@display_command
2962
def run(self, revno, directory=u'.'):
2663
def run(self, revno):
2964
2665
revno = int(revno)
2965
2666
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)
2667
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2669
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2972
2672
class cmd_export(Command):
2973
__doc__ = """Export current or past revision to a destination directory or archive.
2673
"""Export current or past revision to a destination directory or archive.
2975
2675
If no revision is specified this exports the last committed revision.
3055
2750
@display_command
3056
2751
def run(self, filename, revision=None, name_from_revision=False,
3057
filters=False, directory=None):
3058
2753
if revision is not None and len(revision) != 1:
3059
2754
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3060
2755
" one revision specifier")
3061
2756
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)
2757
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2760
return self._run(tree, branch, relpath, filename, revision,
2761
name_from_revision, filters)
3067
2765
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3069
2767
if tree is None:
3070
2768
tree = b.basis_tree()
3071
2769
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3072
self.add_cleanup(rev_tree.lock_read().unlock)
3074
2771
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
2773
if name_from_revision:
3081
2774
# Try in revision if requested
3082
2775
if old_file_id is None:
3084
2777
"%r is not present in revision %s" % (
3085
2778
filename, rev_tree.get_revision_id()))
3087
actual_file_id = old_file_id
2780
content = rev_tree.get_file_text(old_file_id)
3089
2782
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
2784
if cur_file_id is not None:
2785
# Then try with the actual file id
2787
content = rev_tree.get_file_text(cur_file_id)
2789
except errors.NoSuchId:
2790
# The actual file id didn't exist at that time
2792
if not found and old_file_id is not None:
2793
# Finally try with the old file id
2794
content = rev_tree.get_file_text(old_file_id)
2797
# Can't be found anywhere
3095
2798
raise errors.BzrCommandError(
3096
2799
"%r is not present in revision %s" % (
3097
2800
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)
2802
from bzrlib.filters import (
2803
ContentFilterContext,
2804
filtered_output_bytes,
2806
filters = rev_tree._content_filter_stack(relpath)
2807
chunks = content.splitlines(True)
2808
content = filtered_output_bytes(chunks, filters,
2809
ContentFilterContext(relpath, rev_tree))
2810
self.outf.writelines(content)
3104
content = rev_tree.get_file_text(actual_file_id)
3106
self.outf.write(content)
2812
self.outf.write(content)
3109
2815
class cmd_local_time_offset(Command):
3110
__doc__ = """Show the offset in seconds from GMT to local time."""
2816
"""Show the offset in seconds from GMT to local time."""
3112
2818
@display_command
3114
self.outf.write("%s\n" % osutils.local_time_offset())
2820
print osutils.local_time_offset()
3118
2824
class cmd_commit(Command):
3119
__doc__ = """Commit changes into a new revision.
2825
"""Commit changes into a new revision.
3121
2827
An explanatory message needs to be given for each commit. This is
3122
2828
often done by using the --message option (getting the message from the
3170
2876
to trigger updates to external systems like bug trackers. The --fixes
3171
2877
option can be used to record the association between a revision and
3172
2878
one or more bugs. See ``bzr help bugs`` for details.
2880
A selective commit may fail in some cases where the committed
2881
tree would be invalid. Consider::
2886
bzr commit foo -m "committing foo"
2887
bzr mv foo/bar foo/baz
2890
bzr commit foo/bar -m "committing bar but not baz"
2892
In the example above, the last commit will fail by design. This gives
2893
the user the opportunity to decide whether they want to commit the
2894
rename at the same time, separately first, or not at all. (As a general
2895
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2897
# TODO: Run hooks on tree to-be-committed, and after commit.
2899
# TODO: Strict commit that fails if there are deleted files.
2900
# (what does "deleted files" mean ??)
2902
# TODO: Give better message for -s, --summary, used by tla people
2904
# XXX: verbose currently does nothing
3175
2906
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3176
2907
takes_args = ['selected*']
3277
2997
if local and not tree.branch.get_bound_location():
3278
2998
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
3000
def get_message(commit_obj):
3302
3001
"""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,
3002
my_message = message
3003
if my_message is None and not file:
3004
t = make_commit_message_template_encoded(tree,
3315
3005
selected_list, diff=show_diff,
3316
3006
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)
3007
start_message = generate_commit_message_template(commit_obj)
3008
my_message = edit_commit_message_encoded(t,
3009
start_message=start_message)
3327
3010
if my_message is None:
3328
3011
raise errors.BzrCommandError("please specify a commit"
3329
3012
" message with either --message or --file")
3013
elif my_message and file:
3014
raise errors.BzrCommandError(
3015
"please specify either --message or --file")
3017
my_message = codecs.open(file, 'rt',
3018
osutils.get_user_encoding()).read()
3330
3019
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 \"\".")
3020
raise errors.BzrCommandError("empty commit message specified")
3335
3021
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
3024
tree.commit(message_callback=get_message,
3343
3025
specific_files=selected_list,
3344
3026
allow_pointless=unchanged, strict=strict, local=local,
3345
3027
reporter=None, verbose=verbose, revprops=properties,
3346
authors=author, timestamp=commit_stamp,
3348
exclude=tree.safe_relpath_files(exclude),
3029
exclude=safe_relpath_files(tree, exclude))
3350
3030
except PointlessCommit:
3031
# FIXME: This should really happen before the file is read in;
3032
# perhaps prepare the commit; get the message; then actually commit
3351
3033
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.")
3034
" Use --unchanged to commit anyhow.")
3354
3035
except ConflictsInTree:
3355
3036
raise errors.BzrCommandError('Conflicts detected in working '
3356
3037
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3439
3119
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/.
3120
"""Upgrade branch storage to current format.
3122
The check command or bzr developers may sometimes advise you to run
3123
this command. When the default format has changed you may also be warned
3124
during other operations to upgrade.
3472
_see_also = ['check', 'reconcile', 'formats']
3127
_see_also = ['check']
3473
3128
takes_args = ['url?']
3474
3129
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."),
3130
RegistryOption('format',
3131
help='Upgrade to a specific format. See "bzr help'
3132
' formats" for details.',
3133
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3134
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3135
value_switches=True, title='Branch format'),
3487
def run(self, url='.', format=None, clean=False, dry_run=False):
3138
def run(self, url='.', format=None):
3488
3139
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
3140
upgrade(url, format)
3498
3143
class cmd_whoami(Command):
3499
__doc__ = """Show or set bzr user id.
3144
"""Show or set bzr user id.
3502
3147
Show the email of the current user::
3518
3162
encoding_type = 'replace'
3520
3164
@display_command
3521
def run(self, email=False, branch=False, name=None, directory=None):
3165
def run(self, email=False, branch=False, name=None):
3522
3166
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()
3167
# use branch if we're inside one; otherwise global config
3169
c = Branch.open_containing('.')[0].get_config()
3170
except errors.NotBranchError:
3171
c = config.GlobalConfig()
3532
3173
self.outf.write(c.user_email() + '\n')
3534
3175
self.outf.write(c.username() + '\n')
3538
raise errors.BzrCommandError("--email can only be used to display existing "
3541
3178
# display a warning if an email address isn't included in the given name.
3543
_mod_config.extract_email_address(name)
3180
config.extract_email_address(name)
3544
3181
except errors.NoEmailInUsername, e:
3545
3182
warning('"%s" does not seem to contain an email address. '
3546
3183
'This is allowed, but not recommended.', name)
3548
3185
# 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()
3187
c = Branch.open_containing('.')[0].get_config()
3555
c = _mod_config.GlobalConfig()
3189
c = config.GlobalConfig()
3556
3190
c.set_user_option('email', name)
3559
3193
class cmd_nick(Command):
3560
__doc__ = """Print or set the branch nickname.
3194
"""Print or set the branch nickname.
3562
3196
If unset, the tree root directory name is used as the nickname.
3563
3197
To print the current nickname, execute with no argument.
3776
3403
def run(self, testspecs_list=None, verbose=False, one=False,
3777
3404
transport=None, benchmark=None,
3405
lsprof_timed=None, cache_dir=None,
3779
3406
first=False, list_only=False,
3780
3407
randomize=None, exclude=None, strict=False,
3781
3408
load_list=None, debugflag=None, starting_with=None, subunit=False,
3782
parallel=None, lsprof_tests=False):
3783
from bzrlib import tests
3410
from bzrlib.tests import selftest
3411
import bzrlib.benchmarks as benchmarks
3412
from bzrlib.benchmarks import tree_creator
3414
# Make deprecation warnings visible, unless -Werror is set
3415
symbol_versioning.activate_deprecation_warnings(override=False)
3417
if cache_dir is not None:
3418
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3785
3419
if testspecs_list is not None:
3786
3420
pattern = '|'.join(testspecs_list)
3793
3427
raise errors.BzrCommandError("subunit not available. subunit "
3794
3428
"needs to be installed to use --subunit.")
3795
3429
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
3431
self.additional_selftest_args.setdefault(
3807
3432
'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
3434
test_suite_factory = benchmarks.test_suite
3435
# Unless user explicitly asks for quiet, be verbose in benchmarks
3436
verbose = not is_quiet()
3437
# TODO: should possibly lock the history file...
3438
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(
3440
test_suite_factory = None
3839
result = tests.selftest(**selftest_kwargs)
3443
selftest_kwargs = {"verbose": verbose,
3445
"stop_on_failure": one,
3446
"transport": transport,
3447
"test_suite_factory": test_suite_factory,
3448
"lsprof_timed": lsprof_timed,
3449
"bench_history": benchfile,
3450
"matching_tests_first": first,
3451
"list_only": list_only,
3452
"random_seed": randomize,
3453
"exclude_pattern": exclude,
3455
"load_list": load_list,
3456
"debug_flags": debugflag,
3457
"starting_with": starting_with
3459
selftest_kwargs.update(self.additional_selftest_args)
3460
result = selftest(**selftest_kwargs)
3462
if benchfile is not None:
3842
3464
return int(not result)
3845
3467
class cmd_version(Command):
3846
__doc__ = """Show version of bzr."""
3468
"""Show version of bzr."""
3848
3470
encoding_type = 'replace'
3849
3471
takes_options = [
3883
3505
branch1 = Branch.open_containing(branch)[0]
3884
3506
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)
3511
last1 = ensure_null(branch1.last_revision())
3512
last2 = ensure_null(branch2.last_revision())
3514
graph = branch1.repository.get_graph(branch2.repository)
3515
base_rev_id = graph.find_unique_lca(last1, last2)
3517
print 'merge base is revision %s' % base_rev_id
3896
3524
class cmd_merge(Command):
3897
__doc__ = """Perform a three-way merge.
3525
"""Perform a three-way merge.
3899
3527
The source of the merge can be specified either in the form of a branch,
3900
3528
or in the form of a path to a file containing a merge directive generated
3901
3529
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.
3530
or the branch most recently merged using --remember.
3532
When merging a branch, by default the tip will be merged. To pick a different
3533
revision, pass --revision. If you specify two values, the first will be used as
3534
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3535
available revisions, like this is commonly referred to as "cherrypicking".
3537
Revision numbers are always relative to the branch being merged.
3539
By default, bzr will try to merge in all new work from the other
3540
branch, automatically determining an appropriate base. If this
3541
fails, you may need to give an explicit base.
3924
3543
Merge will do its best to combine the changes in two branches, but there
3925
3544
are some kinds of problems only a human can fix. When it encounters those,
3929
3548
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.
3550
If there is no default branch set, the first merge will set it. After
3551
that, you can omit the branch to use the default. To change the
3552
default, use --remember. The value will only be saved if the remote
3553
location can be accessed.
3936
3555
The results of the merge are placed into the destination working
3937
3556
directory, where they can be reviewed (with bzr diff), tested, and then
3938
3557
committed to record the result of the merge.
3940
3559
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
3562
To select only some changes to merge, use "merge -i", which will prompt
3951
3563
you to apply each diff hunk and file change, similar to "shelve".
3954
To merge all new revisions from bzr.dev::
3566
To merge the latest revision from bzr.dev::
3956
3568
bzr merge ../bzr.dev
4019
3627
allow_pending = True
4020
3628
verified = 'inapplicable'
4022
3629
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')
3631
# die as quickly as possible if there are uncommitted changes
4028
3633
basis_tree = tree.revision_tree(tree.last_revision())
4029
3634
except errors.NoSuchRevision:
4030
3635
basis_tree = tree.basis_tree()
4032
# die as quickly as possible if there are uncommitted changes
4034
if tree.has_changes():
3637
if tree.has_changes(basis_tree):
4035
3638
raise errors.UncommittedChanges(tree)
4037
3640
view_info = _get_view_info_for_change_reporter(tree)
4038
3641
change_reporter = delta._ChangeReporter(
4039
3642
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:
3645
pb = ui.ui_factory.nested_progress_bar()
3646
cleanups.append(pb.finished)
3648
cleanups.append(tree.unlock)
3649
if location is not None:
3651
mergeable = bundle.read_mergeable_from_url(location,
3652
possible_transports=possible_transports)
3653
except errors.NotABundle:
3657
raise errors.BzrCommandError('Cannot use --uncommitted'
3658
' with bundles or merge directives.')
3660
if revision is not None:
3661
raise errors.BzrCommandError(
3662
'Cannot use -r with merge directives or bundles')
3663
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3666
if merger is None and uncommitted:
3667
if revision is not None and len(revision) > 0:
3668
raise errors.BzrCommandError('Cannot use --uncommitted and'
3669
' --revision at the same time.')
3670
merger = self.get_merger_from_uncommitted(tree, location, pb,
3672
allow_pending = False
3675
merger, allow_pending = self._get_merger_from_branch(tree,
3676
location, revision, remember, possible_transports, pb)
3678
merger.merge_type = merge_type
3679
merger.reprocess = reprocess
3680
merger.show_base = show_base
3681
self.sanity_check_merger(merger)
3682
if (merger.base_rev_id == merger.other_rev_id and
3683
merger.other_rev_id is not None):
3684
note('Nothing to do.')
3687
if merger.interesting_files is not None:
3688
raise errors.BzrCommandError('Cannot pull individual files')
3689
if (merger.base_rev_id == tree.last_revision()):
3690
result = tree.pull(merger.other_branch, False,
3691
merger.other_rev_id)
3692
result.report(self.outf)
3694
merger.check_basis(False)
3696
return self._do_preview(merger, cleanups)
3698
return self._do_interactive(merger, cleanups)
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):
3700
return self._do_merge(merger, change_reporter, allow_pending,
3703
for cleanup in reversed(cleanups):
3706
def _get_preview(self, merger, cleanups):
4107
3707
tree_merger = merger.make_merger()
4108
3708
tt = tree_merger.make_preview_transform()
4109
self.add_cleanup(tt.finalize)
3709
cleanups.append(tt.finalize)
4110
3710
result_tree = tt.get_preview_tree()
4111
3711
return result_tree
4113
def _do_preview(self, merger):
3713
def _do_preview(self, merger, cleanups):
4114
3714
from bzrlib.diff import show_diff_trees
4115
result_tree = self._get_preview(merger)
4116
path_encoding = osutils.get_diff_header_encoding()
3715
result_tree = self._get_preview(merger, cleanups)
4117
3716
show_diff_trees(merger.this_tree, result_tree, self.outf,
4118
old_label='', new_label='',
4119
path_encoding=path_encoding)
3717
old_label='', new_label='')
4121
3719
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4122
3720
merger.change_reporter = change_reporter
4315
3904
def run(self, file_list=None, merge_type=None, show_base=False,
4316
3905
reprocess=False):
4317
from bzrlib.conflicts import restore
4318
3906
if merge_type is None:
4319
3907
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":
3908
tree, file_list = tree_files(file_list)
3911
parents = tree.get_parent_ids()
3912
if len(parents) != 2:
3913
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3914
" merges. Not cherrypicking or"
3916
repository = tree.branch.repository
3917
interesting_ids = None
3919
conflicts = tree.conflicts()
3920
if file_list is not None:
3921
interesting_ids = set()
3922
for filename in file_list:
3923
file_id = tree.path2id(filename)
3925
raise errors.NotVersionedError(filename)
3926
interesting_ids.add(file_id)
3927
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:
3930
for name, ie in tree.inventory.iter_entries(file_id):
3931
interesting_ids.add(ie.file_id)
3932
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3934
# Remerge only supports resolving contents conflicts
3935
allowed_conflicts = ('text conflict', 'contents conflict')
3936
restore_files = [c.path for c in conflicts
3937
if c.typestring in allowed_conflicts]
3938
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3939
tree.set_conflicts(ConflictList(new_conflicts))
3940
if file_list is not None:
3941
restore_files = file_list
3942
for filename in restore_files:
3944
restore(tree.abspath(filename))
3945
except errors.NotConflicted:
3947
# Disable pending merges, because the file texts we are remerging
3948
# have not had those merges performed. If we use the wrong parents
3949
# list, we imply that the working tree text has seen and rejected
3950
# all the changes from the other tree, when in fact those changes
3951
# have not yet been seen.
3952
pb = ui.ui_factory.nested_progress_bar()
3953
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()
3955
merger = _mod_merge.Merger.from_revision_ids(pb,
3957
merger.interesting_ids = interesting_ids
3958
merger.merge_type = merge_type
3959
merger.show_base = show_base
3960
merger.reprocess = reprocess
3961
conflicts = merger.do_merge()
3963
tree.set_parent_ids(parents)
4372
tree.set_parent_ids(parents)
4373
3967
if conflicts > 0:
4398
3991
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
3994
Any files that have been newly added since that revision will be deleted,
3995
with a backup kept if appropriate. Directories containing unknown files
3996
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
3998
The working tree contains a list of pending merged revisions, which will
3999
be included as parents in the next commit. Normally, revert clears that
4000
list as well as reverting the files. If any files are specified, revert
4001
leaves the pending merge list alone and reverts only the files. Use "bzr
4002
revert ." in the tree root to revert all files but keep the merge record,
4003
and "bzr revert --forget-merges" to clear the pending merge list without
4413
4004
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']
4007
_see_also = ['cat', 'export']
4427
4008
takes_options = [
4429
4010
Option('no-backup', "Do not save backups of reverted files."),
4435
4016
def run(self, revision=None, no_backup=False, file_list=None,
4436
4017
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)
4018
tree, file_list = tree_files(file_list)
4022
tree.set_parent_ids(tree.get_parent_ids()[:1])
4024
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4445
4029
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4446
4030
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)
4031
pb = ui.ui_factory.nested_progress_bar()
4033
tree.revert(file_list, rev_tree, not no_backup, pb,
4034
report_changes=True)
4451
4039
class cmd_assert_fail(Command):
4452
__doc__ = """Test reporting of assertion failures"""
4040
"""Test reporting of assertion failures"""
4453
4041
# intended just for use in testing
4606
4184
_get_revision_range(revision,
4607
4185
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")
4187
local_branch.lock_read()
4189
remote_branch.lock_read()
4191
local_extra, remote_extra = find_unmerged(
4192
local_branch, remote_branch, restrict,
4193
backward=not reverse,
4194
include_merges=include_merges,
4195
local_revid_range=local_revid_range,
4196
remote_revid_range=remote_revid_range)
4198
if log_format is None:
4199
registry = log.log_formatter_registry
4200
log_format = registry.get_default(local_branch)
4201
lf = log_format(to_file=self.outf,
4203
show_timezone='original')
4206
if local_extra and not theirs_only:
4207
message("You have %d extra revision(s):\n" %
4209
for revision in iter_log_revisions(local_extra,
4210
local_branch.repository,
4212
lf.log_revision(revision)
4213
printed_local = True
4216
printed_local = False
4218
if remote_extra and not mine_only:
4219
if printed_local is True:
4221
message("You are missing %d revision(s):\n" %
4223
for revision in iter_log_revisions(remote_extra,
4224
remote_branch.repository,
4226
lf.log_revision(revision)
4229
if mine_only and not local_extra:
4230
# We checked local, and found nothing extra
4231
message('This branch is up to date.\n')
4232
elif theirs_only and not remote_extra:
4233
# We checked remote, and found nothing extra
4234
message('Other branch is up to date.\n')
4235
elif not (mine_only or theirs_only or local_extra or
4237
# We checked both branches, and neither one had extra
4239
message("Branches are up to date.\n")
4241
remote_branch.unlock()
4243
local_branch.unlock()
4659
4244
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)
4245
local_branch.lock_write()
4247
# handle race conditions - a parent might be set while we run.
4248
if local_branch.get_parent() is None:
4249
local_branch.set_parent(remote_branch.base)
4251
local_branch.unlock()
4664
4252
return status_code
4667
4255
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.
4256
"""Compress the data within a repository."""
4686
4258
_see_also = ['repositories']
4687
4259
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):
4261
def run(self, branch_or_repo='.'):
4693
4262
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4695
4264
branch = dir.open_branch()
4696
4265
repository = branch.repository
4697
4266
except errors.NotBranchError:
4698
4267
repository = dir.open_repository()
4699
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4702
4271
class cmd_plugins(Command):
4703
__doc__ = """List the installed plugins.
4272
"""List the installed plugins.
4705
4274
This command displays the list of installed plugins including
4706
4275
version of plugin and a short description of each.
4713
4282
adding new commands, providing additional network transports and
4714
4283
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.
4285
See the Bazaar web site, http://bazaar-vcs.org, for further
4286
information on plugins including where to find them and how to
4287
install them. Instructions are also provided there on how to
4288
write new plugins using the Python programming language.
4721
4290
takes_options = ['verbose']
4723
4292
@display_command
4724
4293
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)))
4294
import bzrlib.plugin
4295
from inspect import getdoc
4297
for name, plugin in bzrlib.plugin.plugins().items():
4298
version = plugin.__version__
4299
if version == 'unknown':
4301
name_ver = '%s %s' % (name, version)
4302
d = getdoc(plugin.module)
4304
doc = d.split('\n')[0]
4306
doc = '(no description)'
4307
result.append((name_ver, doc, plugin.path()))
4308
for name_ver, doc, path in sorted(result):
4731
4316
class cmd_testament(Command):
4732
__doc__ = """Show testament (signing-form) of a revision."""
4317
"""Show testament (signing-form) of a revision."""
4733
4318
takes_options = [
4735
4320
Option('long', help='Produce long-format testament.'),
4777
4365
Option('long', help='Show commit date in annotations.'),
4782
4369
encoding_type = 'exact'
4784
4371
@display_command
4785
4372
def run(self, filename, all=False, long=False, revision=None,
4786
show_ids=False, directory=None):
4787
from bzrlib.annotate import (
4374
from bzrlib.annotate import annotate_file, annotate_file_tree
4790
4375
wt, branch, relpath = \
4791
_open_directory_or_containing_tree_or_branch(filename, directory)
4376
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4792
4377
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)
4382
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4384
file_id = wt.path2id(relpath)
4386
file_id = tree.path2id(relpath)
4388
raise errors.NotVersionedError(filename)
4389
file_version = tree.inventory[file_id].revision
4390
if wt is not None and revision is None:
4391
# If there is a tree and we're not annotating historical
4392
# versions, annotate the working tree's content.
4393
annotate_file_tree(wt, file_id, self.outf, long, all,
4396
annotate_file(branch, file_version, file_id, long, all, self.outf,
4814
4405
class cmd_re_sign(Command):
4815
__doc__ = """Create a digital signature for an existing revision."""
4406
"""Create a digital signature for an existing revision."""
4816
4407
# TODO be able to replace existing ones.
4818
4409
hidden = True # is this right ?
4819
4410
takes_args = ['revision_id*']
4820
takes_options = ['directory', 'revision']
4411
takes_options = ['revision']
4822
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4413
def run(self, revision_id_list=None, revision=None):
4823
4414
if revision_id_list is not None and revision is not None:
4824
4415
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4825
4416
if revision_id_list is None and revision is None:
4826
4417
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)
4418
b = WorkingTree.open_containing(u'.')[0].branch
4421
return self._run(b, revision_id_list, revision)
4831
4425
def _run(self, b, revision_id_list, revision):
4832
4426
import bzrlib.gpg as gpg
5022
4619
end_revision=last_revno)
5025
self.outf.write('Dry-run, pretending to remove'
5026
' the above revisions.\n')
4622
print 'Dry-run, pretending to remove the above revisions.'
4624
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')
4626
print 'The above revision(s) will be removed.'
4628
val = raw_input('Are you sure [y/N]? ')
4629
if val.lower() not in ('y', 'yes'):
5038
4633
mutter('Uncommitting from {%s} to {%s}',
5039
4634
last_rev_id, rev_id)
5040
4635
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5041
4636
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)
4637
note('You can restore the old tip by running:\n'
4638
' bzr pull . -r revid:%s', last_rev_id)
5046
4641
class cmd_break_lock(Command):
5047
__doc__ = """Break a dead lock.
5049
This command breaks a lock on a repository, branch, working directory or
4642
"""Break a dead lock on a repository, branch or working directory.
5052
4644
CAUTION: Locks should only be broken when you are sure that the process
5053
4645
holding the lock has been stopped.
5055
You can get information on what locks are open via the 'bzr info
5056
[location]' command.
4647
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
4652
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):
4654
def run(self, location=None, show=False):
5073
4655
if location is None:
5074
4656
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:
4657
control, relpath = bzrdir.BzrDir.open_containing(location)
4659
control.break_lock()
4660
except NotImplementedError:
5090
4664
class cmd_wait_until_signalled(Command):
5091
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4665
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5093
4667
This just prints a line to signal when it is ready, then blocks on stdin.
5352
4921
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.
4924
If --no-bundle is specified, then public_branch is needed (and must be
4925
up-to-date), so that the receiver can perform the merge using the
4926
public_branch. The public_branch is always included if known, so that
4927
people can check it later.
4929
The submit branch defaults to the parent, but can be overridden. Both
4930
submit branch and public branch will be remembered if supplied.
4932
If a public_branch is known for the submit_branch, that public submit
4933
branch is used in the merge instructions. This means that a local mirror
4934
can be used as your actual submit branch, once you have set public_branch
5388
4937
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.
4938
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5390
4939
If the preferred client can't be found (or used), your editor will be used.
5392
4941
To use a specific mail program, set the mail_client configuration option.
5393
4942
(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
4943
specific clients are "claws", "evolution", "kmail", "mutt", and
4944
"thunderbird"; generic options are "default", "editor", "emacsclient",
4945
"mapi", and "xdg-email". Plugins may also add supported clients.
5399
4947
If mail is being sent, a to address is required. This can be supplied
5400
4948
either on the commandline, by setting the submit_to configuration
5551
5095
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5552
5096
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
5099
_see_also = ['commit', 'tags']
5561
takes_args = ['tag_name?']
5100
takes_args = ['tag_name']
5562
5101
takes_options = [
5563
5102
Option('delete',
5564
5103
help='Delete this tag rather than placing it.',
5566
custom_help('directory',
5567
help='Branch in which to place the tag.'),
5106
help='Branch in which to place the tag.',
5568
5110
Option('force',
5569
5111
help='Replace existing tags.',
5574
def run(self, tag_name=None,
5116
def run(self, tag_name,
5580
5122
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)
5126
branch.tags.delete_tag(tag_name)
5127
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)
5130
if len(revision) != 1:
5131
raise errors.BzrCommandError(
5132
"Tags can only be placed on a single revision, "
5134
revision_id = revision[0].as_revision_id(branch)
5136
revision_id = branch.last_revision()
5137
if (not force) and branch.tags.has_tag(tag_name):
5138
raise errors.TagAlreadyExists(tag_name)
5139
branch.tags.set_tag(tag_name, revision_id)
5140
self.outf.write('Created tag %s.\n' % tag_name)
5607
5145
class cmd_tags(Command):
5608
__doc__ = """List tags.
5610
5148
This command shows a table of tag names and the revisions they reference.
5613
5151
_see_also = ['tag']
5614
5152
takes_options = [
5615
custom_help('directory',
5616
help='Branch whose tags should be displayed.'),
5617
RegistryOption('sort',
5154
help='Branch whose tags should be displayed.',
5158
RegistryOption.from_kwargs('sort',
5618
5159
'Sort tags by different criteria.', title='Sorting',
5619
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5160
alpha='Sort tags lexicographically (default).',
5161
time='Sort tags chronologically.',
5625
5167
@display_command
5626
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5627
from bzrlib.tag import tag_sort_methods
5628
5174
branch, relpath = Branch.open_containing(directory)
5630
5176
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()
5646
# [ (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)
5183
graph = branch.repository.get_graph()
5184
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5185
revid1, revid2 = rev1.rev_id, rev2.rev_id
5186
# only show revisions between revid1 and revid2 (inclusive)
5187
tags = [(tag, revid) for tag, revid in tags if
5188
graph.is_between(revid, revid1, revid2)]
5191
elif sort == 'time':
5193
for tag, revid in tags:
5195
revobj = branch.repository.get_revision(revid)
5196
except errors.NoSuchRevision:
5197
timestamp = sys.maxint # place them at the end
5199
timestamp = revobj.timestamp
5200
timestamps[revid] = timestamp
5201
tags.sort(key=lambda x: timestamps[x[1]])
5203
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5204
for index, (tag, revid) in enumerate(tags):
5206
revno = branch.revision_id_to_dotted_revno(revid)
5207
if isinstance(revno, tuple):
5208
revno = '.'.join(map(str, revno))
5209
except errors.NoSuchRevision:
5210
# Bad tag data/merges can lead to tagged revisions
5211
# which are not in this branch. Fail gracefully ...
5213
tags[index] = (tag, revno)
5658
5216
for tag, revspec in tags:
5659
5217
self.outf.write('%-20s %s\n' % (tag, revspec))
5662
5220
class cmd_reconfigure(Command):
5663
__doc__ = """Reconfigure the type of a bzr directory.
5221
"""Reconfigure the type of a bzr directory.
5665
5223
A target configuration must be specified.
5769
5327
/path/to/newbranch.
5771
5329
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
5330
locally, in which case switching will update the the local nickname to be
5773
5331
that of the master.
5776
takes_args = ['to_location?']
5777
takes_options = ['directory',
5334
takes_args = ['to_location']
5335
takes_options = [Option('force',
5779
5336
help='Switch even if local commits will be lost.'),
5781
5337
Option('create-branch', short_name='b',
5782
5338
help='Create the target branch from this one before'
5783
5339
' switching to it.'),
5786
def run(self, to_location=None, force=False, create_branch=False,
5787
revision=None, directory=u'.'):
5342
def run(self, to_location, force=False, create_branch=False):
5788
5343
from bzrlib import switch
5789
tree_location = directory
5790
revision = _get_one_revision('switch', revision)
5791
5345
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
5798
5347
branch = control_dir.open_branch()
5799
5348
had_explicit_nick = branch.get_config().has_explicit_nickname()
6099
5612
Option('destroy',
6100
5613
help='Destroy removed changes instead of shelving them.'),
6102
_see_also = ['unshelve', 'configuration']
5615
_see_also = ['unshelve']
6104
5617
def run(self, revision=None, all=False, file_list=None, message=None,
6105
writer=None, list=False, destroy=False, directory=None):
5618
writer=None, list=False, destroy=False):
6107
return self.run_for_list(directory=directory)
5620
return self.run_for_list()
6108
5621
from bzrlib.shelf_ui import Shelver
6109
5622
if writer is None:
6110
5623
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)
5625
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5626
message, destroy=destroy).run()
6118
5627
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))
5630
def run_for_list(self):
5631
tree = WorkingTree.open_containing('.')[0]
5634
manager = tree.get_shelf_manager()
5635
shelves = manager.active_shelves()
5636
if len(shelves) == 0:
5637
note('No shelved changes.')
5639
for shelf_id in reversed(shelves):
5640
message = manager.get_metadata(shelf_id).get('message')
5642
message = '<no message>'
5643
self.outf.write('%3d: %s\n' % (shelf_id, message))
6139
5649
class cmd_unshelve(Command):
6140
__doc__ = """Restore shelved changes.
5650
"""Restore shelved changes.
6142
5652
By default, the most recently shelved changes are restored. However if you
6143
5653
specify a shelf by id those changes will be restored instead. This works
6147
5657
takes_args = ['shelf_id?']
6148
5658
takes_options = [
6150
5659
RegistryOption.from_kwargs(
6151
5660
'action', help="The action to perform.",
6152
5661
enum_switch=False, value_switches=True,
6153
5662
apply="Apply changes and remove from the shelf.",
6154
5663
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.",
5664
delete_only="Delete changes without applying them."
6161
5667
_see_also = ['shelve']
6163
def run(self, shelf_id=None, action='apply', directory=u'.'):
5669
def run(self, shelf_id=None, action='apply'):
6164
5670
from bzrlib.shelf_ui import Unshelver
6165
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
6169
unshelver.tree.unlock()
5671
Unshelver.from_args(shelf_id, action).run()
6172
5674
class cmd_clean_tree(Command):
6173
__doc__ = """Remove unwanted files from working tree.
5675
"""Remove unwanted files from working tree.
6175
5677
By default, only unknown files, not ignored files, are deleted. Versioned
6176
5678
files are never deleted.
6251
5752
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)
5755
# these get imported and then picked up by the scan for cmd_*
5756
# TODO: Some more consistent way to split command definitions across files;
5757
# we do need to load at least some information about them to know of
5758
# aliases. ideally we would avoid loading the implementation until the
5759
# details were needed.
5760
from bzrlib.cmd_version_info import cmd_version_info
5761
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5762
from bzrlib.bundle.commands import (
5765
from bzrlib.foreign import cmd_dpush
5766
from bzrlib.sign_my_commits import cmd_sign_my_commits
5767
from bzrlib.weave_commands import cmd_versionedfile_list, \
5768
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
