174
156
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
158
if file_list is None or len(file_list) == 0:
159
tree = WorkingTree.open_containing(default_branch)[0]
160
if tree.supports_views() and apply_view:
161
view_files = tree.views.lookup_view()
163
file_list = view_files
164
view_str = views.view_display_str(view_files)
165
note("Ignoring files outside view. View is %s" % view_str)
166
return tree, file_list
167
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
168
return tree, safe_relpath_files(tree, file_list, canonicalize,
169
apply_view=apply_view)
172
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
173
"""Convert file_list into a list of relpaths in tree.
175
:param tree: A tree to operate on.
176
:param file_list: A list of user provided paths or None.
177
:param apply_view: if True and a view is set, apply it or check that
178
specified files are within it
179
:return: A list of relative paths.
180
:raises errors.PathNotChild: When a provided path is in a different tree
183
if file_list is None:
185
if tree.supports_views() and apply_view:
186
view_files = tree.views.lookup_view()
190
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
191
# doesn't - fix that up here before we enter the loop.
193
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
196
for filename in file_list:
198
relpath = fixer(osutils.dereference_path(filename))
199
if view_files and not osutils.is_inside_any(view_files, relpath):
200
raise errors.FileOutsideView(filename, view_files)
201
new_list.append(relpath)
202
except errors.PathNotChild:
203
raise errors.FileInWrongBranch(tree.branch, filename)
182
207
def _get_view_info_for_change_reporter(tree):
319
322
takes_args = ['revision_id?']
320
takes_options = ['directory', 'revision']
323
takes_options = ['revision']
321
324
# cat-revision is more for frontends so should be exact
322
325
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'.'):
328
def run(self, revision_id=None, revision=None):
334
329
if revision_id is not None and revision is not None:
335
330
raise errors.BzrCommandError('You can only supply one of'
336
331
' revision_id or --revision')
337
332
if revision_id is None and revision is None:
338
333
raise errors.BzrCommandError('You must supply either'
339
334
' --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()
335
b = WorkingTree.open_containing(u'.')[0].branch
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
355
class cmd_dump_btree(Command):
371
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
373
358
PATH is a btree index file, it can be any URL. This includes things like
374
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
435
To re-create the working tree, use "bzr checkout".
462
437
_see_also = ['checkout', 'working-trees']
463
takes_args = ['location*']
438
takes_args = ['location?']
464
439
takes_options = [
466
441
help='Remove the working tree even if it has '
467
'uncommitted or shelved changes.'),
442
'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)
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
526
except errors.BzrError:
527
pass # There seems to be a real error here, so we'll reset
530
raise errors.BzrCommandError(
531
'The tree does not appear to be corrupt. You probably'
532
' want "bzr revert" instead. Use "--force" if you are'
533
' sure you want to reset the working tree.')
537
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
539
tree.reset_state(revision_ids)
540
except errors.BzrError, e:
541
if revision_ids is None:
542
extra = (', the header appears corrupt, try passing -r -1'
543
' to set the state to the last commit')
546
raise errors.BzrCommandError('failed to reset the tree state'
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
550
469
class cmd_revno(Command):
551
__doc__ = """Show current revision number.
470
"""Show current revision number.
553
472
This is equal to the number of revisions on this branch.
556
475
_see_also = ['info']
557
476
takes_args = ['location?']
559
Option('tree', help='Show revno of working tree'),
563
def run(self, tree=False, location=u'.'):
566
wt = WorkingTree.open_containing(location)[0]
567
self.add_cleanup(wt.lock_read().unlock)
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
569
raise errors.NoWorkingTree(location)
570
revid = wt.last_revision()
572
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
573
except errors.NoSuchRevision:
575
revno = ".".join(str(n) for n in revno_t)
577
b = Branch.open_containing(location)[0]
578
self.add_cleanup(b.lock_read().unlock)
581
self.outf.write(str(revno) + '\n')
479
def run(self, location=u'.'):
480
self.outf.write(str(Branch.open_containing(location)[0].revno()))
481
self.outf.write('\n')
584
484
class cmd_revision_info(Command):
585
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
588
488
takes_args = ['revision_info*']
589
489
takes_options = [
591
custom_help('directory',
592
492
help='Branch to examine, '
593
'rather than the one containing the working directory.'),
594
Option('tree', help='Show revno of working tree'),
493
'rather than the one containing the working directory.',
598
def run(self, revision=None, directory=u'.', tree=False,
599
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
602
wt = WorkingTree.open_containing(directory)[0]
604
self.add_cleanup(wt.lock_read().unlock)
605
except (errors.NoWorkingTree, errors.NotLocalUrl):
607
b = Branch.open_containing(directory)[0]
608
self.add_cleanup(b.lock_read().unlock)
610
503
if revision is not None:
611
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
612
505
if revision_info_list is not None:
613
for rev_str in revision_info_list:
614
rev_spec = RevisionSpec.from_string(rev_str)
615
revision_ids.append(rev_spec.as_revision_id(b))
616
# No arguments supplied, default to the last revision
617
if len(revision_ids) == 0:
620
raise errors.NoWorkingTree(directory)
621
revision_ids.append(wt.last_revision())
623
revision_ids.append(b.last_revision())
627
for revision_id in revision_ids:
506
for rev in revision_info_list:
507
revs.append(RevisionSpec.from_string(rev))
509
b = Branch.open_containing(directory)[0]
512
revs.append(RevisionSpec.from_string('-1'))
515
revision_id = rev.as_revision_id(b)
629
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
630
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
631
518
except errors.NoSuchRevision:
633
maxlen = max(maxlen, len(revno))
634
revinfos.append([revno, revision_id])
638
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
519
dotted_map = b.get_revision_id_to_revno_map()
520
revno = '.'.join(str(i) for i in dotted_map[revision_id])
521
print '%s %s' % (revno, revision_id)
641
524
class cmd_add(Command):
642
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
644
527
In non-recursive mode, all the named items are added, regardless
645
528
of whether they were previously ignored. A warning is given if
787
674
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
789
676
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()
677
work_tree, file_list = tree_files(file_list)
678
work_tree.lock_read()
680
if revision is not None:
681
tree = revision.as_tree(work_tree.branch)
683
extra_trees = [work_tree]
689
if file_list is not None:
690
file_ids = tree.paths2ids(file_list, trees=extra_trees,
691
require_versioned=True)
692
# find_ids_across_trees may include some paths that don't
694
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
695
for file_id in file_ids if file_id in tree)
697
entries = tree.inventory.entries()
700
if tree is not work_tree:
813
703
for path, entry in entries:
814
704
if kind and kind != entry.kind:
952
846
dest = osutils.pathjoin(dest_parent, dest_tail)
953
847
mutter("attempting to move %s => %s", src, dest)
954
848
tree.rename_one(src, dest, after=after)
956
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
959
852
class cmd_pull(Command):
960
__doc__ = """Turn this branch into a mirror of another branch.
853
"""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
855
This command only works on branches that have not diverged. Branches are
856
considered diverged if the destination branch's most recent commit is one
857
that has not been merged (directly or indirectly) into the parent.
967
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
968
860
from one into the other. Once one branch has merged, the other should
969
861
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.
863
If you want to forget your local changes and just update your branch to
864
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.
866
If there is no default location set, the first pull will set it. After
867
that, you can omit the location to use the default. To change the
868
default, use --remember. The value will only be saved if the remote
869
location can be accessed.
980
871
Note: The location can be specified either in the form of a branch,
981
872
or in the form of a path to a file containing a merge directive generated
1057
943
branch_from = Branch.open(location,
1058
944
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)):
946
if branch_to.get_parent() is None or remember:
1063
947
branch_to.set_parent(branch_from.base)
1065
949
if revision is not None:
1066
950
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)
952
branch_to.lock_write()
954
if tree_to is not None:
955
view_info = _get_view_info_for_change_reporter(tree_to)
956
change_reporter = delta._ChangeReporter(
957
unversioned_filter=tree_to.is_ignored, view_info=view_info)
958
result = tree_to.pull(branch_from, overwrite, revision_id,
960
possible_transports=possible_transports,
963
result = branch_to.pull(branch_from, overwrite, revision_id,
1081
result.report(self.outf)
1082
if verbose and result.old_revid != result.new_revid:
1083
log.show_branch_change(
1084
branch_to, self.outf, result.old_revno,
1086
if getattr(result, 'tag_conflicts', None):
966
result.report(self.outf)
967
if verbose and result.old_revid != result.new_revid:
968
log.show_branch_change(branch_to, self.outf, result.old_revno,
1092
974
class cmd_push(Command):
1093
__doc__ = """Update a mirror of this branch.
975
"""Update a mirror of this branch.
1095
977
The target branch will not have its working tree populated because this
1096
978
is both expensive, and is not supported on remote file systems.
1136
1021
'for the commit history. Only the work not present in the '
1137
1022
'referenced branch is included in the branch created.',
1140
help='Refuse to push if there are uncommitted changes in'
1141
' the working tree, --no-strict disables the check.'),
1143
help="Don't populate the working tree, even for protocols"
1144
" that support it."),
1146
1025
takes_args = ['location?']
1147
1026
encoding_type = 'replace'
1149
def run(self, location=None, remember=None, overwrite=False,
1028
def run(self, location=None, remember=False, overwrite=False,
1150
1029
create_prefix=False, verbose=False, revision=None,
1151
1030
use_existing_dir=False, directory=None, stacked_on=None,
1152
stacked=False, strict=None, no_tree=False):
1153
1032
from bzrlib.push import _show_push_branch
1034
# Get the source branch and revision_id
1155
1035
if directory is None:
1156
1036
directory = '.'
1157
# Get the source branch
1159
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1160
# Get the tip's revision_id
1037
br_from = Branch.open_containing(directory)[0]
1161
1038
revision = _get_one_revision('push', revision)
1162
1039
if revision is not None:
1163
1040
revision_id = revision.in_history(br_from).rev_id
1165
1042
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.')
1171
1044
# Get the stacked_on branch, if any
1172
1045
if stacked_on is not None:
1173
1046
stacked_on = urlutils.normalize_url(stacked_on)
1217
1090
To retrieve the branch as of a particular revision, supply the --revision
1218
1091
parameter, as in "branch foo/bar -r 5".
1220
The synonyms 'clone' and 'get' for this command are deprecated.
1223
1094
_see_also = ['checkout']
1224
1095
takes_args = ['from_location', 'to_location?']
1225
takes_options = ['revision',
1226
Option('hardlink', help='Hard-link working tree files where possible.'),
1227
Option('files-from', type=str,
1228
help="Get file contents from this tree."),
1096
takes_options = ['revision', Option('hardlink',
1097
help='Hard-link working tree files where possible.'),
1229
1098
Option('no-tree',
1230
1099
help="Create a branch without a working-tree."),
1232
help="Switch the checkout in the current directory "
1233
"to the new branch."),
1234
1100
Option('stacked',
1235
1101
help='Create a stacked branch referring to the source branch. '
1236
1102
'The new branch will depend on the availability of the source '
1237
1103
'branch for all operations.'),
1238
1104
Option('standalone',
1239
1105
help='Do not use a shared repository, even if available.'),
1240
Option('use-existing-dir',
1241
help='By default branch will fail if the target'
1242
' directory exists, but does not already'
1243
' have a control directory. This flag will'
1244
' allow branch to proceed.'),
1246
help="Bind new branch to from location."),
1248
1107
aliases = ['get', 'clone']
1250
1109
def run(self, from_location, to_location=None, revision=None,
1251
hardlink=False, stacked=False, standalone=False, no_tree=False,
1252
use_existing_dir=False, switch=False, bind=False,
1254
from bzrlib import switch as _mod_switch
1110
hardlink=False, stacked=False, standalone=False, no_tree=False):
1255
1111
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
1113
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1264
if not (hardlink or files_from):
1265
# accelerator_tree is usually slower because you have to read N
1266
# files (no readahead, lots of seeks, etc), but allow the user to
1267
# explicitly request it
1268
accelerator_tree = None
1269
if files_from is not None and files_from != from_location:
1270
accelerator_tree = WorkingTree.open(files_from)
1271
1115
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)
1118
if revision is not None:
1119
revision_id = revision.as_revision_id(br_from)
1291
bzrdir.BzrDir.open_from_transport(to_transport)
1292
except errors.NotBranchError:
1295
raise errors.AlreadyBranchError(to_location)
1296
except errors.NoSuchFile:
1297
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1300
# preserve whatever source format we have.
1301
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1302
possible_transports=[to_transport],
1303
accelerator_tree=accelerator_tree,
1304
hardlink=hardlink, stacked=stacked,
1305
force_new_repo=standalone,
1306
create_tree_if_local=not no_tree,
1307
source_branch=br_from)
1308
branch = dir.open_branch()
1309
except errors.NoSuchRevision:
1310
to_transport.delete_tree('.')
1311
msg = "The branch %s has no revision %s." % (from_location,
1313
raise errors.BzrCommandError(msg)
1314
_merge_tags_if_possible(br_from, branch)
1315
# If the source branch is stacked, the new branch may
1316
# be stacked whether we asked for that explicitly or not.
1317
# We therefore need a try/except here and not just 'if stacked:'
1319
note('Created new stacked branch referring to %s.' %
1320
branch.get_stacked_on_url())
1321
except (errors.NotStacked, errors.UnstackableBranchFormat,
1322
errors.UnstackableRepositoryFormat), e:
1323
note('Branched %d revision(s).' % branch.revno())
1325
# Bind to the parent
1326
parent_branch = Branch.open(from_location)
1327
branch.bind(parent_branch)
1328
note('New branch bound to %s' % from_location)
1330
# Switch to the new branch
1331
wt, _ = WorkingTree.open_containing('.')
1332
_mod_switch.switch(wt.bzrdir, branch)
1333
note('Switched to branch: %s',
1334
urlutils.unescape_for_display(branch.base, 'utf-8'))
1121
# FIXME - wt.last_revision, fallback to branch, fall back to
1122
# None or perhaps NULL_REVISION to mean copy nothing
1124
revision_id = br_from.last_revision()
1125
if to_location is None:
1126
to_location = urlutils.derive_to_location(from_location)
1127
to_transport = transport.get_transport(to_location)
1129
to_transport.mkdir('.')
1130
except errors.FileExists:
1131
raise errors.BzrCommandError('Target directory "%s" already'
1132
' exists.' % to_location)
1133
except errors.NoSuchFile:
1134
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1137
# preserve whatever source format we have.
1138
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1139
possible_transports=[to_transport],
1140
accelerator_tree=accelerator_tree,
1141
hardlink=hardlink, stacked=stacked,
1142
force_new_repo=standalone,
1143
create_tree_if_local=not no_tree,
1144
source_branch=br_from)
1145
branch = dir.open_branch()
1146
except errors.NoSuchRevision:
1147
to_transport.delete_tree('.')
1148
msg = "The branch %s has no revision %s." % (from_location,
1150
raise errors.BzrCommandError(msg)
1151
_merge_tags_if_possible(br_from, branch)
1152
# If the source branch is stacked, the new branch may
1153
# be stacked whether we asked for that explicitly or not.
1154
# We therefore need a try/except here and not just 'if stacked:'
1156
note('Created new stacked branch referring to %s.' %
1157
branch.get_stacked_on_url())
1158
except (errors.NotStacked, errors.UnstackableBranchFormat,
1159
errors.UnstackableRepositoryFormat), e:
1160
note('Branched %d revision(s).' % branch.revno())
1337
1165
class cmd_checkout(Command):
1338
__doc__ = """Create a new checkout of an existing branch.
1166
"""Create a new checkout of an existing branch.
1340
1168
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1341
1169
the branch found in '.'. This is useful if you have removed the working tree
1420
1243
@display_command
1421
1244
def run(self, dir=u'.'):
1422
1245
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))
1248
new_inv = tree.inventory
1249
old_tree = tree.basis_tree()
1250
old_tree.lock_read()
1252
old_inv = old_tree.inventory
1254
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1255
for f, paths, c, v, p, n, k, e in iterator:
1256
if paths[0] == paths[1]:
1260
renames.append(paths)
1262
for old_name, new_name in renames:
1263
self.outf.write("%s => %s\n" % (old_name, new_name))
1441
1270
class cmd_update(Command):
1442
__doc__ = """Update a tree to have the latest code committed to its branch.
1271
"""Update a tree to have the latest code committed to its branch.
1444
1273
This will perform a merge into the working tree, and may generate
1445
1274
conflicts. If you have any local changes, you will still
1448
1277
If you want to discard your local changes, you can just do a
1449
1278
'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
1281
_see_also = ['pull', 'working-trees', 'status-flags']
1459
1282
takes_args = ['dir?']
1460
takes_options = ['revision',
1462
help="Show base revision text in conflicts."),
1464
1283
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")
1285
def run(self, dir='.'):
1470
1286
tree = WorkingTree.open_containing(dir)[0]
1471
branch = tree.branch
1472
1287
possible_transports = []
1473
master = branch.get_master_branch(
1288
master = tree.branch.get_master_branch(
1474
1289
possible_transports=possible_transports)
1475
1290
if master is not None:
1476
branch_location = master.base
1477
1291
tree.lock_write()
1479
branch_location = tree.branch.base
1480
1293
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)
1295
existing_pending_merges = tree.get_parent_ids()[1:]
1296
last_rev = _mod_revision.ensure_null(tree.last_revision())
1297
if last_rev == _mod_revision.ensure_null(
1298
tree.branch.last_revision()):
1299
# may be up to date, check master too.
1300
if master is None or last_rev == _mod_revision.ensure_null(
1301
master.last_revision()):
1302
revno = tree.branch.revision_id_to_revno(last_rev)
1303
note("Tree is up to date at revision %d." % (revno,))
1305
view_info = _get_view_info_for_change_reporter(tree)
1508
1306
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'.")
1307
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1308
view_info=view_info), possible_transports=possible_transports)
1309
revno = tree.branch.revision_id_to_revno(
1310
_mod_revision.ensure_null(tree.last_revision()))
1311
note('Updated to revision %d.' % (revno,))
1312
if tree.get_parent_ids()[1:] != existing_pending_merges:
1313
note('Your local commits will now show as pending merges with '
1314
"'bzr status', and can be committed with 'bzr commit'.")
1534
1323
class cmd_info(Command):
1535
__doc__ = """Show information about a working tree, branch or repository.
1324
"""Show information about a working tree, branch or repository.
1537
1326
This command will show all known locations and formats associated to the
1538
1327
tree, branch or repository.
1590
1378
RegistryOption.from_kwargs('file-deletion-strategy',
1591
1379
'The file deletion mode to be used.',
1592
1380
title='Deletion Strategy', value_switches=True, enum_switch=False,
1593
safe='Backup changed files (default).',
1594
keep='Delete from bzr but leave the working copy.',
1595
no_backup='Don\'t backup changed files.',
1381
safe='Only delete files if they can be'
1382
' safely recovered (default).',
1383
keep="Don't delete any files.",
1596
1384
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)')]
1385
'recovered and even if they are non-empty directories.')]
1599
1386
aliases = ['rm', 'del']
1600
1387
encoding_type = 'replace'
1602
1389
def run(self, file_list, verbose=False, new=False,
1603
1390
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)
1391
tree, file_list = tree_files(file_list)
1611
1393
if file_list is not None:
1612
1394
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'))
1398
# Heuristics should probably all move into tree.remove_smart or
1401
added = tree.changes_from(tree.basis_tree(),
1402
specific_files=file_list).added
1403
file_list = sorted([f[0] for f in added], reverse=True)
1404
if len(file_list) == 0:
1405
raise errors.BzrCommandError('No matching files.')
1406
elif file_list is None:
1407
# missing files show up in iter_changes(basis) as
1408
# versioned-with-no-kind.
1410
for change in tree.iter_changes(tree.basis_tree()):
1411
# Find paths in the working tree that have no kind:
1412
if change[1][1] is not None and change[6][1] is None:
1413
missing.append(change[1][1])
1414
file_list = sorted(missing, reverse=True)
1415
file_deletion_strategy = 'keep'
1416
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1417
keep_files=file_deletion_strategy=='keep',
1418
force=file_deletion_strategy=='force')
1638
1423
class cmd_file_id(Command):
1639
__doc__ = """Print file_id of a particular file or directory.
1424
"""Print file_id of a particular file or directory.
1641
1426
The file_id is assigned when the file is first added and remains the
1642
1427
same through all revisions where the file exists, even when it is
2077
1802
raise errors.BzrCommandError('bzr diff --revision takes exactly'
2078
1803
' 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()
1805
old_tree, new_tree, specific_files, extra_trees = \
1806
_get_trees_to_diff(file_list, revision, old, new,
2090
1808
return show_diff_trees(old_tree, new_tree, sys.stdout,
2091
1809
specific_files=specific_files,
2092
1810
external_diff_options=diff_options,
2093
1811
old_label=old_label, new_label=new_label,
2094
extra_trees=extra_trees,
2095
path_encoding=path_encoding,
1812
extra_trees=extra_trees, using=using)
2100
1815
class cmd_deleted(Command):
2101
__doc__ = """List files deleted in the working tree.
1816
"""List files deleted in the working tree.
2103
1818
# TODO: Show files deleted since a previous revision, or
2104
1819
# between two revisions.
2107
1822
# level of effort but possibly much less IO. (Or possibly not,
2108
1823
# if the directories are very large...)
2109
1824
_see_also = ['status', 'ls']
2110
takes_options = ['directory', 'show-ids']
1825
takes_options = ['show-ids']
2112
1827
@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')
1828
def run(self, show_ids=False):
1829
tree = WorkingTree.open_containing(u'.')[0]
1832
old = tree.basis_tree()
1835
for path, ie in old.inventory.iter_entries():
1836
if not tree.has_id(ie.file_id):
1837
self.outf.write(path)
1839
self.outf.write(' ')
1840
self.outf.write(ie.file_id)
1841
self.outf.write('\n')
2127
1848
class cmd_modified(Command):
2128
__doc__ = """List files modified in working tree.
1849
"""List files modified in working tree.
2132
1853
_see_also = ['status', 'ls']
2133
takes_options = ['directory', 'null']
1856
help='Write an ascii NUL (\\0) separator '
1857
'between files rather than a newline.')
2135
1860
@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)
1861
def run(self, null=False):
1862
tree = WorkingTree.open_containing(u'.')[0]
2139
1863
td = tree.changes_from(tree.basis_tree())
2141
1864
for path, id, kind, text_modified, meta_modified in td.modified:
2143
1866
self.outf.write(path + '\0')
2148
1871
class cmd_added(Command):
2149
__doc__ = """List files added in working tree.
1872
"""List files added in working tree.
2153
1876
_see_also = ['status', 'ls']
2154
takes_options = ['directory', 'null']
1879
help='Write an ascii NUL (\\0) separator '
1880
'between files rather than a newline.')
2156
1883
@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')
1884
def run(self, null=False):
1885
wt = WorkingTree.open_containing(u'.')[0]
1888
basis = wt.basis_tree()
1891
basis_inv = basis.inventory
1894
if file_id in basis_inv:
1896
if inv.is_root(file_id) and len(basis_inv) == 0:
1898
path = inv.id2path(file_id)
1899
if not os.access(osutils.abspath(path), os.F_OK):
1902
self.outf.write(path + '\0')
1904
self.outf.write(osutils.quotefn(path) + '\n')
2178
1911
class cmd_root(Command):
2179
__doc__ = """Show the tree root directory.
1912
"""Show the tree root directory.
2181
1914
The root is the nearest enclosing directory with a .bzr control
2532
2212
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)
2216
# Build the log formatter
2217
if log_format is None:
2218
log_format = log.log_formatter_registry.get_default(b)
2219
lf = log_format(show_ids=show_ids, to_file=self.outf,
2220
show_timezone=timezone,
2221
delta_format=get_verbosity_level(),
2223
show_advice=levels is None)
2225
# Choose the algorithm for doing the logging. It's annoying
2226
# having multiple code paths like this but necessary until
2227
# the underlying repository format is faster at generating
2228
# deltas or can provide everything we need from the indices.
2229
# The default algorithm - match-using-deltas - works for
2230
# multiple files and directories and is faster for small
2231
# amounts of history (200 revisions say). However, it's too
2232
# slow for logging a single file in a repository with deep
2233
# history, i.e. > 10K revisions. In the spirit of "do no
2234
# evil when adding features", we continue to use the
2235
# original algorithm - per-file-graph - for the "single
2236
# file that isn't a directory without showing a delta" case.
2237
partial_history = revision and b.repository._format.supports_chks
2238
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2239
or delta_type or partial_history)
2241
# Build the LogRequest and execute it
2242
if len(file_ids) == 0:
2244
rqst = make_log_request_dict(
2245
direction=direction, specific_fileids=file_ids,
2246
start_revision=rev1, end_revision=rev2, limit=limit,
2247
message_search=message, delta_type=delta_type,
2248
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2249
Logger(b, rqst).show(lf)
2589
2254
def _get_revision_range(revisionspec_list, branch, command_name):
2678
2337
help='Recurse into subdirectories.'),
2679
2338
Option('from-root',
2680
2339
help='Print paths relative to the root of the branch.'),
2681
Option('unknown', short_name='u',
2682
help='Print unknown files.'),
2340
Option('unknown', help='Print unknown files.'),
2683
2341
Option('versioned', help='Print versioned files.',
2684
2342
short_name='V'),
2685
Option('ignored', short_name='i',
2686
help='Print ignored files.'),
2687
Option('kind', short_name='k',
2343
Option('ignored', help='Print ignored files.'),
2345
help='Write an ascii NUL (\\0) separator '
2346
'between files rather than a newline.'),
2688
2348
help='List entries of a particular kind: file, directory, symlink.',
2694
2352
@display_command
2695
2353
def run(self, revision=None, verbose=False,
2696
2354
recursive=False, from_root=False,
2697
2355
unknown=False, versioned=False, ignored=False,
2698
null=False, kind=None, show_ids=False, path=None, directory=None):
2356
null=False, kind=None, show_ids=False, path=None):
2700
2358
if kind and kind not in ('file', 'directory', 'symlink'):
2701
2359
raise errors.BzrCommandError('invalid kind specified')
2735
2390
view_str = views.view_display_str(view_files)
2736
2391
note("Ignoring files outside view. View is %s" % view_str)
2738
self.add_cleanup(tree.lock_read().unlock)
2739
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2740
from_dir=relpath, recursive=recursive):
2741
# Apply additional masking
2742
if not all and not selection[fc]:
2744
if kind is not None and fkind != kind:
2749
fullpath = osutils.pathjoin(relpath, fp)
2752
views.check_path_in_view(tree, fullpath)
2753
except errors.FileOutsideView:
2758
fp = osutils.pathjoin(prefix, fp)
2759
kindch = entry.kind_character()
2760
outstring = fp + kindch
2761
ui.ui_factory.clear_term()
2763
outstring = '%-8s %s' % (fc, outstring)
2764
if show_ids and fid is not None:
2765
outstring = "%-50s %s" % (outstring, fid)
2766
self.outf.write(outstring + '\n')
2768
self.outf.write(fp + '\0')
2771
self.outf.write(fid)
2772
self.outf.write('\0')
2780
self.outf.write('%-50s %s\n' % (outstring, my_id))
2782
self.outf.write(outstring + '\n')
2395
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2396
if fp.startswith(relpath):
2397
rp = fp[len(relpath):]
2398
fp = osutils.pathjoin(prefix, rp)
2399
if not recursive and '/' in rp:
2401
if not all and not selection[fc]:
2403
if kind is not None and fkind != kind:
2407
views.check_path_in_view(tree, fp)
2408
except errors.FileOutsideView:
2410
kindch = entry.kind_character()
2411
outstring = fp + kindch
2412
ui.ui_factory.clear_term()
2414
outstring = '%-8s %s' % (fc, outstring)
2415
if show_ids and fid is not None:
2416
outstring = "%-50s %s" % (outstring, fid)
2417
self.outf.write(outstring + '\n')
2419
self.outf.write(fp + '\0')
2422
self.outf.write(fid)
2423
self.outf.write('\0')
2431
self.outf.write('%-50s %s\n' % (outstring, my_id))
2433
self.outf.write(outstring + '\n')
2785
2438
class cmd_unknowns(Command):
2786
__doc__ = """List unknown files.
2439
"""List unknown files.
2790
2443
_see_also = ['ls']
2791
takes_options = ['directory']
2793
2445
@display_command
2794
def run(self, directory=u'.'):
2795
for f in WorkingTree.open_containing(directory)[0].unknowns():
2447
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2796
2448
self.outf.write(osutils.quotefn(f) + '\n')
2799
2451
class cmd_ignore(Command):
2800
__doc__ = """Ignore specified files or patterns.
2452
"""Ignore specified files or patterns.
2802
2454
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
2456
To remove patterns from the ignore list, edit the .bzrignore file.
2811
2457
After adding, editing or deleting that file either indirectly by
2812
2458
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.
2461
Note: ignore patterns containing shell wildcards must be quoted from
2837
2465
Ignore the top level Makefile::
2839
2467
bzr ignore ./Makefile
2841
Ignore .class files in all directories...::
2469
Ignore class files in all directories::
2843
2471
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
2473
Ignore .o files under the lib directory::
2855
2475
bzr ignore "lib/**/*.o"
2861
2481
Ignore everything but the "debian" toplevel directory::
2863
2483
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
2486
_see_also = ['status', 'ignored', 'patterns']
2874
2487
takes_args = ['name_pattern*']
2875
takes_options = ['directory',
2876
Option('default-rules',
2877
help='Display the default ignore rules that bzr uses.')
2489
Option('old-default-rules',
2490
help='Write out the ignore rules bzr < 0.9 always used.')
2880
def run(self, name_pattern_list=None, default_rules=None,
2493
def run(self, name_pattern_list=None, old_default_rules=None):
2882
2494
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)
2495
if old_default_rules is not None:
2496
# dump the rules and exit
2497
for pattern in ignores.OLD_DEFAULTS:
2888
2500
if not name_pattern_list:
2889
2501
raise errors.BzrCommandError("ignore requires at least one "
2890
"NAME_PATTERN or --default-rules.")
2502
"NAME_PATTERN or --old-default-rules")
2891
2503
name_pattern_list = [globbing.normalize_pattern(p)
2892
2504
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
2505
for name_pattern in name_pattern_list:
2902
2506
if (name_pattern[0] == '/' or
2903
2507
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2904
2508
raise errors.BzrCommandError(
2905
2509
"NAME_PATTERN should not be an absolute path")
2906
tree, relpath = WorkingTree.open_containing(directory)
2510
tree, relpath = WorkingTree.open_containing(u'.')
2907
2511
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2908
2512
ignored = globbing.Globster(name_pattern_list)
2910
self.add_cleanup(tree.lock_read().unlock)
2911
2515
for entry in tree.list_files():
2913
2517
if id is not None:
2914
2518
filename = entry[0]
2915
2519
if ignored.match(filename):
2916
matches.append(filename)
2520
matches.append(filename.encode('utf-8'))
2917
2522
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),))
2523
print "Warning: the following files are version controlled and" \
2524
" match your ignore pattern:\n%s" \
2525
"\nThese files will continue to be version controlled" \
2526
" unless you 'bzr remove' them." % ("\n".join(matches),)
2924
2529
class cmd_ignored(Command):
2925
__doc__ = """List ignored files and the patterns that matched them.
2530
"""List ignored files and the patterns that matched them.
2927
2532
List all the ignored files and the ignore pattern that caused the file to
2935
2540
encoding_type = 'replace'
2936
2541
_see_also = ['ignore', 'ls']
2937
takes_options = ['directory']
2939
2543
@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))
2545
tree = WorkingTree.open_containing(u'.')[0]
2548
for path, file_class, kind, file_id, entry in tree.list_files():
2549
if file_class != 'I':
2551
## XXX: Slightly inefficient since this was already calculated
2552
pat = tree.is_ignored(path)
2553
self.outf.write('%-50s %s\n' % (path, pat))
2951
2558
class cmd_lookup_revision(Command):
2952
__doc__ = """Lookup the revision-id from a revision-number
2559
"""Lookup the revision-id from a revision-number
2955
2562
bzr lookup-revision 33
2958
2565
takes_args = ['revno']
2959
takes_options = ['directory']
2961
2567
@display_command
2962
def run(self, revno, directory=u'.'):
2568
def run(self, revno):
2964
2570
revno = int(revno)
2965
2571
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)
2572
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2574
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2972
2577
class cmd_export(Command):
2973
__doc__ = """Export current or past revision to a destination directory or archive.
2578
"""Export current or past revision to a destination directory or archive.
2975
2580
If no revision is specified this exports the last committed revision.
3055
2655
@display_command
3056
2656
def run(self, filename, revision=None, name_from_revision=False,
3057
filters=False, directory=None):
3058
2658
if revision is not None and len(revision) != 1:
3059
2659
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3060
2660
" one revision specifier")
3061
2661
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)
2662
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2665
return self._run(tree, branch, relpath, filename, revision,
2666
name_from_revision, filters)
3067
2670
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3069
2672
if tree is None:
3070
2673
tree = b.basis_tree()
3071
2674
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3072
self.add_cleanup(rev_tree.lock_read().unlock)
3074
2676
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
2678
if name_from_revision:
3081
2679
# Try in revision if requested
3082
2680
if old_file_id is None:
3084
2682
"%r is not present in revision %s" % (
3085
2683
filename, rev_tree.get_revision_id()))
3087
actual_file_id = old_file_id
2685
content = rev_tree.get_file_text(old_file_id)
3089
2687
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
2689
if cur_file_id is not None:
2690
# Then try with the actual file id
2692
content = rev_tree.get_file_text(cur_file_id)
2694
except errors.NoSuchId:
2695
# The actual file id didn't exist at that time
2697
if not found and old_file_id is not None:
2698
# Finally try with the old file id
2699
content = rev_tree.get_file_text(old_file_id)
2702
# Can't be found anywhere
3095
2703
raise errors.BzrCommandError(
3096
2704
"%r is not present in revision %s" % (
3097
2705
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)
2707
from bzrlib.filters import (
2708
ContentFilterContext,
2709
filtered_output_bytes,
2711
filters = rev_tree._content_filter_stack(relpath)
2712
chunks = content.splitlines(True)
2713
content = filtered_output_bytes(chunks, filters,
2714
ContentFilterContext(relpath, rev_tree))
2715
self.outf.writelines(content)
3104
content = rev_tree.get_file_text(actual_file_id)
3106
self.outf.write(content)
2717
self.outf.write(content)
3109
2720
class cmd_local_time_offset(Command):
3110
__doc__ = """Show the offset in seconds from GMT to local time."""
2721
"""Show the offset in seconds from GMT to local time."""
3112
2723
@display_command
3114
self.outf.write("%s\n" % osutils.local_time_offset())
2725
print osutils.local_time_offset()
3118
2729
class cmd_commit(Command):
3119
__doc__ = """Commit changes into a new revision.
2730
"""Commit changes into a new revision.
3121
2732
An explanatory message needs to be given for each commit. This is
3122
2733
often done by using the --message option (getting the message from the
3277
2902
if local and not tree.branch.get_bound_location():
3278
2903
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
2905
def get_message(commit_obj):
3302
2906
"""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,
2907
my_message = message
2908
if my_message is None and not file:
2909
t = make_commit_message_template_encoded(tree,
3315
2910
selected_list, diff=show_diff,
3316
2911
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)
2912
start_message = generate_commit_message_template(commit_obj)
2913
my_message = edit_commit_message_encoded(t,
2914
start_message=start_message)
3327
2915
if my_message is None:
3328
2916
raise errors.BzrCommandError("please specify a commit"
3329
2917
" message with either --message or --file")
2918
elif my_message and file:
2919
raise errors.BzrCommandError(
2920
"please specify either --message or --file")
2922
my_message = codecs.open(file, 'rt',
2923
osutils.get_user_encoding()).read()
3330
2924
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 \"\".")
2925
raise errors.BzrCommandError("empty commit message specified")
3335
2926
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
2929
tree.commit(message_callback=get_message,
3343
2930
specific_files=selected_list,
3344
2931
allow_pointless=unchanged, strict=strict, local=local,
3345
2932
reporter=None, verbose=verbose, revprops=properties,
3346
authors=author, timestamp=commit_stamp,
3348
exclude=tree.safe_relpath_files(exclude),
2934
exclude=safe_relpath_files(tree, exclude))
3350
2935
except PointlessCommit:
2936
# FIXME: This should really happen before the file is read in;
2937
# perhaps prepare the commit; get the message; then actually commit
3351
2938
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.")
2939
" Use --unchanged to commit anyhow.")
3354
2940
except ConflictsInTree:
3355
2941
raise errors.BzrCommandError('Conflicts detected in working '
3356
2942
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3375
2960
The working tree and branch checks will only give output if a problem is
3376
2961
detected. The output fields of the repository check are:
3379
This is just the number of revisions checked. It doesn't
3383
This is just the number of versionedfiles checked. It
3384
doesn't indicate a problem.
3386
unreferenced ancestors
3387
Texts that are ancestors of other texts, but
3388
are not properly referenced by the revision ancestry. This is a
3389
subtle problem that Bazaar can work around.
3392
This is the total number of unique file contents
3393
seen in the checked revisions. It does not indicate a problem.
3396
This is the total number of repeated texts seen
3397
in the checked revisions. Texts can be repeated when their file
3398
entries are modified, but the file contents are not. It does not
2963
revisions: This is just the number of revisions checked. It doesn't
2965
versionedfiles: This is just the number of versionedfiles checked. It
2966
doesn't indicate a problem.
2967
unreferenced ancestors: Texts that are ancestors of other texts, but
2968
are not properly referenced by the revision ancestry. This is a
2969
subtle problem that Bazaar can work around.
2970
unique file texts: This is the total number of unique file contents
2971
seen in the checked revisions. It does not indicate a problem.
2972
repeated file texts: This is the total number of repeated texts seen
2973
in the checked revisions. Texts can be repeated when their file
2974
entries are modified, but the file contents are not. It does not
3401
2977
If no restrictions are specified, all Bazaar data that is found at the given
3402
2978
location will be checked.
3439
3015
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/.
3016
"""Upgrade branch storage to current format.
3018
The check command or bzr developers may sometimes advise you to run
3019
this command. When the default format has changed you may also be warned
3020
during other operations to upgrade.
3472
_see_also = ['check', 'reconcile', 'formats']
3023
_see_also = ['check']
3473
3024
takes_args = ['url?']
3474
3025
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."),
3026
RegistryOption('format',
3027
help='Upgrade to a specific format. See "bzr help'
3028
' formats" for details.',
3029
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3030
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3031
value_switches=True, title='Branch format'),
3487
def run(self, url='.', format=None, clean=False, dry_run=False):
3034
def run(self, url='.', format=None):
3488
3035
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
3036
upgrade(url, format)
3498
3039
class cmd_whoami(Command):
3499
__doc__ = """Show or set bzr user id.
3040
"""Show or set bzr user id.
3502
3043
Show the email of the current user::
3518
3058
encoding_type = 'replace'
3520
3060
@display_command
3521
def run(self, email=False, branch=False, name=None, directory=None):
3061
def run(self, email=False, branch=False, name=None):
3522
3062
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()
3063
# use branch if we're inside one; otherwise global config
3065
c = Branch.open_containing('.')[0].get_config()
3066
except errors.NotBranchError:
3067
c = config.GlobalConfig()
3532
3069
self.outf.write(c.user_email() + '\n')
3534
3071
self.outf.write(c.username() + '\n')
3538
raise errors.BzrCommandError("--email can only be used to display existing "
3541
3074
# display a warning if an email address isn't included in the given name.
3543
_mod_config.extract_email_address(name)
3076
config.extract_email_address(name)
3544
3077
except errors.NoEmailInUsername, e:
3545
3078
warning('"%s" does not seem to contain an email address. '
3546
3079
'This is allowed, but not recommended.', name)
3548
3081
# 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()
3083
c = Branch.open_containing('.')[0].get_config()
3555
c = _mod_config.GlobalConfig()
3085
c = config.GlobalConfig()
3556
3086
c.set_user_option('email', name)
3559
3089
class cmd_nick(Command):
3560
__doc__ = """Print or set the branch nickname.
3090
"""Print or set the branch nickname.
3562
3092
If unset, the tree root directory name is used as the nickname.
3563
3093
To print the current nickname, execute with no argument.
3793
3323
raise errors.BzrCommandError("subunit not available. subunit "
3794
3324
"needs to be installed to use --subunit.")
3795
3325
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
3327
self.additional_selftest_args.setdefault(
3807
3328
'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
3330
test_suite_factory = benchmarks.test_suite
3331
# Unless user explicitly asks for quiet, be verbose in benchmarks
3332
verbose = not is_quiet()
3333
# TODO: should possibly lock the history file...
3334
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(
3336
test_suite_factory = None
3839
result = tests.selftest(**selftest_kwargs)
3339
selftest_kwargs = {"verbose": verbose,
3341
"stop_on_failure": one,
3342
"transport": transport,
3343
"test_suite_factory": test_suite_factory,
3344
"lsprof_timed": lsprof_timed,
3345
"bench_history": benchfile,
3346
"matching_tests_first": first,
3347
"list_only": list_only,
3348
"random_seed": randomize,
3349
"exclude_pattern": exclude,
3351
"load_list": load_list,
3352
"debug_flags": debugflag,
3353
"starting_with": starting_with
3355
selftest_kwargs.update(self.additional_selftest_args)
3356
result = selftest(**selftest_kwargs)
3358
if benchfile is not None:
3842
3360
return int(not result)
3845
3363
class cmd_version(Command):
3846
__doc__ = """Show version of bzr."""
3364
"""Show version of bzr."""
3848
3366
encoding_type = 'replace'
3849
3367
takes_options = [
3883
3401
branch1 = Branch.open_containing(branch)[0]
3884
3402
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)
3407
last1 = ensure_null(branch1.last_revision())
3408
last2 = ensure_null(branch2.last_revision())
3410
graph = branch1.repository.get_graph(branch2.repository)
3411
base_rev_id = graph.find_unique_lca(last1, last2)
3413
print 'merge base is revision %s' % base_rev_id
3896
3420
class cmd_merge(Command):
3897
__doc__ = """Perform a three-way merge.
3421
"""Perform a three-way merge.
3899
3423
The source of the merge can be specified either in the form of a branch,
3900
3424
or in the form of a path to a file containing a merge directive generated
3901
3425
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.
3426
or the branch most recently merged using --remember.
3428
When merging a branch, by default the tip will be merged. To pick a different
3429
revision, pass --revision. If you specify two values, the first will be used as
3430
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3431
available revisions, like this is commonly referred to as "cherrypicking".
3433
Revision numbers are always relative to the branch being merged.
3435
By default, bzr will try to merge in all new work from the other
3436
branch, automatically determining an appropriate base. If this
3437
fails, you may need to give an explicit base.
3924
3439
Merge will do its best to combine the changes in two branches, but there
3925
3440
are some kinds of problems only a human can fix. When it encounters those,
3929
3444
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.
3446
If there is no default branch set, the first merge will set it. After
3447
that, you can omit the branch to use the default. To change the
3448
default, use --remember. The value will only be saved if the remote
3449
location can be accessed.
3936
3451
The results of the merge are placed into the destination working
3937
3452
directory, where they can be reviewed (with bzr diff), tested, and then
3938
3453
committed to record the result of the merge.
3940
3455
merge refuses to run if there are any uncommitted changes, unless
3941
--force is given. If --force is given, then the changes from the source
3942
will be merged with the current working tree, including any uncommitted
3943
changes in the tree. The --force option can also be used to create a
3944
merge revision which has more than two parents.
3946
If one would like to merge changes from the working tree of the other
3947
branch without merging any committed revisions, the --uncommitted option
3950
To select only some changes to merge, use "merge -i", which will prompt
3951
you to apply each diff hunk and file change, similar to "shelve".
3954
To merge all new revisions from bzr.dev::
3459
To merge the latest revision from bzr.dev::
3956
3461
bzr merge ../bzr.dev
4019
3516
allow_pending = True
4020
3517
verified = 'inapplicable'
4022
3518
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')
3520
# die as quickly as possible if there are uncommitted changes
4028
3522
basis_tree = tree.revision_tree(tree.last_revision())
4029
3523
except errors.NoSuchRevision:
4030
3524
basis_tree = tree.basis_tree()
4032
# die as quickly as possible if there are uncommitted changes
4034
if tree.has_changes():
3526
changes = tree.changes_from(basis_tree)
3527
if changes.has_changed():
4035
3528
raise errors.UncommittedChanges(tree)
4037
3530
view_info = _get_view_info_for_change_reporter(tree)
4038
3531
change_reporter = delta._ChangeReporter(
4039
3532
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:
3535
pb = ui.ui_factory.nested_progress_bar()
3536
cleanups.append(pb.finished)
3538
cleanups.append(tree.unlock)
3539
if location is not None:
3541
mergeable = bundle.read_mergeable_from_url(location,
3542
possible_transports=possible_transports)
3543
except errors.NotABundle:
3547
raise errors.BzrCommandError('Cannot use --uncommitted'
3548
' with bundles or merge directives.')
3550
if revision is not None:
3551
raise errors.BzrCommandError(
3552
'Cannot use -r with merge directives or bundles')
3553
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3556
if merger is None and uncommitted:
3557
if revision is not None and len(revision) > 0:
3558
raise errors.BzrCommandError('Cannot use --uncommitted and'
3559
' --revision at the same time.')
3560
location = self._select_branch_location(tree, location)[0]
3561
other_tree, other_path = WorkingTree.open_containing(location)
3562
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3564
allow_pending = False
3565
if other_path != '':
3566
merger.interesting_files = [other_path]
3569
merger, allow_pending = self._get_merger_from_branch(tree,
3570
location, revision, remember, possible_transports, pb)
3572
merger.merge_type = merge_type
3573
merger.reprocess = reprocess
3574
merger.show_base = show_base
3575
self.sanity_check_merger(merger)
3576
if (merger.base_rev_id == merger.other_rev_id and
3577
merger.other_rev_id is not None):
3578
note('Nothing to do.')
3581
if merger.interesting_files is not None:
3582
raise errors.BzrCommandError('Cannot pull individual files')
3583
if (merger.base_rev_id == tree.last_revision()):
3584
result = tree.pull(merger.other_branch, False,
3585
merger.other_rev_id)
3586
result.report(self.outf)
3588
merger.check_basis(False)
3590
return self._do_preview(merger)
4051
raise errors.BzrCommandError('Cannot use --uncommitted'
4052
' with bundles or merge directives.')
4054
if revision is not None:
4055
raise errors.BzrCommandError(
4056
'Cannot use -r with merge directives or bundles')
4057
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4060
if merger is None and uncommitted:
4061
if revision is not None and len(revision) > 0:
4062
raise errors.BzrCommandError('Cannot use --uncommitted and'
4063
' --revision at the same time.')
4064
merger = self.get_merger_from_uncommitted(tree, location, None)
4065
allow_pending = False
4068
merger, allow_pending = self._get_merger_from_branch(tree,
4069
location, revision, remember, possible_transports, None)
4071
merger.merge_type = merge_type
4072
merger.reprocess = reprocess
4073
merger.show_base = show_base
4074
self.sanity_check_merger(merger)
4075
if (merger.base_rev_id == merger.other_rev_id and
4076
merger.other_rev_id is not None):
4077
# check if location is a nonexistent file (and not a branch) to
4078
# disambiguate the 'Nothing to do'
4079
if merger.interesting_files:
4080
if not merger.other_tree.has_filename(
4081
merger.interesting_files[0]):
4082
note("merger: " + str(merger))
4083
raise errors.PathsDoNotExist([location])
4084
note('Nothing to do.')
4086
if pull and not preview:
4087
if merger.interesting_files is not None:
4088
raise errors.BzrCommandError('Cannot pull individual files')
4089
if (merger.base_rev_id == tree.last_revision()):
4090
result = tree.pull(merger.other_branch, False,
4091
merger.other_rev_id)
4092
result.report(self.outf)
4094
if merger.this_basis is None:
4095
raise errors.BzrCommandError(
4096
"This branch has no commits."
4097
" (perhaps you would prefer 'bzr pull')")
4099
return self._do_preview(merger)
4101
return self._do_interactive(merger)
4103
return self._do_merge(merger, change_reporter, allow_pending,
4106
def _get_preview(self, merger):
3592
return self._do_merge(merger, change_reporter, allow_pending,
3595
for cleanup in reversed(cleanups):
3598
def _do_preview(self, merger):
3599
from bzrlib.diff import show_diff_trees
4107
3600
tree_merger = merger.make_merger()
4108
3601
tt = tree_merger.make_preview_transform()
4109
self.add_cleanup(tt.finalize)
4110
result_tree = tt.get_preview_tree()
4113
def _do_preview(self, merger):
4114
from bzrlib.diff import show_diff_trees
4115
result_tree = self._get_preview(merger)
4116
path_encoding = osutils.get_diff_header_encoding()
4117
show_diff_trees(merger.this_tree, result_tree, self.outf,
4118
old_label='', new_label='',
4119
path_encoding=path_encoding)
3603
result_tree = tt.get_preview_tree()
3604
show_diff_trees(merger.this_tree, result_tree, self.outf,
3605
old_label='', new_label='')
4121
3609
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4122
3610
merger.change_reporter = change_reporter
4188
3658
base_branch, base_path = Branch.open_containing(base_loc,
4189
3659
possible_transports)
4190
3660
# Find the revision ids
4191
other_revision_id = None
4192
base_revision_id = None
4193
if revision is not None:
4194
if len(revision) >= 1:
4195
other_revision_id = revision[-1].as_revision_id(other_branch)
4196
if len(revision) == 2:
4197
base_revision_id = revision[0].as_revision_id(base_branch)
4198
if other_revision_id is None:
3661
if revision is None or len(revision) < 1 or revision[-1] is None:
4199
3662
other_revision_id = _mod_revision.ensure_null(
4200
3663
other_branch.last_revision())
4201
# Remember where we merge from. We need to remember if:
4202
# - user specify a location (and we don't merge from the parent
4204
# - user ask to remember or there is no previous location set to merge
4205
# from and user didn't ask to *not* remember
4206
if (user_location is not None
4208
or (remember is None
4209
and tree.branch.get_submit_branch() is None)))):
3665
other_revision_id = revision[-1].as_revision_id(other_branch)
3666
if (revision is not None and len(revision) == 2
3667
and revision[0] is not None):
3668
base_revision_id = revision[0].as_revision_id(base_branch)
3670
base_revision_id = None
3671
# Remember where we merge from
3672
if ((remember or tree.branch.get_submit_branch() is None) and
3673
user_location is not None):
4210
3674
tree.branch.set_submit_branch(other_branch.base)
4211
# Merge tags (but don't set them in the master branch yet, the user
4212
# might revert this merge). Commit will propagate them.
4213
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3675
_merge_tags_if_possible(other_branch, tree.branch)
4214
3676
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4215
3677
other_revision_id, base_revision_id, other_branch, base_branch)
4216
3678
if other_path != '':
4315
3763
def run(self, file_list=None, merge_type=None, show_base=False,
4316
3764
reprocess=False):
4317
from bzrlib.conflicts import restore
4318
3765
if merge_type is None:
4319
3766
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":
3767
tree, file_list = tree_files(file_list)
3770
parents = tree.get_parent_ids()
3771
if len(parents) != 2:
3772
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3773
" merges. Not cherrypicking or"
3775
repository = tree.branch.repository
3776
interesting_ids = None
3778
conflicts = tree.conflicts()
3779
if file_list is not None:
3780
interesting_ids = set()
3781
for filename in file_list:
3782
file_id = tree.path2id(filename)
3784
raise errors.NotVersionedError(filename)
3785
interesting_ids.add(file_id)
3786
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:
3789
for name, ie in tree.inventory.iter_entries(file_id):
3790
interesting_ids.add(ie.file_id)
3791
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3793
# Remerge only supports resolving contents conflicts
3794
allowed_conflicts = ('text conflict', 'contents conflict')
3795
restore_files = [c.path for c in conflicts
3796
if c.typestring in allowed_conflicts]
3797
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3798
tree.set_conflicts(ConflictList(new_conflicts))
3799
if file_list is not None:
3800
restore_files = file_list
3801
for filename in restore_files:
3803
restore(tree.abspath(filename))
3804
except errors.NotConflicted:
3806
# Disable pending merges, because the file texts we are remerging
3807
# have not had those merges performed. If we use the wrong parents
3808
# list, we imply that the working tree text has seen and rejected
3809
# all the changes from the other tree, when in fact those changes
3810
# have not yet been seen.
3811
pb = ui.ui_factory.nested_progress_bar()
3812
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()
3814
merger = _mod_merge.Merger.from_revision_ids(pb,
3816
merger.interesting_ids = interesting_ids
3817
merger.merge_type = merge_type
3818
merger.show_base = show_base
3819
merger.reprocess = reprocess
3820
conflicts = merger.do_merge()
3822
tree.set_parent_ids(parents)
4372
tree.set_parent_ids(parents)
4373
3826
if conflicts > 0:
4398
3850
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
3853
Any files that have been newly added since that revision will be deleted,
3854
with a backup kept if appropriate. Directories containing unknown files
3855
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
3857
The working tree contains a list of pending merged revisions, which will
3858
be included as parents in the next commit. Normally, revert clears that
3859
list as well as reverting the files. If any files are specified, revert
3860
leaves the pending merge list alone and reverts only the files. Use "bzr
3861
revert ." in the tree root to revert all files but keep the merge record,
3862
and "bzr revert --forget-merges" to clear the pending merge list without
4413
3863
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']
3866
_see_also = ['cat', 'export']
4427
3867
takes_options = [
4429
3869
Option('no-backup', "Do not save backups of reverted files."),
4435
3875
def run(self, revision=None, no_backup=False, file_list=None,
4436
3876
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)
3877
tree, file_list = tree_files(file_list)
3881
tree.set_parent_ids(tree.get_parent_ids()[:1])
3883
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4445
3888
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4446
3889
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)
3890
pb = ui.ui_factory.nested_progress_bar()
3892
tree.revert(file_list, rev_tree, not no_backup, pb,
3893
report_changes=True)
4451
3898
class cmd_assert_fail(Command):
4452
__doc__ = """Test reporting of assertion failures"""
3899
"""Test reporting of assertion failures"""
4453
3900
# intended just for use in testing
4606
4043
_get_revision_range(revision,
4607
4044
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")
4046
local_branch.lock_read()
4048
remote_branch.lock_read()
4050
local_extra, remote_extra = find_unmerged(
4051
local_branch, remote_branch, restrict,
4052
backward=not reverse,
4053
include_merges=include_merges,
4054
local_revid_range=local_revid_range,
4055
remote_revid_range=remote_revid_range)
4057
if log_format is None:
4058
registry = log.log_formatter_registry
4059
log_format = registry.get_default(local_branch)
4060
lf = log_format(to_file=self.outf,
4062
show_timezone='original')
4065
if local_extra and not theirs_only:
4066
message("You have %d extra revision(s):\n" %
4068
for revision in iter_log_revisions(local_extra,
4069
local_branch.repository,
4071
lf.log_revision(revision)
4072
printed_local = True
4075
printed_local = False
4077
if remote_extra and not mine_only:
4078
if printed_local is True:
4080
message("You are missing %d revision(s):\n" %
4082
for revision in iter_log_revisions(remote_extra,
4083
remote_branch.repository,
4085
lf.log_revision(revision)
4088
if mine_only and not local_extra:
4089
# We checked local, and found nothing extra
4090
message('This branch is up to date.\n')
4091
elif theirs_only and not remote_extra:
4092
# We checked remote, and found nothing extra
4093
message('Other branch is up to date.\n')
4094
elif not (mine_only or theirs_only or local_extra or
4096
# We checked both branches, and neither one had extra
4098
message("Branches are up to date.\n")
4100
remote_branch.unlock()
4102
local_branch.unlock()
4659
4103
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)
4104
local_branch.lock_write()
4106
# handle race conditions - a parent might be set while we run.
4107
if local_branch.get_parent() is None:
4108
local_branch.set_parent(remote_branch.base)
4110
local_branch.unlock()
4664
4111
return status_code
4667
4114
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.
4115
"""Compress the data within a repository."""
4686
4117
_see_also = ['repositories']
4687
4118
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):
4120
def run(self, branch_or_repo='.'):
4693
4121
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4695
4123
branch = dir.open_branch()
4696
4124
repository = branch.repository
4697
4125
except errors.NotBranchError:
4698
4126
repository = dir.open_repository()
4699
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4702
4130
class cmd_plugins(Command):
4703
__doc__ = """List the installed plugins.
4131
"""List the installed plugins.
4705
4133
This command displays the list of installed plugins including
4706
4134
version of plugin and a short description of each.
4713
4141
adding new commands, providing additional network transports and
4714
4142
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.
4144
See the Bazaar web site, http://bazaar-vcs.org, for further
4145
information on plugins including where to find them and how to
4146
install them. Instructions are also provided there on how to
4147
write new plugins using the Python programming language.
4721
4149
takes_options = ['verbose']
4723
4151
@display_command
4724
4152
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)))
4153
import bzrlib.plugin
4154
from inspect import getdoc
4156
for name, plugin in bzrlib.plugin.plugins().items():
4157
version = plugin.__version__
4158
if version == 'unknown':
4160
name_ver = '%s %s' % (name, version)
4161
d = getdoc(plugin.module)
4163
doc = d.split('\n')[0]
4165
doc = '(no description)'
4166
result.append((name_ver, doc, plugin.path()))
4167
for name_ver, doc, path in sorted(result):
4731
4175
class cmd_testament(Command):
4732
__doc__ = """Show testament (signing-form) of a revision."""
4176
"""Show testament (signing-form) of a revision."""
4733
4177
takes_options = [
4735
4179
Option('long', help='Produce long-format testament.'),
4777
4224
Option('long', help='Show commit date in annotations.'),
4782
4228
encoding_type = 'exact'
4784
4230
@display_command
4785
4231
def run(self, filename, all=False, long=False, revision=None,
4786
show_ids=False, directory=None):
4787
from bzrlib.annotate import (
4233
from bzrlib.annotate import annotate_file, annotate_file_tree
4790
4234
wt, branch, relpath = \
4791
_open_directory_or_containing_tree_or_branch(filename, directory)
4235
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4792
4236
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)
4241
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4243
file_id = wt.path2id(relpath)
4245
file_id = tree.path2id(relpath)
4247
raise errors.NotVersionedError(filename)
4248
file_version = tree.inventory[file_id].revision
4249
if wt is not None and revision is None:
4250
# If there is a tree and we're not annotating historical
4251
# versions, annotate the working tree's content.
4252
annotate_file_tree(wt, file_id, self.outf, long, all,
4255
annotate_file(branch, file_version, file_id, long, all, self.outf,
4814
4264
class cmd_re_sign(Command):
4815
__doc__ = """Create a digital signature for an existing revision."""
4265
"""Create a digital signature for an existing revision."""
4816
4266
# TODO be able to replace existing ones.
4818
4268
hidden = True # is this right ?
4819
4269
takes_args = ['revision_id*']
4820
takes_options = ['directory', 'revision']
4270
takes_options = ['revision']
4822
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4272
def run(self, revision_id_list=None, revision=None):
4823
4273
if revision_id_list is not None and revision is not None:
4824
4274
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4825
4275
if revision_id_list is None and revision is None:
4826
4276
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)
4277
b = WorkingTree.open_containing(u'.')[0].branch
4280
return self._run(b, revision_id_list, revision)
4831
4284
def _run(self, b, revision_id_list, revision):
4832
4285
import bzrlib.gpg as gpg
5022
4478
end_revision=last_revno)
5025
self.outf.write('Dry-run, pretending to remove'
5026
' the above revisions.\n')
4481
print 'Dry-run, pretending to remove the above revisions.'
4483
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')
4485
print 'The above revision(s) will be removed.'
4487
val = raw_input('Are you sure [y/N]? ')
4488
if val.lower() not in ('y', 'yes'):
5038
4492
mutter('Uncommitting from {%s} to {%s}',
5039
4493
last_rev_id, rev_id)
5040
4494
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5041
4495
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)
4496
note('You can restore the old tip by running:\n'
4497
' bzr pull . -r revid:%s', last_rev_id)
5046
4500
class cmd_break_lock(Command):
5047
__doc__ = """Break a dead lock.
5049
This command breaks a lock on a repository, branch, working directory or
4501
"""Break a dead lock on a repository, branch or working directory.
5052
4503
CAUTION: Locks should only be broken when you are sure that the process
5053
4504
holding the lock has been stopped.
5055
You can get information on what locks are open via the 'bzr info
5056
[location]' command.
4506
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
4511
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):
4513
def run(self, location=None, show=False):
5073
4514
if location is None:
5074
4515
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:
4516
control, relpath = bzrdir.BzrDir.open_containing(location)
4518
control.break_lock()
4519
except NotImplementedError:
5090
4523
class cmd_wait_until_signalled(Command):
5091
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4524
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5093
4526
This just prints a line to signal when it is ready, then blocks on stdin.
5352
4780
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.
4783
If --no-bundle is specified, then public_branch is needed (and must be
4784
up-to-date), so that the receiver can perform the merge using the
4785
public_branch. The public_branch is always included if known, so that
4786
people can check it later.
4788
The submit branch defaults to the parent, but can be overridden. Both
4789
submit branch and public branch will be remembered if supplied.
4791
If a public_branch is known for the submit_branch, that public submit
4792
branch is used in the merge instructions. This means that a local mirror
4793
can be used as your actual submit branch, once you have set public_branch
5388
4796
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.
4797
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5390
4798
If the preferred client can't be found (or used), your editor will be used.
5392
4800
To use a specific mail program, set the mail_client configuration option.
5393
4801
(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
4802
specific clients are "claws", "evolution", "kmail", "mutt", and
4803
"thunderbird"; generic options are "default", "editor", "emacsclient",
4804
"mapi", and "xdg-email". Plugins may also add supported clients.
5399
4806
If mail is being sent, a to address is required. This can be supplied
5400
4807
either on the commandline, by setting the submit_to configuration
5434
4837
short_name='f',
5436
4839
Option('output', short_name='o',
5437
help='Write merge directive to this file or directory; '
4840
help='Write merge directive to this file; '
5438
4841
'use - for stdout.',
5441
help='Refuse to send if there are uncommitted changes in'
5442
' the working tree, --no-strict disables the check.'),
5443
4843
Option('mail-to', help='Mail the request to this address.',
5447
4847
Option('body', help='Body for the email.', type=unicode),
5448
4848
RegistryOption('format',
5449
help='Use the specified output format.',
5450
lazy_registry=('bzrlib.send', 'format_registry')),
4849
help='Use the specified output format.',
4850
lazy_registry=('bzrlib.send', 'format_registry'))
5453
4853
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5454
no_patch=False, revision=None, remember=None, output=None,
5455
format=None, mail_to=None, message=None, body=None,
5456
strict=None, **kwargs):
4854
no_patch=False, revision=None, remember=False, output=None,
4855
format=None, mail_to=None, message=None, body=None, **kwargs):
5457
4856
from bzrlib.send import send
5458
4857
return send(submit_branch, revision, public_branch, remember,
5459
format, no_bundle, no_patch, output,
5460
kwargs.get('from', '.'), mail_to, message, body,
4858
format, no_bundle, no_patch, output,
4859
kwargs.get('from', '.'), mail_to, message, body,
5465
4863
class cmd_bundle_revisions(cmd_send):
5466
__doc__ = """Create a merge-directive for submitting changes.
4864
"""Create a merge-directive for submitting changes.
5468
4866
A merge directive provides many things needed for requesting merges:
5551
4946
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5552
4947
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
4950
_see_also = ['commit', 'tags']
5561
takes_args = ['tag_name?']
4951
takes_args = ['tag_name']
5562
4952
takes_options = [
5563
4953
Option('delete',
5564
4954
help='Delete this tag rather than placing it.',
5566
custom_help('directory',
5567
help='Branch in which to place the tag.'),
4957
help='Branch in which to place the tag.',
5568
4961
Option('force',
5569
4962
help='Replace existing tags.',
5574
def run(self, tag_name=None,
4967
def run(self, tag_name,
5580
4973
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)
4977
branch.tags.delete_tag(tag_name)
4978
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)
4981
if len(revision) != 1:
4982
raise errors.BzrCommandError(
4983
"Tags can only be placed on a single revision, "
4985
revision_id = revision[0].as_revision_id(branch)
4987
revision_id = branch.last_revision()
4988
if (not force) and branch.tags.has_tag(tag_name):
4989
raise errors.TagAlreadyExists(tag_name)
4990
branch.tags.set_tag(tag_name, revision_id)
4991
self.outf.write('Created tag %s.\n' % tag_name)
5607
4996
class cmd_tags(Command):
5608
__doc__ = """List tags.
5610
4999
This command shows a table of tag names and the revisions they reference.
5613
5002
_see_also = ['tag']
5614
5003
takes_options = [
5615
custom_help('directory',
5616
help='Branch whose tags should be displayed.'),
5617
RegistryOption('sort',
5005
help='Branch whose tags should be displayed.',
5009
RegistryOption.from_kwargs('sort',
5618
5010
'Sort tags by different criteria.', title='Sorting',
5619
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5011
alpha='Sort tags lexicographically (default).',
5012
time='Sort tags chronologically.',
5625
5018
@display_command
5626
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5627
from bzrlib.tag import tag_sort_methods
5628
5025
branch, relpath = Branch.open_containing(directory)
5630
5027
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)
5034
graph = branch.repository.get_graph()
5035
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5036
revid1, revid2 = rev1.rev_id, rev2.rev_id
5037
# only show revisions between revid1 and revid2 (inclusive)
5038
tags = [(tag, revid) for tag, revid in tags if
5039
graph.is_between(revid, revid1, revid2)]
5042
elif sort == 'time':
5044
for tag, revid in tags:
5046
revobj = branch.repository.get_revision(revid)
5047
except errors.NoSuchRevision:
5048
timestamp = sys.maxint # place them at the end
5050
timestamp = revobj.timestamp
5051
timestamps[revid] = timestamp
5052
tags.sort(key=lambda x: timestamps[x[1]])
5054
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5055
for index, (tag, revid) in enumerate(tags):
5057
revno = branch.revision_id_to_dotted_revno(revid)
5058
if isinstance(revno, tuple):
5059
revno = '.'.join(map(str, revno))
5060
except errors.NoSuchRevision:
5061
# Bad tag data/merges can lead to tagged revisions
5062
# which are not in this branch. Fail gracefully ...
5064
tags[index] = (tag, revno)
5658
5067
for tag, revspec in tags:
5659
5068
self.outf.write('%-20s %s\n' % (tag, revspec))
5662
5071
class cmd_reconfigure(Command):
5663
__doc__ = """Reconfigure the type of a bzr directory.
5072
"""Reconfigure the type of a bzr directory.
5665
5074
A target configuration must be specified.
5697
5106
Option('bind-to', help='Branch to bind checkout to.', type=str),
5698
5107
Option('force',
5699
help='Perform reconfiguration even if local changes'
5701
Option('stacked-on',
5702
help='Reconfigure a branch to be stacked on another branch.',
5706
help='Reconfigure a branch to be unstacked. This '
5707
'may require copying substantial data into it.',
5108
help='Perform reconfiguration even if local changes'
5711
def run(self, location=None, target_type=None, bind_to=None, force=False,
5112
def run(self, location=None, target_type=None, bind_to=None, force=False):
5714
5113
directory = bzrdir.BzrDir.open(location)
5715
if stacked_on and unstacked:
5716
raise errors.BzrCommandError("Can't use both --stacked-on and --unstacked")
5717
elif stacked_on is not None:
5718
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5720
reconfigure.ReconfigureUnstacked().apply(directory)
5721
# At the moment you can use --stacked-on and a different
5722
# reconfiguration shape at the same time; there seems no good reason
5724
5114
if target_type is None:
5725
if stacked_on or unstacked:
5728
raise errors.BzrCommandError('No target configuration '
5115
raise errors.BzrCommandError('No target configuration specified')
5730
5116
elif target_type == 'branch':
5731
5117
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5732
5118
elif target_type == 'tree':
5769
5155
/path/to/newbranch.
5771
5157
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
5158
locally, in which case switching will update the the local nickname to be
5773
5159
that of the master.
5776
takes_args = ['to_location?']
5777
takes_options = ['directory',
5779
help='Switch even if local commits will be lost.'),
5781
Option('create-branch', short_name='b',
5782
help='Create the target branch from this one before'
5783
' switching to it.'),
5162
takes_args = ['to_location']
5163
takes_options = [Option('force',
5164
help='Switch even if local commits will be lost.')
5786
def run(self, to_location=None, force=False, create_branch=False,
5787
revision=None, directory=u'.'):
5167
def run(self, to_location, force=False):
5788
5168
from bzrlib import switch
5789
tree_location = directory
5790
revision = _get_one_revision('switch', revision)
5791
5170
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
5172
branch = control_dir.open_branch()
5799
5173
had_explicit_nick = branch.get_config().has_explicit_nickname()
5800
5174
except errors.NotBranchError:
5802
5175
had_explicit_nick = False
5805
raise errors.BzrCommandError('cannot create branch without'
5807
to_location = directory_service.directories.dereference(
5809
if '/' not in to_location and '\\' not in to_location:
5810
# This path is meant to be relative to the existing branch
5811
this_url = self._get_branch_location(control_dir)
5812
to_location = urlutils.join(this_url, '..', to_location)
5813
to_branch = branch.bzrdir.sprout(to_location,
5814
possible_transports=[branch.bzrdir.root_transport],
5815
source_branch=branch).open_branch()
5818
to_branch = Branch.open(to_location)
5819
except errors.NotBranchError:
5820
this_url = self._get_branch_location(control_dir)
5821
to_branch = Branch.open(
5822
urlutils.join(this_url, '..', to_location))
5823
if revision is not None:
5824
revision = revision.as_revision_id(to_branch)
5825
switch.switch(control_dir, to_branch, force, revision_id=revision)
5177
to_branch = Branch.open(to_location)
5178
except errors.NotBranchError:
5179
this_url = self._get_branch_location(control_dir)
5180
to_branch = Branch.open(
5181
urlutils.join(this_url, '..', to_location))
5182
switch.switch(control_dir, to_branch, force)
5826
5183
if had_explicit_nick:
5827
5184
branch = control_dir.open_branch() #get the new branch!
5828
5185
branch.nick = to_branch.nick
6099
5417
Option('destroy',
6100
5418
help='Destroy removed changes instead of shelving them.'),
6102
_see_also = ['unshelve', 'configuration']
5420
_see_also = ['unshelve']
6104
5422
def run(self, revision=None, all=False, file_list=None, message=None,
6105
writer=None, list=False, destroy=False, directory=None):
5423
writer=None, list=False, destroy=False):
6107
return self.run_for_list(directory=directory)
5425
return self.run_for_list()
6108
5426
from bzrlib.shelf_ui import Shelver
6109
5427
if writer is None:
6110
5428
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)
5430
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5431
message, destroy=destroy).run()
6118
5432
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))
5435
def run_for_list(self):
5436
tree = WorkingTree.open_containing('.')[0]
5439
manager = tree.get_shelf_manager()
5440
shelves = manager.active_shelves()
5441
if len(shelves) == 0:
5442
note('No shelved changes.')
5444
for shelf_id in reversed(shelves):
5445
message = manager.get_metadata(shelf_id).get('message')
5447
message = '<no message>'
5448
self.outf.write('%3d: %s\n' % (shelf_id, message))
6139
5454
class cmd_unshelve(Command):
6140
__doc__ = """Restore shelved changes.
5455
"""Restore shelved changes.
6142
5457
By default, the most recently shelved changes are restored. However if you
6143
5458
specify a shelf by id those changes will be restored instead. This works
6147
5462
takes_args = ['shelf_id?']
6148
5463
takes_options = [
6150
5464
RegistryOption.from_kwargs(
6151
5465
'action', help="The action to perform.",
6152
5466
enum_switch=False, value_switches=True,
6153
5467
apply="Apply changes and remove from the shelf.",
6154
5468
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.",
5469
delete_only="Delete changes without applying them."
6161
5472
_see_also = ['shelve']
6163
def run(self, shelf_id=None, action='apply', directory=u'.'):
5474
def run(self, shelf_id=None, action='apply'):
6164
5475
from bzrlib.shelf_ui import Unshelver
6165
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
6169
unshelver.tree.unlock()
5476
Unshelver.from_args(shelf_id, action).run()
6172
5479
class cmd_clean_tree(Command):
6173
__doc__ = """Remove unwanted files from working tree.
5480
"""Remove unwanted files from working tree.
6175
5482
By default, only unknown files, not ignored files, are deleted. Versioned
6176
5483
files are never deleted.
6251
5557
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)
5560
# these get imported and then picked up by the scan for cmd_*
5561
# TODO: Some more consistent way to split command definitions across files;
5562
# we do need to load at least some information about them to know of
5563
# aliases. ideally we would avoid loading the implementation until the
5564
# details were needed.
5565
from bzrlib.cmd_version_info import cmd_version_info
5566
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5567
from bzrlib.bundle.commands import (
5570
from bzrlib.foreign import cmd_dpush
5571
from bzrlib.sign_my_commits import cmd_sign_my_commits
5572
from bzrlib.weave_commands import cmd_versionedfile_list, \
5573
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
