362
334
' --revision or a revision_id')
363
335
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
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
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
355
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
395
358
PATH is a btree index file, it can be any URL. This includes things like
396
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
435
To re-create the working tree, use "bzr checkout".
481
437
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
438
takes_args = ['location?']
483
439
takes_options = [
485
441
help='Remove the working tree even if it has '
486
442
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
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 "
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()
514
469
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
470
"""Show current revision number.
517
472
This is equal to the number of revisions on this branch.
520
475
_see_also = ['info']
521
476
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
539
revno = ".".join(str(n) for n in revno_t)
541
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
545
self.outf.write(str(revno) + '\n')
479
def run(self, location=u'.'):
480
self.outf.write(str(Branch.open_containing(location)[0].revno()))
481
self.outf.write('\n')
548
484
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
552
488
takes_args = ['revision_info*']
561
Option('tree', help='Show revno of working tree'),
565
def run(self, revision=None, directory=u'.', tree=False,
566
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
569
wt = WorkingTree.open_containing(directory)[0]
571
self.add_cleanup(wt.lock_read().unlock)
572
except (errors.NoWorkingTree, errors.NotLocalUrl):
574
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
577
503
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
579
505
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
590
revision_ids.append(b.last_revision())
594
for revision_id in revision_ids:
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)
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
518
except errors.NoSuchRevision:
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
605
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
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)
608
524
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
611
527
In non-recursive mode, all the named items are added, regardless
612
528
of whether they were previously ignored. A warning is given if
677
590
should_print=(not is_quiet()))
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
593
base_tree.lock_read()
595
file_list = self._maybe_expand_globs(file_list)
596
tree, file_list = tree_files_for_add(file_list)
597
added, ignored = tree.smart_add(file_list, not
598
no_recurse, action=action, save=not dry_run)
600
if base_tree is not None:
685
602
if len(ignored) > 0:
687
604
for glob in sorted(ignored.keys()):
688
605
for path in ignored[glob]:
689
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add ignored files, "
614
"please add them explicitly by name. "
615
"(\"bzr ignored\" gives a list)\n")
693
618
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
619
"""Create a new versioned directory.
696
621
This is equivalent to creating the directory and then adding it.
756
676
revision = _get_one_revision('inventory', revision)
757
677
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
776
entries = tree.inventory.entries()
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:
779
703
for path, entry in entries:
780
704
if kind and kind != entry.kind:
917
846
dest = osutils.pathjoin(dest_parent, dest_tail)
918
847
mutter("attempting to move %s => %s", src, dest)
919
848
tree.rename_one(src, dest, after=after)
921
self.outf.write("%s => %s\n" % (src, dest))
849
self.outf.write("%s => %s\n" % (src, dest))
924
852
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
853
"""Turn this branch into a mirror of another branch.
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
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.
932
859
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
860
from one into the other. Once one branch has merged, the other should
934
861
be able to pull it again.
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
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.
940
866
If there is no default location set, the first pull will set it. After
941
867
that, you can omit the location to use the default. To change the
1019
943
branch_from = Branch.open(location,
1020
944
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1023
946
if branch_to.get_parent() is None or remember:
1024
947
branch_to.set_parent(branch_from.base)
1026
if revision is not None:
1027
revision_id = revision.as_revision_id(branch_from)
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
949
if branch_from is not branch_to:
950
branch_from.lock_read()
952
if revision is not None:
953
revision_id = revision.as_revision_id(branch_from)
955
branch_to.lock_write()
957
if tree_to is not None:
958
view_info = _get_view_info_for_change_reporter(tree_to)
959
change_reporter = delta._ChangeReporter(
960
unversioned_filter=tree_to.is_ignored,
962
result = tree_to.pull(
963
branch_from, overwrite, revision_id, change_reporter,
964
possible_transports=possible_transports, local=local)
966
result = branch_to.pull(
967
branch_from, overwrite, revision_id, local=local)
969
result.report(self.outf)
970
if verbose and result.old_revid != result.new_revid:
971
log.show_branch_change(
972
branch_to, self.outf, result.old_revno,
977
if branch_from is not branch_to:
1048
981
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
982
"""Update a mirror of this branch.
1051
984
The target branch will not have its working tree populated because this
1052
985
is both expensive, and is not supported on remote file systems.
1180
1123
help='Hard-link working tree files where possible.'),
1181
1124
Option('no-tree',
1182
1125
help="Create a branch without a working-tree."),
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1186
1126
Option('stacked',
1187
1127
help='Create a stacked branch referring to the source branch. '
1188
1128
'The new branch will depend on the availability of the source '
1189
1129
'branch for all operations.'),
1190
1130
Option('standalone',
1191
1131
help='Do not use a shared repository, even if available.'),
1192
Option('use-existing-dir',
1193
help='By default branch will fail if the target'
1194
' directory exists, but does not already'
1195
' have a control directory. This flag will'
1196
' allow branch to proceed.'),
1198
help="Bind new branch to from location."),
1200
1133
aliases = ['get', 'clone']
1202
1135
def run(self, from_location, to_location=None, revision=None,
1203
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1136
hardlink=False, stacked=False, standalone=False, no_tree=False):
1206
1137
from bzrlib.tag import _merge_tags_if_possible
1207
1139
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1141
if (accelerator_tree is not None and
1142
accelerator_tree.supports_content_filtering()):
1143
accelerator_tree = None
1209
1144
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1147
if revision is not None:
1148
revision_id = revision.as_revision_id(br_from)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1150
# FIXME - wt.last_revision, fallback to branch, fall back to
1151
# None or perhaps NULL_REVISION to mean copy nothing
1153
revision_id = br_from.last_revision()
1154
if to_location is None:
1155
to_location = urlutils.derive_to_location(from_location)
1156
to_transport = transport.get_transport(to_location)
1158
to_transport.mkdir('.')
1159
except errors.FileExists:
1160
raise errors.BzrCommandError('Target directory "%s" already'
1161
' exists.' % to_location)
1162
except errors.NoSuchFile:
1163
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1166
# preserve whatever source format we have.
1167
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1168
possible_transports=[to_transport],
1169
accelerator_tree=accelerator_tree,
1170
hardlink=hardlink, stacked=stacked,
1171
force_new_repo=standalone,
1172
create_tree_if_local=not no_tree,
1173
source_branch=br_from)
1174
branch = dir.open_branch()
1175
except errors.NoSuchRevision:
1176
to_transport.delete_tree('.')
1177
msg = "The branch %s has no revision %s." % (from_location,
1179
raise errors.BzrCommandError(msg)
1180
_merge_tags_if_possible(br_from, branch)
1181
# If the source branch is stacked, the new branch may
1182
# be stacked whether we asked for that explicitly or not.
1183
# We therefore need a try/except here and not just 'if stacked:'
1185
note('Created new stacked branch referring to %s.' %
1186
branch.get_stacked_on_url())
1187
except (errors.NotStacked, errors.UnstackableBranchFormat,
1188
errors.UnstackableRepositoryFormat), e:
1189
note('Branched %d revision(s).' % branch.revno())
1275
1194
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1195
"""Create a new checkout of an existing branch.
1278
1197
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1198
the branch found in '.'. This is useful if you have removed the working tree
1353
1272
@display_command
1354
1273
def run(self, dir=u'.'):
1355
1274
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1368
renames.append(paths)
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1277
new_inv = tree.inventory
1278
old_tree = tree.basis_tree()
1279
old_tree.lock_read()
1281
old_inv = old_tree.inventory
1283
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1284
for f, paths, c, v, p, n, k, e in iterator:
1285
if paths[0] == paths[1]:
1289
renames.append(paths)
1291
for old_name, new_name in renames:
1292
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1299
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1300
"""Update a tree to have the latest code committed to its branch.
1377
1302
This will perform a merge into the working tree, and may generate
1378
1303
conflicts. If you have any local changes, you will still
1381
1306
If you want to discard your local changes, you can just do a
1382
1307
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1388
1310
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1311
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1312
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1314
def run(self, dir='.'):
1397
1315
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1316
possible_transports = []
1400
master = branch.get_master_branch(
1317
master = tree.branch.get_master_branch(
1401
1318
possible_transports=possible_transports)
1402
1319
if master is not None:
1403
branch_location = master.base
1404
1320
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1322
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1324
existing_pending_merges = tree.get_parent_ids()[1:]
1325
last_rev = _mod_revision.ensure_null(tree.last_revision())
1326
if last_rev == _mod_revision.ensure_null(
1327
tree.branch.last_revision()):
1328
# may be up to date, check master too.
1329
if master is None or last_rev == _mod_revision.ensure_null(
1330
master.last_revision()):
1331
revno = tree.branch.revision_id_to_revno(last_rev)
1332
note("Tree is up to date at revision %d." % (revno,))
1334
view_info = _get_view_info_for_change_reporter(tree)
1435
1335
conflicts = tree.update(
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1336
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1337
view_info=view_info), possible_transports=possible_transports)
1338
revno = tree.branch.revision_id_to_revno(
1339
_mod_revision.ensure_null(tree.last_revision()))
1340
note('Updated to revision %d.' % (revno,))
1341
if tree.get_parent_ids()[1:] != existing_pending_merges:
1342
note('Your local commits will now show as pending merges with '
1343
"'bzr status', and can be committed with 'bzr commit'.")
1460
1352
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1353
"""Show information about a working tree, branch or repository.
1463
1355
This command will show all known locations and formats associated to the
1464
1356
tree, branch or repository.
1530
1422
if file_list is not None:
1531
1423
file_list = [f for f in file_list]
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1427
# Heuristics should probably all move into tree.remove_smart or
1430
added = tree.changes_from(tree.basis_tree(),
1431
specific_files=file_list).added
1432
file_list = sorted([f[0] for f in added], reverse=True)
1433
if len(file_list) == 0:
1434
raise errors.BzrCommandError('No matching files.')
1435
elif file_list is None:
1436
# missing files show up in iter_changes(basis) as
1437
# versioned-with-no-kind.
1439
for change in tree.iter_changes(tree.basis_tree()):
1440
# Find paths in the working tree that have no kind:
1441
if change[1][1] is not None and change[6][1] is None:
1442
missing.append(change[1][1])
1443
file_list = sorted(missing, reverse=True)
1444
file_deletion_strategy = 'keep'
1445
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1446
keep_files=file_deletion_strategy=='keep',
1447
force=file_deletion_strategy=='force')
1557
1452
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1453
"""Print file_id of a particular file or directory.
1560
1455
The file_id is assigned when the file is first added and remains the
1561
1456
same through all revisions where the file exists, even when it is
1961
1831
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1832
' one or two revision specifiers')
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1968
(old_tree, new_tree,
1969
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1834
old_tree, new_tree, specific_files, extra_trees = \
1835
_get_trees_to_diff(file_list, revision, old, new,
1972
1837
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1838
specific_files=specific_files,
1974
1839
external_diff_options=diff_options,
1975
1840
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1841
extra_trees=extra_trees, using=using)
1980
1844
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1845
"""List files deleted in the working tree.
1983
1847
# TODO: Show files deleted since a previous revision, or
1984
1848
# between two revisions.
2373
2241
diff_type = 'full'
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2385
show_advice=levels is None)
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2413
Logger(b, rqst).show(lf)
2245
# Build the log formatter
2246
if log_format is None:
2247
log_format = log.log_formatter_registry.get_default(b)
2248
lf = log_format(show_ids=show_ids, to_file=self.outf,
2249
show_timezone=timezone,
2250
delta_format=get_verbosity_level(),
2252
show_advice=levels is None)
2254
# Choose the algorithm for doing the logging. It's annoying
2255
# having multiple code paths like this but necessary until
2256
# the underlying repository format is faster at generating
2257
# deltas or can provide everything we need from the indices.
2258
# The default algorithm - match-using-deltas - works for
2259
# multiple files and directories and is faster for small
2260
# amounts of history (200 revisions say). However, it's too
2261
# slow for logging a single file in a repository with deep
2262
# history, i.e. > 10K revisions. In the spirit of "do no
2263
# evil when adding features", we continue to use the
2264
# original algorithm - per-file-graph - for the "single
2265
# file that isn't a directory without showing a delta" case.
2266
partial_history = revision and b.repository._format.supports_chks
2267
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2268
or delta_type or partial_history)
2270
# Build the LogRequest and execute it
2271
if len(file_ids) == 0:
2273
rqst = make_log_request_dict(
2274
direction=direction, specific_fileids=file_ids,
2275
start_revision=rev1, end_revision=rev2, limit=limit,
2276
message_search=message, delta_type=delta_type,
2277
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2278
Logger(b, rqst).show(lf)
2416
2283
def _get_revision_range(revisionspec_list, branch, command_name):
2561
2419
view_str = views.view_display_str(view_files)
2562
2420
note("Ignoring files outside view. View is %s" % view_str)
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2570
if kind is not None and fkind != kind:
2575
fullpath = osutils.pathjoin(relpath, fp)
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2594
self.outf.write(fp + '\0')
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2608
self.outf.write(outstring + '\n')
2424
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2425
if fp.startswith(relpath):
2426
rp = fp[len(relpath):]
2427
fp = osutils.pathjoin(prefix, rp)
2428
if not recursive and '/' in rp:
2430
if not all and not selection[fc]:
2432
if kind is not None and fkind != kind:
2436
views.check_path_in_view(tree, fp)
2437
except errors.FileOutsideView:
2439
kindch = entry.kind_character()
2440
outstring = fp + kindch
2441
ui.ui_factory.clear_term()
2443
outstring = '%-8s %s' % (fc, outstring)
2444
if show_ids and fid is not None:
2445
outstring = "%-50s %s" % (outstring, fid)
2446
self.outf.write(outstring + '\n')
2448
self.outf.write(fp + '\0')
2451
self.outf.write(fid)
2452
self.outf.write('\0')
2460
self.outf.write('%-50s %s\n' % (outstring, my_id))
2462
self.outf.write(outstring + '\n')
2611
2467
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2468
"""List unknown files.
2624
2480
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2481
"""Ignore specified files or patterns.
2627
2483
See ``bzr help patterns`` for details on the syntax of patterns.
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2635
2485
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2486
After adding, editing or deleting that file either indirectly by
2637
2487
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2653
2490
Note: ignore patterns containing shell wildcards must be quoted from
2654
2491
the shell on Unix.
2677
2510
Ignore everything but the "debian" toplevel directory::
2679
2512
bzr ignore "RE:(?!debian/).*"
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
2689
2515
_see_also = ['status', 'ignored', 'patterns']
2690
2516
takes_args = ['name_pattern*']
2691
2517
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2518
Option('old-default-rules',
2519
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2522
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2523
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2524
if old_default_rules is not None:
2525
# dump the rules and exit
2526
for pattern in ignores.OLD_DEFAULTS:
2703
2529
if not name_pattern_list:
2704
2530
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2531
"NAME_PATTERN or --old-default-rules")
2706
2532
name_pattern_list = [globbing.normalize_pattern(p)
2707
2533
for p in name_pattern_list]
2708
2534
for name_pattern in name_pattern_list:
3118
2931
if local and not tree.branch.get_bound_location():
3119
2932
raise errors.LocalRequiresBoundBranch()
3121
if message is not None:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3134
ui.ui_factory.show_warning(warning_msg)
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3142
2934
def get_message(commit_obj):
3143
2935
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
2936
my_message = message
2937
if my_message is None and not file:
2938
t = make_commit_message_template_encoded(tree,
3153
2939
selected_list, diff=show_diff,
3154
2940
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3160
2941
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
2942
my_message = edit_commit_message_encoded(t,
3162
2943
start_message=start_message)
3163
2944
if my_message is None:
3164
2945
raise errors.BzrCommandError("please specify a commit"
3165
2946
" message with either --message or --file")
2947
elif my_message and file:
2948
raise errors.BzrCommandError(
2949
"please specify either --message or --file")
2951
my_message = codecs.open(file, 'rt',
2952
osutils.get_user_encoding()).read()
3166
2953
if my_message == "":
3167
2954
raise errors.BzrCommandError("empty commit message specified")
3168
2955
return my_message
3170
# The API permits a commit with a filter of [] to mean 'select nothing'
3171
# but the command line should not do that.
3172
if not selected_list:
3173
selected_list = None
3175
2958
tree.commit(message_callback=get_message,
3176
2959
specific_files=selected_list,
3177
2960
allow_pointless=unchanged, strict=strict, local=local,
3178
2961
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
2963
exclude=safe_relpath_files(tree, exclude))
3182
2964
except PointlessCommit:
2965
# FIXME: This should really happen before the file is read in;
2966
# perhaps prepare the commit; get the message; then actually commit
3183
2967
raise errors.BzrCommandError("No changes to commit."
3184
2968
" Use --unchanged to commit anyhow.")
3185
2969
except ConflictsInTree:
3206
2989
The working tree and branch checks will only give output if a problem is
3207
2990
detected. The output fields of the repository check are:
3210
This is just the number of revisions checked. It doesn't
3214
This is just the number of versionedfiles checked. It
3215
doesn't indicate a problem.
3217
unreferenced ancestors
3218
Texts that are ancestors of other texts, but
3219
are not properly referenced by the revision ancestry. This is a
3220
subtle problem that Bazaar can work around.
3223
This is the total number of unique file contents
3224
seen in the checked revisions. It does not indicate a problem.
3227
This is the total number of repeated texts seen
3228
in the checked revisions. Texts can be repeated when their file
3229
entries are modified, but the file contents are not. It does not
2992
revisions: This is just the number of revisions checked. It doesn't
2994
versionedfiles: This is just the number of versionedfiles checked. It
2995
doesn't indicate a problem.
2996
unreferenced ancestors: Texts that are ancestors of other texts, but
2997
are not properly referenced by the revision ancestry. This is a
2998
subtle problem that Bazaar can work around.
2999
unique file texts: This is the total number of unique file contents
3000
seen in the checked revisions. It does not indicate a problem.
3001
repeated file texts: This is the total number of repeated texts seen
3002
in the checked revisions. Texts can be repeated when their file
3003
entries are modified, but the file contents are not. It does not
3232
3006
If no restrictions are specified, all Bazaar data that is found at the given
3233
3007
location will be checked.
3597
3361
verbose = not is_quiet()
3598
3362
# TODO: should possibly lock the history file...
3599
3363
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
3365
test_suite_factory = None
3603
3366
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3368
selftest_kwargs = {"verbose": verbose,
3370
"stop_on_failure": one,
3371
"transport": transport,
3372
"test_suite_factory": test_suite_factory,
3373
"lsprof_timed": lsprof_timed,
3374
"bench_history": benchfile,
3375
"matching_tests_first": first,
3376
"list_only": list_only,
3377
"random_seed": randomize,
3378
"exclude_pattern": exclude,
3380
"load_list": load_list,
3381
"debug_flags": debugflag,
3382
"starting_with": starting_with
3384
selftest_kwargs.update(self.additional_selftest_args)
3385
result = selftest(**selftest_kwargs)
3387
if benchfile is not None:
3623
3389
return int(not result)
3626
3392
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3393
"""Show version of bzr."""
3629
3395
encoding_type = 'replace'
3630
3396
takes_options = [
3793
3546
verified = 'inapplicable'
3794
3547
tree = WorkingTree.open_containing(directory)[0]
3549
# die as quickly as possible if there are uncommitted changes
3797
3551
basis_tree = tree.revision_tree(tree.last_revision())
3798
3552
except errors.NoSuchRevision:
3799
3553
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3555
changes = tree.changes_from(basis_tree)
3556
if changes.has_changed():
3804
3557
raise errors.UncommittedChanges(tree)
3806
3559
view_info = _get_view_info_for_change_reporter(tree)
3807
3560
change_reporter = delta._ChangeReporter(
3808
3561
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3564
pb = ui.ui_factory.nested_progress_bar()
3565
cleanups.append(pb.finished)
3567
cleanups.append(tree.unlock)
3568
if location is not None:
3570
mergeable = bundle.read_mergeable_from_url(location,
3571
possible_transports=possible_transports)
3572
except errors.NotABundle:
3576
raise errors.BzrCommandError('Cannot use --uncommitted'
3577
' with bundles or merge directives.')
3579
if revision is not None:
3580
raise errors.BzrCommandError(
3581
'Cannot use -r with merge directives or bundles')
3582
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3585
if merger is None and uncommitted:
3586
if revision is not None and len(revision) > 0:
3587
raise errors.BzrCommandError('Cannot use --uncommitted and'
3588
' --revision at the same time.')
3589
location = self._select_branch_location(tree, location)[0]
3590
other_tree, other_path = WorkingTree.open_containing(location)
3591
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3593
allow_pending = False
3594
if other_path != '':
3595
merger.interesting_files = [other_path]
3598
merger, allow_pending = self._get_merger_from_branch(tree,
3599
location, revision, remember, possible_transports, pb)
3601
merger.merge_type = merge_type
3602
merger.reprocess = reprocess
3603
merger.show_base = show_base
3604
self.sanity_check_merger(merger)
3605
if (merger.base_rev_id == merger.other_rev_id and
3606
merger.other_rev_id is not None):
3607
note('Nothing to do.')
3610
if merger.interesting_files is not None:
3611
raise errors.BzrCommandError('Cannot pull individual files')
3612
if (merger.base_rev_id == tree.last_revision()):
3613
result = tree.pull(merger.other_branch, False,
3614
merger.other_rev_id)
3615
result.report(self.outf)
3617
merger.check_basis(False)
3619
return self._do_preview(merger)
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3861
return self._do_preview(merger)
3863
return self._do_interactive(merger)
3865
return self._do_merge(merger, change_reporter, allow_pending,
3868
def _get_preview(self, merger):
3621
return self._do_merge(merger, change_reporter, allow_pending,
3624
for cleanup in reversed(cleanups):
3627
def _do_preview(self, merger):
3628
from bzrlib.diff import show_diff_trees
3869
3629
tree_merger = merger.make_merger()
3870
3630
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3872
result_tree = tt.get_preview_tree()
3875
def _do_preview(self, merger):
3876
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3878
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
3632
result_tree = tt.get_preview_tree()
3633
show_diff_trees(merger.this_tree, result_tree, self.outf,
3634
old_label='', new_label='')
3881
3638
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3639
merger.change_reporter = change_reporter
4067
3792
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3793
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3794
if merge_type is None:
4071
3795
merge_type = _mod_merge.Merge3Merger
4072
3796
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4079
repository = tree.branch.repository
4080
interesting_ids = None
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
3799
parents = tree.get_parent_ids()
3800
if len(parents) != 2:
3801
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3802
" merges. Not cherrypicking or"
3804
repository = tree.branch.repository
3805
interesting_ids = None
3807
conflicts = tree.conflicts()
3808
if file_list is not None:
3809
interesting_ids = set()
3810
for filename in file_list:
3811
file_id = tree.path2id(filename)
3813
raise errors.NotVersionedError(filename)
3814
interesting_ids.add(file_id)
3815
if tree.kind(file_id) != "directory":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3818
for name, ie in tree.inventory.iter_entries(file_id):
3819
interesting_ids.add(ie.file_id)
3820
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3822
# Remerge only supports resolving contents conflicts
3823
allowed_conflicts = ('text conflict', 'contents conflict')
3824
restore_files = [c.path for c in conflicts
3825
if c.typestring in allowed_conflicts]
3826
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3827
tree.set_conflicts(ConflictList(new_conflicts))
3828
if file_list is not None:
3829
restore_files = file_list
3830
for filename in restore_files:
3832
restore(tree.abspath(filename))
3833
except errors.NotConflicted:
3835
# Disable pending merges, because the file texts we are remerging
3836
# have not had those merges performed. If we use the wrong parents
3837
# list, we imply that the working tree text has seen and rejected
3838
# all the changes from the other tree, when in fact those changes
3839
# have not yet been seen.
3840
pb = ui.ui_factory.nested_progress_bar()
3841
tree.set_parent_ids(parents[:1])
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3843
merger = _mod_merge.Merger.from_revision_ids(pb,
3845
merger.interesting_ids = interesting_ids
3846
merger.merge_type = merge_type
3847
merger.show_base = show_base
3848
merger.reprocess = reprocess
3849
conflicts = merger.do_merge()
3851
tree.set_parent_ids(parents)
4124
tree.set_parent_ids(parents)
4125
3855
if conflicts > 0:
4149
3879
name. If you name a directory, all the contents of that directory will be
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
3882
Any files that have been newly added since that revision will be deleted,
3883
with a backup kept if appropriate. Directories containing unknown files
3884
will not be deleted.
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
3886
The working tree contains a list of pending merged revisions, which will
3887
be included as parents in the next commit. Normally, revert clears that
3888
list as well as reverting the files. If any files are specified, revert
3889
leaves the pending merge list alone and reverts only the files. Use "bzr
3890
revert ." in the tree root to revert all files but keep the merge record,
3891
and "bzr revert --forget-merges" to clear the pending merge list without
4164
3892
reverting any files.
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4177
3895
_see_also = ['cat', 'export']
4186
3904
def run(self, revision=None, no_backup=False, file_list=None,
4187
3905
forget_merges=None):
4188
3906
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3910
tree.set_parent_ids(tree.get_parent_ids()[:1])
3912
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4196
3917
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
3918
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
3919
pb = ui.ui_factory.nested_progress_bar()
3921
tree.revert(file_list, rev_tree, not no_backup, pb,
3922
report_changes=True)
4202
3927
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
3928
"""Test reporting of assertion failures"""
4204
3929
# intended just for use in testing
4355
4072
_get_revision_range(revision,
4356
4073
remote_branch, self.name()))
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4370
show_timezone='original')
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4379
lf.log_revision(revision)
4380
printed_local = True
4383
printed_local = False
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4388
message("You are missing %d revision(s):\n" %
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4393
lf.log_revision(revision)
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4404
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
4075
local_branch.lock_read()
4077
remote_branch.lock_read()
4079
local_extra, remote_extra = find_unmerged(
4080
local_branch, remote_branch, restrict,
4081
backward=not reverse,
4082
include_merges=include_merges,
4083
local_revid_range=local_revid_range,
4084
remote_revid_range=remote_revid_range)
4086
if log_format is None:
4087
registry = log.log_formatter_registry
4088
log_format = registry.get_default(local_branch)
4089
lf = log_format(to_file=self.outf,
4091
show_timezone='original')
4094
if local_extra and not theirs_only:
4095
message("You have %d extra revision(s):\n" %
4097
for revision in iter_log_revisions(local_extra,
4098
local_branch.repository,
4100
lf.log_revision(revision)
4101
printed_local = True
4104
printed_local = False
4106
if remote_extra and not mine_only:
4107
if printed_local is True:
4109
message("You are missing %d revision(s):\n" %
4111
for revision in iter_log_revisions(remote_extra,
4112
remote_branch.repository,
4114
lf.log_revision(revision)
4117
if mine_only and not local_extra:
4118
# We checked local, and found nothing extra
4119
message('This branch is up to date.\n')
4120
elif theirs_only and not remote_extra:
4121
# We checked remote, and found nothing extra
4122
message('Other branch is up to date.\n')
4123
elif not (mine_only or theirs_only or local_extra or
4125
# We checked both branches, and neither one had extra
4127
message("Branches are up to date.\n")
4129
remote_branch.unlock()
4131
local_branch.unlock()
4408
4132
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4133
local_branch.lock_write()
4135
# handle race conditions - a parent might be set while we run.
4136
if local_branch.get_parent() is None:
4137
local_branch.set_parent(remote_branch.base)
4139
local_branch.unlock()
4413
4140
return status_code
4416
4143
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4144
"""Compress the data within a repository."""
4435
4146
_see_also = ['repositories']
4436
4147
takes_args = ['branch_or_repo?']
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4149
def run(self, branch_or_repo='.'):
4442
4150
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
4152
branch = dir.open_branch()
4445
4153
repository = branch.repository
4446
4154
except errors.NotBranchError:
4447
4155
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
4159
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4160
"""List the installed plugins.
4454
4162
This command displays the list of installed plugins including
4455
4163
version of plugin and a short description of each.
4552
4263
wt, branch, relpath = \
4553
4264
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4265
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4561
file_id = wt.path2id(relpath)
4563
file_id = tree.path2id(relpath)
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4270
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4272
file_id = wt.path2id(relpath)
4274
file_id = tree.path2id(relpath)
4276
raise errors.NotVersionedError(filename)
4277
file_version = tree.inventory[file_id].revision
4278
if wt is not None and revision is None:
4279
# If there is a tree and we're not annotating historical
4280
# versions, annotate the working tree's content.
4281
annotate_file_tree(wt, file_id, self.outf, long, all,
4284
annotate_file(branch, file_version, file_id, long, all, self.outf,
4577
4293
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4294
"""Create a digital signature for an existing revision."""
4579
4295
# TODO be able to replace existing ones.
4581
4297
hidden = True # is this right ?
4785
4507
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4510
print 'Dry-run, pretending to remove the above revisions.'
4512
val = raw_input('Press <enter> to continue')
4791
self.outf.write('The above revision(s) will be removed.\n')
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4514
print 'The above revision(s) will be removed.'
4516
val = raw_input('Are you sure [y/N]? ')
4517
if val.lower() not in ('y', 'yes'):
4798
4521
mutter('Uncommitting from {%s} to {%s}',
4799
4522
last_rev_id, rev_id)
4800
4523
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4524
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4525
note('You can restore the old tip by running:\n'
4526
' bzr pull . -r revid:%s', last_rev_id)
4806
4529
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4530
"""Break a dead lock on a repository, branch or working directory.
4809
4532
CAUTION: Locks should only be broken when you are sure that the process
4810
4533
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4535
You can get information on what locks are open via the 'bzr info' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4819
4540
takes_args = ['location?']
5092
4809
directly from the merge directive, without retrieving data from a
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4812
If --no-bundle is specified, then public_branch is needed (and must be
4813
up-to-date), so that the receiver can perform the merge using the
4814
public_branch. The public_branch is always included if known, so that
4815
people can check it later.
4817
The submit branch defaults to the parent, but can be overridden. Both
4818
submit branch and public branch will be remembered if supplied.
4820
If a public_branch is known for the submit_branch, that public submit
4821
branch is used in the merge instructions. This means that a local mirror
4822
can be used as your actual submit branch, once you have set public_branch
5122
4825
Mail is sent using your preferred mail program. This should be transparent
5123
4826
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5168
4866
short_name='f',
5170
4868
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
4869
help='Write merge directive to this file; '
5172
4870
'use - for stdout.',
5175
help='Refuse to send if there are uncommitted changes in'
5176
' the working tree, --no-strict disables the check.'),
5177
4872
Option('mail-to', help='Mail the request to this address.',
5181
4876
Option('body', help='Body for the email.', type=unicode),
5182
4877
RegistryOption('format',
5183
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
4878
help='Use the specified output format.',
4879
lazy_registry=('bzrlib.send', 'format_registry'))
5187
4882
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
4883
no_patch=False, revision=None, remember=False, output=None,
5189
format=None, mail_to=None, message=None, body=None,
5190
strict=None, **kwargs):
4884
format=None, mail_to=None, message=None, body=None, **kwargs):
5191
4885
from bzrlib.send import send
5192
4886
return send(submit_branch, revision, public_branch, remember,
5193
format, no_bundle, no_patch, output,
5194
kwargs.get('from', '.'), mail_to, message, body,
4887
format, no_bundle, no_patch, output,
4888
kwargs.get('from', '.'), mail_to, message, body,
5199
4892
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
4893
"""Create a merge-directive for submitting changes.
5202
4895
A merge directive provides many things needed for requesting merges:
5260
4950
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5261
4951
no_patch=False, revision=None, remember=False, output=None,
5262
format=None, strict=None, **kwargs):
4952
format=None, **kwargs):
5263
4953
if output is None:
5265
4955
from bzrlib.send import send
5266
4956
return send(submit_branch, revision, public_branch, remember,
5267
4957
format, no_bundle, no_patch, output,
5268
4958
kwargs.get('from', '.'), None, None, None,
5269
self.outf, strict=strict)
5272
4962
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
4963
"""Create, remove or modify a tag naming a revision.
5275
4965
Tags give human-meaningful names to revisions. Commands that take a -r
5276
4966
(--revision) option can be given -rtag:X, where X is any previously
5311
def run(self, tag_name=None,
4996
def run(self, tag_name,
5317
5002
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5330
revision_id = revision[0].as_revision_id(branch)
5006
branch.tags.delete_tag(tag_name)
5007
self.outf.write('Deleted tag %s.\n' % tag_name)
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5010
if len(revision) != 1:
5011
raise errors.BzrCommandError(
5012
"Tags can only be placed on a single revision, "
5014
revision_id = revision[0].as_revision_id(branch)
5016
revision_id = branch.last_revision()
5017
if (not force) and branch.tags.has_tag(tag_name):
5018
raise errors.TagAlreadyExists(tag_name)
5019
branch.tags.set_tag(tag_name, revision_id)
5020
self.outf.write('Created tag %s.\n' % tag_name)
5344
5025
class cmd_tags(Command):
5345
__doc__ = """List tags.
5347
5028
This command shows a table of tag names and the revisions they reference.
5379
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5401
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5411
tags[index] = (tag, revno)
5063
graph = branch.repository.get_graph()
5064
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5065
revid1, revid2 = rev1.rev_id, rev2.rev_id
5066
# only show revisions between revid1 and revid2 (inclusive)
5067
tags = [(tag, revid) for tag, revid in tags if
5068
graph.is_between(revid, revid1, revid2)]
5071
elif sort == 'time':
5073
for tag, revid in tags:
5075
revobj = branch.repository.get_revision(revid)
5076
except errors.NoSuchRevision:
5077
timestamp = sys.maxint # place them at the end
5079
timestamp = revobj.timestamp
5080
timestamps[revid] = timestamp
5081
tags.sort(key=lambda x: timestamps[x[1]])
5083
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5084
for index, (tag, revid) in enumerate(tags):
5086
revno = branch.revision_id_to_dotted_revno(revid)
5087
if isinstance(revno, tuple):
5088
revno = '.'.join(map(str, revno))
5089
except errors.NoSuchRevision:
5090
# Bad tag data/merges can lead to tagged revisions
5091
# which are not in this branch. Fail gracefully ...
5093
tags[index] = (tag, revno)
5413
5096
for tag, revspec in tags:
5414
5097
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5100
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5101
"""Reconfigure the type of a bzr directory.
5420
5103
A target configuration must be specified.
5452
5135
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5136
Option('force',
5454
help='Perform reconfiguration even if local changes'
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
5137
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5141
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5142
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5479
5143
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5144
raise errors.BzrCommandError('No target configuration specified')
5485
5145
elif target_type == 'branch':
5486
5146
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5147
elif target_type == 'tree':
5524
5184
/path/to/newbranch.
5526
5186
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5187
locally, in which case switching will update the the local nickname to be
5528
5188
that of the master.
5531
takes_args = ['to_location?']
5191
takes_args = ['to_location']
5532
5192
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
5193
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5196
def run(self, to_location, force=False):
5542
5197
from bzrlib import switch
5543
5198
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5199
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5552
5201
branch = control_dir.open_branch()
5553
5202
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
5203
except errors.NotBranchError:
5556
5204
had_explicit_nick = False
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5206
to_branch = Branch.open(to_location)
5207
except errors.NotBranchError:
5208
this_url = self._get_branch_location(control_dir)
5209
to_branch = Branch.open(
5210
urlutils.join(this_url, '..', to_location))
5211
switch.switch(control_dir, to_branch, force)
5580
5212
if had_explicit_nick:
5581
5213
branch = control_dir.open_branch() #get the new branch!
5582
5214
branch.nick = to_branch.nick
5849
5456
if writer is None:
5850
5457
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5459
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5460
message, destroy=destroy).run()
5858
5461
except errors.UserAbort:
5861
5464
def run_for_list(self):
5862
5465
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5468
manager = tree.get_shelf_manager()
5469
shelves = manager.active_shelves()
5470
if len(shelves) == 0:
5471
note('No shelved changes.')
5473
for shelf_id in reversed(shelves):
5474
message = manager.get_metadata(shelf_id).get('message')
5476
message = '<no message>'
5477
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5483
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5484
"""Restore shelved changes.
5880
5486
By default, the most recently shelved changes are restored. However if you
5881
5487
specify a shelf by id those changes will be restored instead. This works
5987
5586
self.outf.write('%s %s\n' % (path, location))
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5589
# these get imported and then picked up by the scan for cmd_*
5590
# TODO: Some more consistent way to split command definitions across files;
5591
# we do need to load at least some information about them to know of
5592
# aliases. ideally we would avoid loading the implementation until the
5593
# details were needed.
5594
from bzrlib.cmd_version_info import cmd_version_info
5595
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5596
from bzrlib.bundle.commands import (
5599
from bzrlib.foreign import cmd_dpush
5600
from bzrlib.sign_my_commits import cmd_sign_my_commits
5601
from bzrlib.weave_commands import cmd_versionedfile_list, \
5602
cmd_weave_plan_merge, cmd_weave_merge_text