529
542
wt = WorkingTree.open_containing(directory)[0]
545
self.add_cleanup(wt.unlock)
532
546
except (errors.NoWorkingTree, errors.NotLocalUrl):
534
548
b = Branch.open_containing(directory)[0]
538
if revision is not None:
539
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
540
if revision_info_list is not None:
541
for rev_str in revision_info_list:
542
rev_spec = RevisionSpec.from_string(rev_str)
543
revision_ids.append(rev_spec.as_revision_id(b))
544
# No arguments supplied, default to the last revision
545
if len(revision_ids) == 0:
548
raise errors.NoWorkingTree(directory)
549
revision_ids.append(wt.last_revision())
551
revision_ids.append(b.last_revision())
555
for revision_id in revision_ids:
557
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
558
revno = '.'.join(str(i) for i in dotted_revno)
559
except errors.NoSuchRevision:
561
maxlen = max(maxlen, len(revno))
562
revinfos.append([revno, revision_id])
550
self.add_cleanup(b.unlock)
552
if revision is not None:
553
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
554
if revision_info_list is not None:
555
for rev_str in revision_info_list:
556
rev_spec = RevisionSpec.from_string(rev_str)
557
revision_ids.append(rev_spec.as_revision_id(b))
558
# No arguments supplied, default to the last revision
559
if len(revision_ids) == 0:
562
raise errors.NoWorkingTree(directory)
563
revision_ids.append(wt.last_revision())
565
revision_ids.append(b.last_revision())
569
for revision_id in revision_ids:
571
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
572
revno = '.'.join(str(i) for i in dotted_revno)
573
except errors.NoSuchRevision:
575
maxlen = max(maxlen, len(revno))
576
revinfos.append([revno, revision_id])
569
579
for ri in revinfos:
570
580
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
642
655
base_tree.lock_read()
644
file_list = self._maybe_expand_globs(file_list)
645
tree, file_list = tree_files_for_add(file_list)
646
added, ignored = tree.smart_add(file_list, not
647
no_recurse, action=action, save=not dry_run)
649
if base_tree is not None:
656
self.add_cleanup(base_tree.unlock)
657
tree, file_list = tree_files_for_add(file_list)
658
added, ignored = tree.smart_add(file_list, not
659
no_recurse, action=action, save=not dry_run)
651
661
if len(ignored) > 0:
653
663
for glob in sorted(ignored.keys()):
654
664
for path in ignored[glob]:
655
665
self.outf.write("ignored %s matching \"%s\"\n"
659
for glob, paths in ignored.items():
660
match_len += len(paths)
661
self.outf.write("ignored %d file(s).\n" % match_len)
662
self.outf.write("If you wish to add ignored files, "
663
"please add them explicitly by name. "
664
"(\"bzr ignored\" gives a list)\n")
667
669
class cmd_mkdir(Command):
725
727
revision = _get_one_revision('inventory', revision)
726
728
work_tree, file_list = tree_files(file_list)
727
729
work_tree.lock_read()
729
if revision is not None:
730
tree = revision.as_tree(work_tree.branch)
732
extra_trees = [work_tree]
738
if file_list is not None:
739
file_ids = tree.paths2ids(file_list, trees=extra_trees,
740
require_versioned=True)
741
# find_ids_across_trees may include some paths that don't
743
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
744
for file_id in file_ids if file_id in tree)
746
entries = tree.inventory.entries()
749
if tree is not work_tree:
730
self.add_cleanup(work_tree.unlock)
731
if revision is not None:
732
tree = revision.as_tree(work_tree.branch)
734
extra_trees = [work_tree]
736
self.add_cleanup(tree.unlock)
741
if file_list is not None:
742
file_ids = tree.paths2ids(file_list, trees=extra_trees,
743
require_versioned=True)
744
# find_ids_across_trees may include some paths that don't
746
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
747
for file_id in file_ids if file_id in tree)
749
entries = tree.inventory.entries()
752
752
for path, entry in entries:
753
753
if kind and kind != entry.kind:
895
892
dest = osutils.pathjoin(dest_parent, dest_tail)
896
893
mutter("attempting to move %s => %s", src, dest)
897
894
tree.rename_one(src, dest, after=after)
898
self.outf.write("%s => %s\n" % (src, dest))
896
self.outf.write("%s => %s\n" % (src, dest))
901
899
class cmd_pull(Command):
902
900
"""Turn this branch into a mirror of another branch.
904
This command only works on branches that have not diverged. Branches are
905
considered diverged if the destination branch's most recent commit is one
906
that has not been merged (directly or indirectly) into the parent.
902
By default, this command only works on branches that have not diverged.
903
Branches are considered diverged if the destination branch's most recent
904
commit is one that has not been merged (directly or indirectly) into the
908
907
If branches have diverged, you can use 'bzr merge' to integrate the changes
909
908
from one into the other. Once one branch has merged, the other should
910
909
be able to pull it again.
912
If you want to forget your local changes and just update your branch to
913
match the remote one, use pull --overwrite.
911
If you want to replace your local changes and just want your branch to
912
match the remote one, use pull --overwrite. This will work even if the two
913
branches have diverged.
915
915
If there is no default location set, the first pull will set it. After
916
916
that, you can omit the location to use the default. To change the
998
998
if branch_from is not branch_to:
999
999
branch_from.lock_read()
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1026
if branch_from is not branch_to:
1027
branch_from.unlock()
1000
self.add_cleanup(branch_from.unlock)
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1005
self.add_cleanup(branch_to.unlock)
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1030
1025
class cmd_push(Command):
1183
1180
' directory exists, but does not already'
1184
1181
' have a control directory. This flag will'
1185
1182
' allow branch to proceed.'),
1184
help="Bind new branch to from location."),
1187
1186
aliases = ['get', 'clone']
1189
1188
def run(self, from_location, to_location=None, revision=None,
1190
1189
hardlink=False, stacked=False, standalone=False, no_tree=False,
1191
use_existing_dir=False):
1190
use_existing_dir=False, switch=False, bind=False):
1191
from bzrlib import switch as _mod_switch
1192
1192
from bzrlib.tag import _merge_tags_if_possible
1194
1193
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1196
if (accelerator_tree is not None and
1197
accelerator_tree.supports_content_filtering()):
1198
accelerator_tree = None
1199
1195
revision = _get_one_revision('branch', revision)
1200
1196
br_from.lock_read()
1197
self.add_cleanup(br_from.unlock)
1198
if revision is not None:
1199
revision_id = revision.as_revision_id(br_from)
1201
# FIXME - wt.last_revision, fallback to branch, fall back to
1202
# None or perhaps NULL_REVISION to mean copy nothing
1204
revision_id = br_from.last_revision()
1205
if to_location is None:
1206
to_location = urlutils.derive_to_location(from_location)
1207
to_transport = transport.get_transport(to_location)
1202
if revision is not None:
1203
revision_id = revision.as_revision_id(br_from)
1209
to_transport.mkdir('.')
1210
except errors.FileExists:
1211
if not use_existing_dir:
1212
raise errors.BzrCommandError('Target directory "%s" '
1213
'already exists.' % to_location)
1205
# FIXME - wt.last_revision, fallback to branch, fall back to
1206
# None or perhaps NULL_REVISION to mean copy nothing
1208
revision_id = br_from.last_revision()
1209
if to_location is None:
1210
to_location = urlutils.derive_to_location(from_location)
1211
to_transport = transport.get_transport(to_location)
1213
to_transport.mkdir('.')
1214
except errors.FileExists:
1215
if not use_existing_dir:
1216
raise errors.BzrCommandError('Target directory "%s" '
1217
'already exists.' % to_location)
1216
bzrdir.BzrDir.open_from_transport(to_transport)
1217
except errors.NotBranchError:
1220
bzrdir.BzrDir.open_from_transport(to_transport)
1221
except errors.NotBranchError:
1224
raise errors.AlreadyBranchError(to_location)
1225
except errors.NoSuchFile:
1226
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1229
# preserve whatever source format we have.
1230
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1231
possible_transports=[to_transport],
1232
accelerator_tree=accelerator_tree,
1233
hardlink=hardlink, stacked=stacked,
1234
force_new_repo=standalone,
1235
create_tree_if_local=not no_tree,
1236
source_branch=br_from)
1237
branch = dir.open_branch()
1238
except errors.NoSuchRevision:
1239
to_transport.delete_tree('.')
1240
msg = "The branch %s has no revision %s." % (from_location,
1242
raise errors.BzrCommandError(msg)
1243
_merge_tags_if_possible(br_from, branch)
1244
# If the source branch is stacked, the new branch may
1245
# be stacked whether we asked for that explicitly or not.
1246
# We therefore need a try/except here and not just 'if stacked:'
1248
note('Created new stacked branch referring to %s.' %
1249
branch.get_stacked_on_url())
1250
except (errors.NotStacked, errors.UnstackableBranchFormat,
1251
errors.UnstackableRepositoryFormat), e:
1252
note('Branched %d revision(s).' % branch.revno())
1220
raise errors.AlreadyBranchError(to_location)
1221
except errors.NoSuchFile:
1222
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1225
# preserve whatever source format we have.
1226
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1227
possible_transports=[to_transport],
1228
accelerator_tree=accelerator_tree,
1229
hardlink=hardlink, stacked=stacked,
1230
force_new_repo=standalone,
1231
create_tree_if_local=not no_tree,
1232
source_branch=br_from)
1233
branch = dir.open_branch()
1234
except errors.NoSuchRevision:
1235
to_transport.delete_tree('.')
1236
msg = "The branch %s has no revision %s." % (from_location,
1238
raise errors.BzrCommandError(msg)
1239
_merge_tags_if_possible(br_from, branch)
1240
# If the source branch is stacked, the new branch may
1241
# be stacked whether we asked for that explicitly or not.
1242
# We therefore need a try/except here and not just 'if stacked:'
1244
note('Created new stacked branch referring to %s.' %
1245
branch.get_stacked_on_url())
1246
except (errors.NotStacked, errors.UnstackableBranchFormat,
1247
errors.UnstackableRepositoryFormat), e:
1248
note('Branched %d revision(s).' % branch.revno())
1250
# Bind to the parent
1251
parent_branch = Branch.open(from_location)
1252
branch.bind(parent_branch)
1253
note('New branch bound to %s' % from_location)
1255
# Switch to the new branch
1256
wt, _ = WorkingTree.open_containing('.')
1257
_mod_switch.switch(wt.bzrdir, branch)
1258
note('Switched to branch: %s',
1259
urlutils.unescape_for_display(branch.base, 'utf-8'))
1257
1262
class cmd_checkout(Command):
1336
1341
def run(self, dir=u'.'):
1337
1342
tree = WorkingTree.open_containing(dir)[0]
1338
1343
tree.lock_read()
1340
new_inv = tree.inventory
1341
old_tree = tree.basis_tree()
1342
old_tree.lock_read()
1344
old_inv = old_tree.inventory
1346
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1347
for f, paths, c, v, p, n, k, e in iterator:
1348
if paths[0] == paths[1]:
1352
renames.append(paths)
1354
for old_name, new_name in renames:
1355
self.outf.write("%s => %s\n" % (old_name, new_name))
1344
self.add_cleanup(tree.unlock)
1345
new_inv = tree.inventory
1346
old_tree = tree.basis_tree()
1347
old_tree.lock_read()
1348
self.add_cleanup(old_tree.unlock)
1349
old_inv = old_tree.inventory
1351
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1352
for f, paths, c, v, p, n, k, e in iterator:
1353
if paths[0] == paths[1]:
1357
renames.append(paths)
1359
for old_name, new_name in renames:
1360
self.outf.write("%s => %s\n" % (old_name, new_name))
1362
1363
class cmd_update(Command):
1369
1370
If you want to discard your local changes, you can just do a
1370
1371
'bzr revert' instead of 'bzr commit' after the update.
1373
If the tree's branch is bound to a master branch, it will also update
1374
the branch from the master.
1373
1377
_see_also = ['pull', 'working-trees', 'status-flags']
1374
1378
takes_args = ['dir?']
1379
takes_options = ['revision']
1375
1380
aliases = ['up']
1377
def run(self, dir='.'):
1382
def run(self, dir='.', revision=None):
1383
if revision is not None and len(revision) != 1:
1384
raise errors.BzrCommandError(
1385
"bzr update --revision takes exactly one revision")
1378
1386
tree = WorkingTree.open_containing(dir)[0]
1387
branch = tree.branch
1379
1388
possible_transports = []
1380
master = tree.branch.get_master_branch(
1389
master = branch.get_master_branch(
1381
1390
possible_transports=possible_transports)
1382
1391
if master is not None:
1383
1392
tree.lock_write()
1393
branch_location = master.base
1385
1395
tree.lock_tree_write()
1396
branch_location = tree.branch.base
1397
self.add_cleanup(tree.unlock)
1398
# get rid of the final '/' and be ready for display
1399
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1405
# may need to fetch data into a heavyweight checkout
1406
# XXX: this may take some time, maybe we should display a
1408
old_tip = branch.update(possible_transports)
1409
if revision is not None:
1410
revision_id = revision[0].as_revision_id(branch)
1412
revision_id = branch.last_revision()
1413
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1414
revno = branch.revision_id_to_revno(revision_id)
1415
note("Tree is up to date at revision %d of branch %s" %
1416
(revno, branch_location))
1418
view_info = _get_view_info_for_change_reporter(tree)
1419
change_reporter = delta._ChangeReporter(
1420
unversioned_filter=tree.is_ignored,
1421
view_info=view_info)
1387
existing_pending_merges = tree.get_parent_ids()[1:]
1388
last_rev = _mod_revision.ensure_null(tree.last_revision())
1389
if last_rev == _mod_revision.ensure_null(
1390
tree.branch.last_revision()):
1391
# may be up to date, check master too.
1392
if master is None or last_rev == _mod_revision.ensure_null(
1393
master.last_revision()):
1394
revno = tree.branch.revision_id_to_revno(last_rev)
1395
note("Tree is up to date at revision %d." % (revno,))
1397
view_info = _get_view_info_for_change_reporter(tree)
1398
1423
conflicts = tree.update(
1399
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1400
view_info=view_info), possible_transports=possible_transports)
1401
revno = tree.branch.revision_id_to_revno(
1402
_mod_revision.ensure_null(tree.last_revision()))
1403
note('Updated to revision %d.' % (revno,))
1404
if tree.get_parent_ids()[1:] != existing_pending_merges:
1405
note('Your local commits will now show as pending merges with '
1406
"'bzr status', and can be committed with 'bzr commit'.")
1425
possible_transports=possible_transports,
1426
revision=revision_id,
1428
except errors.NoSuchRevision, e:
1429
raise errors.BzrCommandError(
1430
"branch has no revision %s\n"
1431
"bzr update --revision only works"
1432
" for a revision in the branch history"
1434
revno = tree.branch.revision_id_to_revno(
1435
_mod_revision.ensure_null(tree.last_revision()))
1436
note('Updated to revision %d of branch %s' %
1437
(revno, branch_location))
1438
if tree.get_parent_ids()[1:] != existing_pending_merges:
1439
note('Your local commits will now show as pending merges with '
1440
"'bzr status', and can be committed with 'bzr commit'.")
1415
1447
class cmd_info(Command):
1486
1518
file_list = [f for f in file_list]
1488
1520
tree.lock_write()
1490
# Heuristics should probably all move into tree.remove_smart or
1493
added = tree.changes_from(tree.basis_tree(),
1494
specific_files=file_list).added
1495
file_list = sorted([f[0] for f in added], reverse=True)
1496
if len(file_list) == 0:
1497
raise errors.BzrCommandError('No matching files.')
1498
elif file_list is None:
1499
# missing files show up in iter_changes(basis) as
1500
# versioned-with-no-kind.
1502
for change in tree.iter_changes(tree.basis_tree()):
1503
# Find paths in the working tree that have no kind:
1504
if change[1][1] is not None and change[6][1] is None:
1505
missing.append(change[1][1])
1506
file_list = sorted(missing, reverse=True)
1507
file_deletion_strategy = 'keep'
1508
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1509
keep_files=file_deletion_strategy=='keep',
1510
force=file_deletion_strategy=='force')
1521
self.add_cleanup(tree.unlock)
1522
# Heuristics should probably all move into tree.remove_smart or
1525
added = tree.changes_from(tree.basis_tree(),
1526
specific_files=file_list).added
1527
file_list = sorted([f[0] for f in added], reverse=True)
1528
if len(file_list) == 0:
1529
raise errors.BzrCommandError('No matching files.')
1530
elif file_list is None:
1531
# missing files show up in iter_changes(basis) as
1532
# versioned-with-no-kind.
1534
for change in tree.iter_changes(tree.basis_tree()):
1535
# Find paths in the working tree that have no kind:
1536
if change[1][1] is not None and change[6][1] is None:
1537
missing.append(change[1][1])
1538
file_list = sorted(missing, reverse=True)
1539
file_deletion_strategy = 'keep'
1540
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1541
keep_files=file_deletion_strategy=='keep',
1542
force=file_deletion_strategy=='force')
1515
1545
class cmd_file_id(Command):
1737
1767
class cmd_init_repository(Command):
1738
"""Create a shared repository to hold branches.
1768
"""Create a shared repository for branches to share storage space.
1740
1770
New branches created under the repository directory will store their
1741
revisions in the repository, not in the branch directory.
1771
revisions in the repository, not in the branch directory. For branches
1772
with shared history, this reduces the amount of storage needed and
1773
speeds up the creation of new branches.
1743
If the --no-trees option is used then the branches in the repository
1744
will not have working trees by default.
1775
If the --no-trees option is given then the branches in the repository
1776
will not have working trees by default. They will still exist as
1777
directories on disk, but they will not have separate copies of the
1778
files at a certain revision. This can be useful for repositories that
1779
store branches which are interacted with through checkouts or remote
1780
branches, such as on a server.
1747
Create a shared repositories holding just branches::
1783
Create a shared repository holding just branches::
1749
1785
bzr init-repo --no-trees repo
1750
1786
bzr init repo/trunk
2304
2347
diff_type = 'full'
2308
# Build the log formatter
2309
if log_format is None:
2310
log_format = log.log_formatter_registry.get_default(b)
2311
lf = log_format(show_ids=show_ids, to_file=self.outf,
2312
show_timezone=timezone,
2313
delta_format=get_verbosity_level(),
2315
show_advice=levels is None)
2317
# Choose the algorithm for doing the logging. It's annoying
2318
# having multiple code paths like this but necessary until
2319
# the underlying repository format is faster at generating
2320
# deltas or can provide everything we need from the indices.
2321
# The default algorithm - match-using-deltas - works for
2322
# multiple files and directories and is faster for small
2323
# amounts of history (200 revisions say). However, it's too
2324
# slow for logging a single file in a repository with deep
2325
# history, i.e. > 10K revisions. In the spirit of "do no
2326
# evil when adding features", we continue to use the
2327
# original algorithm - per-file-graph - for the "single
2328
# file that isn't a directory without showing a delta" case.
2329
partial_history = revision and b.repository._format.supports_chks
2330
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2331
or delta_type or partial_history)
2333
# Build the LogRequest and execute it
2334
if len(file_ids) == 0:
2336
rqst = make_log_request_dict(
2337
direction=direction, specific_fileids=file_ids,
2338
start_revision=rev1, end_revision=rev2, limit=limit,
2339
message_search=message, delta_type=delta_type,
2340
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2341
Logger(b, rqst).show(lf)
2349
# Build the log formatter
2350
if log_format is None:
2351
log_format = log.log_formatter_registry.get_default(b)
2352
# Make a non-encoding output to include the diffs - bug 328007
2353
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2354
lf = log_format(show_ids=show_ids, to_file=self.outf,
2355
to_exact_file=unencoded_output,
2356
show_timezone=timezone,
2357
delta_format=get_verbosity_level(),
2359
show_advice=levels is None)
2361
# Choose the algorithm for doing the logging. It's annoying
2362
# having multiple code paths like this but necessary until
2363
# the underlying repository format is faster at generating
2364
# deltas or can provide everything we need from the indices.
2365
# The default algorithm - match-using-deltas - works for
2366
# multiple files and directories and is faster for small
2367
# amounts of history (200 revisions say). However, it's too
2368
# slow for logging a single file in a repository with deep
2369
# history, i.e. > 10K revisions. In the spirit of "do no
2370
# evil when adding features", we continue to use the
2371
# original algorithm - per-file-graph - for the "single
2372
# file that isn't a directory without showing a delta" case.
2373
partial_history = revision and b.repository._format.supports_chks
2374
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2375
or delta_type or partial_history)
2377
# Build the LogRequest and execute it
2378
if len(file_ids) == 0:
2380
rqst = make_log_request_dict(
2381
direction=direction, specific_fileids=file_ids,
2382
start_revision=rev1, end_revision=rev2, limit=limit,
2383
message_search=message, delta_type=delta_type,
2384
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2385
Logger(b, rqst).show(lf)
2346
2388
def _get_revision_range(revisionspec_list, branch, command_name):
2486
2531
note("Ignoring files outside view. View is %s" % view_str)
2488
2533
tree.lock_read()
2490
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2491
from_dir=relpath, recursive=recursive):
2492
# Apply additional masking
2493
if not all and not selection[fc]:
2495
if kind is not None and fkind != kind:
2500
fullpath = osutils.pathjoin(relpath, fp)
2503
views.check_path_in_view(tree, fullpath)
2504
except errors.FileOutsideView:
2534
self.add_cleanup(tree.unlock)
2535
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2536
from_dir=relpath, recursive=recursive):
2537
# Apply additional masking
2538
if not all and not selection[fc]:
2540
if kind is not None and fkind != kind:
2545
fullpath = osutils.pathjoin(relpath, fp)
2548
views.check_path_in_view(tree, fullpath)
2549
except errors.FileOutsideView:
2509
fp = osutils.pathjoin(prefix, fp)
2510
kindch = entry.kind_character()
2511
outstring = fp + kindch
2512
ui.ui_factory.clear_term()
2514
outstring = '%-8s %s' % (fc, outstring)
2515
if show_ids and fid is not None:
2516
outstring = "%-50s %s" % (outstring, fid)
2554
fp = osutils.pathjoin(prefix, fp)
2555
kindch = entry.kind_character()
2556
outstring = fp + kindch
2557
ui.ui_factory.clear_term()
2559
outstring = '%-8s %s' % (fc, outstring)
2560
if show_ids and fid is not None:
2561
outstring = "%-50s %s" % (outstring, fid)
2562
self.outf.write(outstring + '\n')
2564
self.outf.write(fp + '\0')
2567
self.outf.write(fid)
2568
self.outf.write('\0')
2576
self.outf.write('%-50s %s\n' % (outstring, my_id))
2517
2578
self.outf.write(outstring + '\n')
2519
self.outf.write(fp + '\0')
2522
self.outf.write(fid)
2523
self.outf.write('\0')
2531
self.outf.write('%-50s %s\n' % (outstring, my_id))
2533
self.outf.write(outstring + '\n')
2538
2581
class cmd_unknowns(Command):
2761
2826
tree, branch, relpath = \
2762
2827
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2763
2828
branch.lock_read()
2765
return self._run(tree, branch, relpath, filename, revision,
2766
name_from_revision, filters)
2829
self.add_cleanup(branch.unlock)
2830
return self._run(tree, branch, relpath, filename, revision,
2831
name_from_revision, filters)
2770
2833
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2772
2835
if tree is None:
2773
2836
tree = b.basis_tree()
2774
2837
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2838
rev_tree.lock_read()
2839
self.add_cleanup(rev_tree.unlock)
2776
2841
old_file_id = rev_tree.path2id(relpath)
3441
3547
verbose = not is_quiet()
3442
3548
# TODO: should possibly lock the history file...
3443
3549
benchfile = open(".perf_history", "at", buffering=1)
3550
self.add_cleanup(benchfile.close)
3445
3552
test_suite_factory = None
3446
3553
benchfile = None
3448
selftest_kwargs = {"verbose": verbose,
3450
"stop_on_failure": one,
3451
"transport": transport,
3452
"test_suite_factory": test_suite_factory,
3453
"lsprof_timed": lsprof_timed,
3454
"bench_history": benchfile,
3455
"matching_tests_first": first,
3456
"list_only": list_only,
3457
"random_seed": randomize,
3458
"exclude_pattern": exclude,
3460
"load_list": load_list,
3461
"debug_flags": debugflag,
3462
"starting_with": starting_with
3464
selftest_kwargs.update(self.additional_selftest_args)
3465
result = selftest(**selftest_kwargs)
3467
if benchfile is not None:
3554
selftest_kwargs = {"verbose": verbose,
3556
"stop_on_failure": one,
3557
"transport": transport,
3558
"test_suite_factory": test_suite_factory,
3559
"lsprof_timed": lsprof_timed,
3560
"lsprof_tests": lsprof_tests,
3561
"bench_history": benchfile,
3562
"matching_tests_first": first,
3563
"list_only": list_only,
3564
"random_seed": randomize,
3565
"exclude_pattern": exclude,
3567
"load_list": load_list,
3568
"debug_flags": debugflag,
3569
"starting_with": starting_with
3571
selftest_kwargs.update(self.additional_selftest_args)
3572
result = selftest(**selftest_kwargs)
3469
3573
return int(not result)
3633
3745
verified = 'inapplicable'
3634
3746
tree = WorkingTree.open_containing(directory)[0]
3636
# die as quickly as possible if there are uncommitted changes
3638
3749
basis_tree = tree.revision_tree(tree.last_revision())
3639
3750
except errors.NoSuchRevision:
3640
3751
basis_tree = tree.basis_tree()
3753
# die as quickly as possible if there are uncommitted changes
3642
if tree.has_changes(basis_tree):
3755
if tree.has_changes():
3643
3756
raise errors.UncommittedChanges(tree)
3645
3758
view_info = _get_view_info_for_change_reporter(tree)
3646
3759
change_reporter = delta._ChangeReporter(
3647
3760
unversioned_filter=tree.is_ignored, view_info=view_info)
3650
pb = ui.ui_factory.nested_progress_bar()
3651
cleanups.append(pb.finished)
3653
cleanups.append(tree.unlock)
3654
if location is not None:
3656
mergeable = bundle.read_mergeable_from_url(location,
3657
possible_transports=possible_transports)
3658
except errors.NotABundle:
3662
raise errors.BzrCommandError('Cannot use --uncommitted'
3663
' with bundles or merge directives.')
3665
if revision is not None:
3666
raise errors.BzrCommandError(
3667
'Cannot use -r with merge directives or bundles')
3668
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3671
if merger is None and uncommitted:
3672
if revision is not None and len(revision) > 0:
3673
raise errors.BzrCommandError('Cannot use --uncommitted and'
3674
' --revision at the same time.')
3675
merger = self.get_merger_from_uncommitted(tree, location, pb,
3677
allow_pending = False
3680
merger, allow_pending = self._get_merger_from_branch(tree,
3681
location, revision, remember, possible_transports, pb)
3683
merger.merge_type = merge_type
3684
merger.reprocess = reprocess
3685
merger.show_base = show_base
3686
self.sanity_check_merger(merger)
3687
if (merger.base_rev_id == merger.other_rev_id and
3688
merger.other_rev_id is not None):
3689
note('Nothing to do.')
3761
pb = ui.ui_factory.nested_progress_bar()
3762
self.add_cleanup(pb.finished)
3764
self.add_cleanup(tree.unlock)
3765
if location is not None:
3767
mergeable = bundle.read_mergeable_from_url(location,
3768
possible_transports=possible_transports)
3769
except errors.NotABundle:
3773
raise errors.BzrCommandError('Cannot use --uncommitted'
3774
' with bundles or merge directives.')
3776
if revision is not None:
3777
raise errors.BzrCommandError(
3778
'Cannot use -r with merge directives or bundles')
3779
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3782
if merger is None and uncommitted:
3783
if revision is not None and len(revision) > 0:
3784
raise errors.BzrCommandError('Cannot use --uncommitted and'
3785
' --revision at the same time.')
3786
merger = self.get_merger_from_uncommitted(tree, location, None)
3787
allow_pending = False
3790
merger, allow_pending = self._get_merger_from_branch(tree,
3791
location, revision, remember, possible_transports, None)
3793
merger.merge_type = merge_type
3794
merger.reprocess = reprocess
3795
merger.show_base = show_base
3796
self.sanity_check_merger(merger)
3797
if (merger.base_rev_id == merger.other_rev_id and
3798
merger.other_rev_id is not None):
3799
note('Nothing to do.')
3802
if merger.interesting_files is not None:
3803
raise errors.BzrCommandError('Cannot pull individual files')
3804
if (merger.base_rev_id == tree.last_revision()):
3805
result = tree.pull(merger.other_branch, False,
3806
merger.other_rev_id)
3807
result.report(self.outf)
3692
if merger.interesting_files is not None:
3693
raise errors.BzrCommandError('Cannot pull individual files')
3694
if (merger.base_rev_id == tree.last_revision()):
3695
result = tree.pull(merger.other_branch, False,
3696
merger.other_rev_id)
3697
result.report(self.outf)
3699
merger.check_basis(False)
3701
return self._do_preview(merger, cleanups)
3703
return self._do_interactive(merger, cleanups)
3705
return self._do_merge(merger, change_reporter, allow_pending,
3708
for cleanup in reversed(cleanups):
3809
if merger.this_basis is None:
3810
raise errors.BzrCommandError(
3811
"This branch has no commits."
3812
" (perhaps you would prefer 'bzr pull')")
3814
return self._do_preview(merger)
3816
return self._do_interactive(merger)
3818
return self._do_merge(merger, change_reporter, allow_pending,
3711
def _get_preview(self, merger, cleanups):
3821
def _get_preview(self, merger):
3712
3822
tree_merger = merger.make_merger()
3713
3823
tt = tree_merger.make_preview_transform()
3714
cleanups.append(tt.finalize)
3824
self.add_cleanup(tt.finalize)
3715
3825
result_tree = tt.get_preview_tree()
3716
3826
return result_tree
3718
def _do_preview(self, merger, cleanups):
3828
def _do_preview(self, merger):
3719
3829
from bzrlib.diff import show_diff_trees
3720
result_tree = self._get_preview(merger, cleanups)
3830
result_tree = self._get_preview(merger)
3721
3831
show_diff_trees(merger.this_tree, result_tree, self.outf,
3722
3832
old_label='', new_label='')
3912
4023
merge_type = _mod_merge.Merge3Merger
3913
4024
tree, file_list = tree_files(file_list)
3914
4025
tree.lock_write()
3916
parents = tree.get_parent_ids()
3917
if len(parents) != 2:
3918
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3919
" merges. Not cherrypicking or"
3921
repository = tree.branch.repository
3922
interesting_ids = None
3924
conflicts = tree.conflicts()
3925
if file_list is not None:
3926
interesting_ids = set()
3927
for filename in file_list:
3928
file_id = tree.path2id(filename)
3930
raise errors.NotVersionedError(filename)
3931
interesting_ids.add(file_id)
3932
if tree.kind(file_id) != "directory":
4026
self.add_cleanup(tree.unlock)
4027
parents = tree.get_parent_ids()
4028
if len(parents) != 2:
4029
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4030
" merges. Not cherrypicking or"
4032
repository = tree.branch.repository
4033
interesting_ids = None
4035
conflicts = tree.conflicts()
4036
if file_list is not None:
4037
interesting_ids = set()
4038
for filename in file_list:
4039
file_id = tree.path2id(filename)
4041
raise errors.NotVersionedError(filename)
4042
interesting_ids.add(file_id)
4043
if tree.kind(file_id) != "directory":
3935
for name, ie in tree.inventory.iter_entries(file_id):
3936
interesting_ids.add(ie.file_id)
3937
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3939
# Remerge only supports resolving contents conflicts
3940
allowed_conflicts = ('text conflict', 'contents conflict')
3941
restore_files = [c.path for c in conflicts
3942
if c.typestring in allowed_conflicts]
3943
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3944
tree.set_conflicts(ConflictList(new_conflicts))
3945
if file_list is not None:
3946
restore_files = file_list
3947
for filename in restore_files:
3949
restore(tree.abspath(filename))
3950
except errors.NotConflicted:
3952
# Disable pending merges, because the file texts we are remerging
3953
# have not had those merges performed. If we use the wrong parents
3954
# list, we imply that the working tree text has seen and rejected
3955
# all the changes from the other tree, when in fact those changes
3956
# have not yet been seen.
3957
pb = ui.ui_factory.nested_progress_bar()
3958
tree.set_parent_ids(parents[:1])
4046
for name, ie in tree.inventory.iter_entries(file_id):
4047
interesting_ids.add(ie.file_id)
4048
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4050
# Remerge only supports resolving contents conflicts
4051
allowed_conflicts = ('text conflict', 'contents conflict')
4052
restore_files = [c.path for c in conflicts
4053
if c.typestring in allowed_conflicts]
4054
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4055
tree.set_conflicts(ConflictList(new_conflicts))
4056
if file_list is not None:
4057
restore_files = file_list
4058
for filename in restore_files:
3960
merger = _mod_merge.Merger.from_revision_ids(pb,
3962
merger.interesting_ids = interesting_ids
3963
merger.merge_type = merge_type
3964
merger.show_base = show_base
3965
merger.reprocess = reprocess
3966
conflicts = merger.do_merge()
3968
tree.set_parent_ids(parents)
4060
restore(tree.abspath(filename))
4061
except errors.NotConflicted:
4063
# Disable pending merges, because the file texts we are remerging
4064
# have not had those merges performed. If we use the wrong parents
4065
# list, we imply that the working tree text has seen and rejected
4066
# all the changes from the other tree, when in fact those changes
4067
# have not yet been seen.
4068
tree.set_parent_ids(parents[:1])
4070
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4071
merger.interesting_ids = interesting_ids
4072
merger.merge_type = merge_type
4073
merger.show_base = show_base
4074
merger.reprocess = reprocess
4075
conflicts = merger.do_merge()
4077
tree.set_parent_ids(parents)
3972
4078
if conflicts > 0:
3996
4102
name. If you name a directory, all the contents of that directory will be
3999
Any files that have been newly added since that revision will be deleted,
4000
with a backup kept if appropriate. Directories containing unknown files
4001
will not be deleted.
4105
If you have newly added files since the target revision, they will be
4106
removed. If the files to be removed have been changed, backups will be
4107
created as above. Directories containing unknown files will not be
4003
The working tree contains a list of pending merged revisions, which will
4004
be included as parents in the next commit. Normally, revert clears that
4005
list as well as reverting the files. If any files are specified, revert
4006
leaves the pending merge list alone and reverts only the files. Use "bzr
4007
revert ." in the tree root to revert all files but keep the merge record,
4008
and "bzr revert --forget-merges" to clear the pending merge list without
4110
The working tree contains a list of revisions that have been merged but
4111
not yet committed. These revisions will be included as additional parents
4112
of the next commit. Normally, using revert clears that list as well as
4113
reverting the files. If any files are specified, revert leaves the list
4114
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4115
.`` in the tree root to revert all files but keep the recorded merges,
4116
and ``bzr revert --forget-merges`` to clear the pending merge list without
4009
4117
reverting any files.
4119
Using "bzr revert --forget-merges", it is possible to apply all of the
4120
changes from a branch in a single revision. To do this, perform the merge
4121
as desired. Then doing revert with the "--forget-merges" option will keep
4122
the content of the tree as it was, but it will clear the list of pending
4123
merges. The next commit will then contain all of the changes that are
4124
present in the other branch, but without any other parent revisions.
4125
Because this technique forgets where these changes originated, it may
4126
cause additional conflicts on later merges involving the same source and
4012
4130
_see_also = ['cat', 'export']
4022
4140
forget_merges=None):
4023
4141
tree, file_list = tree_files(file_list)
4024
4142
tree.lock_write()
4027
tree.set_parent_ids(tree.get_parent_ids()[:1])
4029
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4143
self.add_cleanup(tree.unlock)
4145
tree.set_parent_ids(tree.get_parent_ids()[:1])
4147
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4034
4150
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4035
4151
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4036
pb = ui.ui_factory.nested_progress_bar()
4038
tree.revert(file_list, rev_tree, not no_backup, pb,
4039
report_changes=True)
4152
tree.revert(file_list, rev_tree, not no_backup, None,
4153
report_changes=True)
4044
4156
class cmd_assert_fail(Command):
4181
4297
if remote_branch.base == local_branch.base:
4182
4298
remote_branch = local_branch
4300
local_branch.lock_read()
4301
self.add_cleanup(local_branch.unlock)
4184
4302
local_revid_range = _revision_range_to_revid_range(
4185
4303
_get_revision_range(my_revision, local_branch,
4306
remote_branch.lock_read()
4307
self.add_cleanup(remote_branch.unlock)
4188
4308
remote_revid_range = _revision_range_to_revid_range(
4189
4309
_get_revision_range(revision,
4190
4310
remote_branch, self.name()))
4192
local_branch.lock_read()
4194
remote_branch.lock_read()
4196
local_extra, remote_extra = find_unmerged(
4197
local_branch, remote_branch, restrict,
4198
backward=not reverse,
4199
include_merges=include_merges,
4200
local_revid_range=local_revid_range,
4201
remote_revid_range=remote_revid_range)
4203
if log_format is None:
4204
registry = log.log_formatter_registry
4205
log_format = registry.get_default(local_branch)
4206
lf = log_format(to_file=self.outf,
4208
show_timezone='original')
4211
if local_extra and not theirs_only:
4212
message("You have %d extra revision(s):\n" %
4214
for revision in iter_log_revisions(local_extra,
4215
local_branch.repository,
4217
lf.log_revision(revision)
4218
printed_local = True
4221
printed_local = False
4223
if remote_extra and not mine_only:
4224
if printed_local is True:
4226
message("You are missing %d revision(s):\n" %
4228
for revision in iter_log_revisions(remote_extra,
4229
remote_branch.repository,
4231
lf.log_revision(revision)
4234
if mine_only and not local_extra:
4235
# We checked local, and found nothing extra
4236
message('This branch is up to date.\n')
4237
elif theirs_only and not remote_extra:
4238
# We checked remote, and found nothing extra
4239
message('Other branch is up to date.\n')
4240
elif not (mine_only or theirs_only or local_extra or
4242
# We checked both branches, and neither one had extra
4244
message("Branches are up to date.\n")
4246
remote_branch.unlock()
4248
local_branch.unlock()
4312
local_extra, remote_extra = find_unmerged(
4313
local_branch, remote_branch, restrict,
4314
backward=not reverse,
4315
include_merges=include_merges,
4316
local_revid_range=local_revid_range,
4317
remote_revid_range=remote_revid_range)
4319
if log_format is None:
4320
registry = log.log_formatter_registry
4321
log_format = registry.get_default(local_branch)
4322
lf = log_format(to_file=self.outf,
4324
show_timezone='original')
4327
if local_extra and not theirs_only:
4328
message("You have %d extra revision(s):\n" %
4330
for revision in iter_log_revisions(local_extra,
4331
local_branch.repository,
4333
lf.log_revision(revision)
4334
printed_local = True
4337
printed_local = False
4339
if remote_extra and not mine_only:
4340
if printed_local is True:
4342
message("You are missing %d revision(s):\n" %
4344
for revision in iter_log_revisions(remote_extra,
4345
remote_branch.repository,
4347
lf.log_revision(revision)
4350
if mine_only and not local_extra:
4351
# We checked local, and found nothing extra
4352
message('This branch is up to date.\n')
4353
elif theirs_only and not remote_extra:
4354
# We checked remote, and found nothing extra
4355
message('Other branch is up to date.\n')
4356
elif not (mine_only or theirs_only or local_extra or
4358
# We checked both branches, and neither one had extra
4360
message("Branches are up to date.\n")
4249
4362
if not status_code and parent is None and other_branch is not None:
4250
4363
local_branch.lock_write()
4252
# handle race conditions - a parent might be set while we run.
4253
if local_branch.get_parent() is None:
4254
local_branch.set_parent(remote_branch.base)
4256
local_branch.unlock()
4364
self.add_cleanup(local_branch.unlock)
4365
# handle race conditions - a parent might be set while we run.
4366
if local_branch.get_parent() is None:
4367
local_branch.set_parent(remote_branch.base)
4257
4368
return status_code
4381
4490
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4382
4491
if wt is not None:
4493
self.add_cleanup(wt.unlock)
4385
4495
branch.lock_read()
4387
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4389
file_id = wt.path2id(relpath)
4391
file_id = tree.path2id(relpath)
4393
raise errors.NotVersionedError(filename)
4394
file_version = tree.inventory[file_id].revision
4395
if wt is not None and revision is None:
4396
# If there is a tree and we're not annotating historical
4397
# versions, annotate the working tree's content.
4398
annotate_file_tree(wt, file_id, self.outf, long, all,
4401
annotate_file(branch, file_version, file_id, long, all, self.outf,
4496
self.add_cleanup(branch.unlock)
4497
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4499
self.add_cleanup(tree.unlock)
4501
file_id = wt.path2id(relpath)
4503
file_id = tree.path2id(relpath)
4505
raise errors.NotVersionedError(filename)
4506
file_version = tree.inventory[file_id].revision
4507
if wt is not None and revision is None:
4508
# If there is a tree and we're not annotating historical
4509
# versions, annotate the working tree's content.
4510
annotate_file_tree(wt, file_id, self.outf, long, all,
4513
annotate_file(branch, file_version, file_id, long, all, self.outf,
4410
4517
class cmd_re_sign(Command):
4624
4728
end_revision=last_revno)
4627
print 'Dry-run, pretending to remove the above revisions.'
4629
val = raw_input('Press <enter> to continue')
4731
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
4631
print 'The above revision(s) will be removed.'
4633
val = raw_input('Are you sure [y/N]? ')
4634
if val.lower() not in ('y', 'yes'):
4733
ui.ui_factory.note('The above revision(s) will be removed.')
4736
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4737
ui.ui_factory.note('Canceled')
4638
4740
mutter('Uncommitting from {%s} to {%s}',
4639
4741
last_rev_id, rev_id)
4640
4742
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4641
4743
revno=revno, local=local)
4642
note('You can restore the old tip by running:\n'
4643
' bzr pull . -r revid:%s', last_rev_id)
4744
ui.ui_factory.note('You can restore the old tip by running:\n'
4745
' bzr pull . -r revid:%s' % last_rev_id)
4646
4748
class cmd_break_lock(Command):
4926
5034
directly from the merge directive, without retrieving data from a
4929
If --no-bundle is specified, then public_branch is needed (and must be
4930
up-to-date), so that the receiver can perform the merge using the
4931
public_branch. The public_branch is always included if known, so that
4932
people can check it later.
4934
The submit branch defaults to the parent, but can be overridden. Both
4935
submit branch and public branch will be remembered if supplied.
4937
If a public_branch is known for the submit_branch, that public submit
4938
branch is used in the merge instructions. This means that a local mirror
4939
can be used as your actual submit branch, once you have set public_branch
5037
`bzr send` creates a compact data set that, when applied using bzr
5038
merge, has the same effect as merging from the source branch.
5040
By default the merge directive is self-contained and can be applied to any
5041
branch containing submit_branch in its ancestory without needing access to
5044
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5045
revisions, but only a structured request to merge from the
5046
public_location. In that case the public_branch is needed and it must be
5047
up-to-date and accessible to the recipient. The public_branch is always
5048
included if known, so that people can check it later.
5050
The submit branch defaults to the parent of the source branch, but can be
5051
overridden. Both submit branch and public branch will be remembered in
5052
branch.conf the first time they are used for a particular branch. The
5053
source branch defaults to that containing the working directory, but can
5054
be changed using --from.
5056
In order to calculate those changes, bzr must analyse the submit branch.
5057
Therefore it is most efficient for the submit branch to be a local mirror.
5058
If a public location is known for the submit_branch, that location is used
5059
in the merge directive.
5061
The default behaviour is to send the merge directive by mail, unless -o is
5062
given, in which case it is sent to a file.
4942
5064
Mail is sent using your preferred mail program. This should be transparent
4943
5065
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5127
5254
branch, relpath = Branch.open_containing(directory)
5128
5255
branch.lock_write()
5131
branch.tags.delete_tag(tag_name)
5132
self.outf.write('Deleted tag %s.\n' % tag_name)
5256
self.add_cleanup(branch.unlock)
5258
branch.tags.delete_tag(tag_name)
5259
self.outf.write('Deleted tag %s.\n' % tag_name)
5262
if len(revision) != 1:
5263
raise errors.BzrCommandError(
5264
"Tags can only be placed on a single revision, "
5266
revision_id = revision[0].as_revision_id(branch)
5135
if len(revision) != 1:
5136
raise errors.BzrCommandError(
5137
"Tags can only be placed on a single revision, "
5139
revision_id = revision[0].as_revision_id(branch)
5141
revision_id = branch.last_revision()
5142
if (not force) and branch.tags.has_tag(tag_name):
5143
raise errors.TagAlreadyExists(tag_name)
5144
branch.tags.set_tag(tag_name, revision_id)
5145
self.outf.write('Created tag %s.\n' % tag_name)
5268
revision_id = branch.last_revision()
5269
if (not force) and branch.tags.has_tag(tag_name):
5270
raise errors.TagAlreadyExists(tag_name)
5271
branch.tags.set_tag(tag_name, revision_id)
5272
self.outf.write('Created tag %s.\n' % tag_name)
5150
5275
class cmd_tags(Command):
5185
5310
branch.lock_read()
5188
graph = branch.repository.get_graph()
5189
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5190
revid1, revid2 = rev1.rev_id, rev2.rev_id
5191
# only show revisions between revid1 and revid2 (inclusive)
5192
tags = [(tag, revid) for tag, revid in tags if
5193
graph.is_between(revid, revid1, revid2)]
5196
elif sort == 'time':
5198
for tag, revid in tags:
5200
revobj = branch.repository.get_revision(revid)
5201
except errors.NoSuchRevision:
5202
timestamp = sys.maxint # place them at the end
5204
timestamp = revobj.timestamp
5205
timestamps[revid] = timestamp
5206
tags.sort(key=lambda x: timestamps[x[1]])
5208
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5209
for index, (tag, revid) in enumerate(tags):
5211
revno = branch.revision_id_to_dotted_revno(revid)
5212
if isinstance(revno, tuple):
5213
revno = '.'.join(map(str, revno))
5214
except errors.NoSuchRevision:
5215
# Bad tag data/merges can lead to tagged revisions
5216
# which are not in this branch. Fail gracefully ...
5218
tags[index] = (tag, revno)
5311
self.add_cleanup(branch.unlock)
5313
graph = branch.repository.get_graph()
5314
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5315
revid1, revid2 = rev1.rev_id, rev2.rev_id
5316
# only show revisions between revid1 and revid2 (inclusive)
5317
tags = [(tag, revid) for tag, revid in tags if
5318
graph.is_between(revid, revid1, revid2)]
5321
elif sort == 'time':
5323
for tag, revid in tags:
5325
revobj = branch.repository.get_revision(revid)
5326
except errors.NoSuchRevision:
5327
timestamp = sys.maxint # place them at the end
5329
timestamp = revobj.timestamp
5330
timestamps[revid] = timestamp
5331
tags.sort(key=lambda x: timestamps[x[1]])
5333
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5334
for index, (tag, revid) in enumerate(tags):
5336
revno = branch.revision_id_to_dotted_revno(revid)
5337
if isinstance(revno, tuple):
5338
revno = '.'.join(map(str, revno))
5339
except errors.NoSuchRevision:
5340
# Bad tag data/merges can lead to tagged revisions
5341
# which are not in this branch. Fail gracefully ...
5343
tags[index] = (tag, revno)
5221
5345
for tag, revspec in tags:
5222
5346
self.outf.write('%-20s %s\n' % (tag, revspec))
5260
5384
Option('bind-to', help='Branch to bind checkout to.', type=str),
5261
5385
Option('force',
5262
help='Perform reconfiguration even if local changes'
5386
help='Perform reconfiguration even if local changes'
5388
Option('stacked-on',
5389
help='Reconfigure a branch to be stacked on another branch.',
5393
help='Reconfigure a branch to be unstacked. This '
5394
'may require copying substantial data into it.',
5266
def run(self, location=None, target_type=None, bind_to=None, force=False):
5398
def run(self, location=None, target_type=None, bind_to=None, force=False,
5267
5401
directory = bzrdir.BzrDir.open(location)
5402
if stacked_on and unstacked:
5403
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5404
elif stacked_on is not None:
5405
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5407
reconfigure.ReconfigureUnstacked().apply(directory)
5408
# At the moment you can use --stacked-on and a different
5409
# reconfiguration shape at the same time; there seems no good reason
5268
5411
if target_type is None:
5269
raise errors.BzrCommandError('No target configuration specified')
5412
if stacked_on or unstacked:
5415
raise errors.BzrCommandError('No target configuration '
5270
5417
elif target_type == 'branch':
5271
5418
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5272
5419
elif target_type == 'tree':
5309
5456
/path/to/newbranch.
5311
5458
Bound branches use the nickname of its master branch unless it is set
5312
locally, in which case switching will update the the local nickname to be
5459
locally, in which case switching will update the local nickname to be
5313
5460
that of the master.
5316
takes_args = ['to_location']
5463
takes_args = ['to_location?']
5317
5464
takes_options = [Option('force',
5318
5465
help='Switch even if local commits will be lost.'),
5319
5467
Option('create-branch', short_name='b',
5320
5468
help='Create the target branch from this one before'
5321
5469
' switching to it.'),
5324
def run(self, to_location, force=False, create_branch=False):
5472
def run(self, to_location=None, force=False, create_branch=False,
5325
5474
from bzrlib import switch
5326
5475
tree_location = '.'
5476
revision = _get_one_revision('switch', revision)
5327
5477
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5478
if to_location is None:
5479
if revision is None:
5480
raise errors.BzrCommandError('You must supply either a'
5481
' revision or a location')
5329
5484
branch = control_dir.open_branch()
5330
5485
had_explicit_nick = branch.get_config().has_explicit_nickname()
5604
5756
if writer is None:
5605
5757
writer = bzrlib.option.diff_writer_registry.get()
5607
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5608
message, destroy=destroy).run()
5759
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5760
file_list, message, destroy=destroy)
5609
5765
except errors.UserAbort:
5612
5768
def run_for_list(self):
5613
5769
tree = WorkingTree.open_containing('.')[0]
5614
5770
tree.lock_read()
5616
manager = tree.get_shelf_manager()
5617
shelves = manager.active_shelves()
5618
if len(shelves) == 0:
5619
note('No shelved changes.')
5621
for shelf_id in reversed(shelves):
5622
message = manager.get_metadata(shelf_id).get('message')
5624
message = '<no message>'
5625
self.outf.write('%3d: %s\n' % (shelf_id, message))
5771
self.add_cleanup(tree.unlock)
5772
manager = tree.get_shelf_manager()
5773
shelves = manager.active_shelves()
5774
if len(shelves) == 0:
5775
note('No shelved changes.')
5777
for shelf_id in reversed(shelves):
5778
message = manager.get_metadata(shelf_id).get('message')
5780
message = '<no message>'
5781
self.outf.write('%3d: %s\n' % (shelf_id, message))
5631
5785
class cmd_unshelve(Command):
added
removed
bzrlib/builtins.py
