529
543
wt = WorkingTree.open_containing(directory)[0]
546
self.add_cleanup(wt.unlock)
532
547
except (errors.NoWorkingTree, errors.NotLocalUrl):
534
549
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])
551
self.add_cleanup(b.unlock)
553
if revision is not None:
554
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
555
if revision_info_list is not None:
556
for rev_str in revision_info_list:
557
rev_spec = RevisionSpec.from_string(rev_str)
558
revision_ids.append(rev_spec.as_revision_id(b))
559
# No arguments supplied, default to the last revision
560
if len(revision_ids) == 0:
563
raise errors.NoWorkingTree(directory)
564
revision_ids.append(wt.last_revision())
566
revision_ids.append(b.last_revision())
570
for revision_id in revision_ids:
572
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
573
revno = '.'.join(str(i) for i in dotted_revno)
574
except errors.NoSuchRevision:
576
maxlen = max(maxlen, len(revno))
577
revinfos.append([revno, revision_id])
569
580
for ri in revinfos:
570
581
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
642
656
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:
657
self.add_cleanup(base_tree.unlock)
658
tree, file_list = tree_files_for_add(file_list)
659
added, ignored = tree.smart_add(file_list, not
660
no_recurse, action=action, save=not dry_run)
651
662
if len(ignored) > 0:
653
664
for glob in sorted(ignored.keys()):
654
665
for path in ignored[glob]:
655
666
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
670
class cmd_mkdir(Command):
725
728
revision = _get_one_revision('inventory', revision)
726
729
work_tree, file_list = tree_files(file_list)
727
730
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:
731
self.add_cleanup(work_tree.unlock)
732
if revision is not None:
733
tree = revision.as_tree(work_tree.branch)
735
extra_trees = [work_tree]
737
self.add_cleanup(tree.unlock)
742
if file_list is not None:
743
file_ids = tree.paths2ids(file_list, trees=extra_trees,
744
require_versioned=True)
745
# find_ids_across_trees may include some paths that don't
747
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
748
for file_id in file_ids if file_id in tree)
750
entries = tree.inventory.entries()
752
753
for path, entry in entries:
753
754
if kind and kind != entry.kind:
895
893
dest = osutils.pathjoin(dest_parent, dest_tail)
896
894
mutter("attempting to move %s => %s", src, dest)
897
895
tree.rename_one(src, dest, after=after)
898
self.outf.write("%s => %s\n" % (src, dest))
897
self.outf.write("%s => %s\n" % (src, dest))
901
900
class cmd_pull(Command):
902
901
"""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.
903
By default, this command only works on branches that have not diverged.
904
Branches are considered diverged if the destination branch's most recent
905
commit is one that has not been merged (directly or indirectly) into the
908
908
If branches have diverged, you can use 'bzr merge' to integrate the changes
909
909
from one into the other. Once one branch has merged, the other should
910
910
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.
912
If you want to replace your local changes and just want your branch to
913
match the remote one, use pull --overwrite. This will work even if the two
914
branches have diverged.
915
916
If there is no default location set, the first pull will set it. After
916
917
that, you can omit the location to use the default. To change the
998
999
if branch_from is not branch_to:
999
1000
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()
1001
self.add_cleanup(branch_from.unlock)
1002
if revision is not None:
1003
revision_id = revision.as_revision_id(branch_from)
1005
branch_to.lock_write()
1006
self.add_cleanup(branch_to.unlock)
1007
if tree_to is not None:
1008
view_info = _get_view_info_for_change_reporter(tree_to)
1009
change_reporter = delta._ChangeReporter(
1010
unversioned_filter=tree_to.is_ignored,
1011
view_info=view_info)
1012
result = tree_to.pull(
1013
branch_from, overwrite, revision_id, change_reporter,
1014
possible_transports=possible_transports, local=local)
1016
result = branch_to.pull(
1017
branch_from, overwrite, revision_id, local=local)
1019
result.report(self.outf)
1020
if verbose and result.old_revid != result.new_revid:
1021
log.show_branch_change(
1022
branch_to, self.outf, result.old_revno,
1030
1026
class cmd_push(Command):
1183
1181
' directory exists, but does not already'
1184
1182
' have a control directory. This flag will'
1185
1183
' allow branch to proceed.'),
1185
help="Bind new branch to from location."),
1187
1187
aliases = ['get', 'clone']
1189
1189
def run(self, from_location, to_location=None, revision=None,
1190
1190
hardlink=False, stacked=False, standalone=False, no_tree=False,
1191
use_existing_dir=False):
1191
use_existing_dir=False, switch=False, bind=False):
1192
from bzrlib import switch as _mod_switch
1192
1193
from bzrlib.tag import _merge_tags_if_possible
1194
1194
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
1196
revision = _get_one_revision('branch', revision)
1200
1197
br_from.lock_read()
1198
self.add_cleanup(br_from.unlock)
1199
if revision is not None:
1200
revision_id = revision.as_revision_id(br_from)
1202
# FIXME - wt.last_revision, fallback to branch, fall back to
1203
# None or perhaps NULL_REVISION to mean copy nothing
1205
revision_id = br_from.last_revision()
1206
if to_location is None:
1207
to_location = urlutils.derive_to_location(from_location)
1208
to_transport = transport.get_transport(to_location)
1202
if revision is not None:
1203
revision_id = revision.as_revision_id(br_from)
1210
to_transport.mkdir('.')
1211
except errors.FileExists:
1212
if not use_existing_dir:
1213
raise errors.BzrCommandError('Target directory "%s" '
1214
'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)
1217
bzrdir.BzrDir.open_from_transport(to_transport)
1218
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())
1221
raise errors.AlreadyBranchError(to_location)
1222
except errors.NoSuchFile:
1223
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1226
# preserve whatever source format we have.
1227
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1228
possible_transports=[to_transport],
1229
accelerator_tree=accelerator_tree,
1230
hardlink=hardlink, stacked=stacked,
1231
force_new_repo=standalone,
1232
create_tree_if_local=not no_tree,
1233
source_branch=br_from)
1234
branch = dir.open_branch()
1235
except errors.NoSuchRevision:
1236
to_transport.delete_tree('.')
1237
msg = "The branch %s has no revision %s." % (from_location,
1239
raise errors.BzrCommandError(msg)
1240
_merge_tags_if_possible(br_from, branch)
1241
# If the source branch is stacked, the new branch may
1242
# be stacked whether we asked for that explicitly or not.
1243
# We therefore need a try/except here and not just 'if stacked:'
1245
note('Created new stacked branch referring to %s.' %
1246
branch.get_stacked_on_url())
1247
except (errors.NotStacked, errors.UnstackableBranchFormat,
1248
errors.UnstackableRepositoryFormat), e:
1249
note('Branched %d revision(s).' % branch.revno())
1251
# Bind to the parent
1252
parent_branch = Branch.open(from_location)
1253
branch.bind(parent_branch)
1254
note('New branch bound to %s' % from_location)
1256
# Switch to the new branch
1257
wt, _ = WorkingTree.open_containing('.')
1258
_mod_switch.switch(wt.bzrdir, branch)
1259
note('Switched to branch: %s',
1260
urlutils.unescape_for_display(branch.base, 'utf-8'))
1257
1263
class cmd_checkout(Command):
1336
1342
def run(self, dir=u'.'):
1337
1343
tree = WorkingTree.open_containing(dir)[0]
1338
1344
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))
1345
self.add_cleanup(tree.unlock)
1346
new_inv = tree.inventory
1347
old_tree = tree.basis_tree()
1348
old_tree.lock_read()
1349
self.add_cleanup(old_tree.unlock)
1350
old_inv = old_tree.inventory
1352
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1353
for f, paths, c, v, p, n, k, e in iterator:
1354
if paths[0] == paths[1]:
1358
renames.append(paths)
1360
for old_name, new_name in renames:
1361
self.outf.write("%s => %s\n" % (old_name, new_name))
1362
1364
class cmd_update(Command):
1369
1371
If you want to discard your local changes, you can just do a
1370
1372
'bzr revert' instead of 'bzr commit' after the update.
1374
If the tree's branch is bound to a master branch, it will also update
1375
the branch from the master.
1373
1378
_see_also = ['pull', 'working-trees', 'status-flags']
1374
1379
takes_args = ['dir?']
1380
takes_options = ['revision']
1375
1381
aliases = ['up']
1377
def run(self, dir='.'):
1383
def run(self, dir='.', revision=None):
1384
if revision is not None and len(revision) != 1:
1385
raise errors.BzrCommandError(
1386
"bzr update --revision takes exactly one revision")
1378
1387
tree = WorkingTree.open_containing(dir)[0]
1388
branch = tree.branch
1379
1389
possible_transports = []
1380
master = tree.branch.get_master_branch(
1390
master = branch.get_master_branch(
1381
1391
possible_transports=possible_transports)
1382
1392
if master is not None:
1383
1393
tree.lock_write()
1394
branch_location = master.base
1385
1396
tree.lock_tree_write()
1397
branch_location = tree.branch.base
1398
self.add_cleanup(tree.unlock)
1399
# get rid of the final '/' and be ready for display
1400
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1402
existing_pending_merges = tree.get_parent_ids()[1:]
1406
# may need to fetch data into a heavyweight checkout
1407
# XXX: this may take some time, maybe we should display a
1409
old_tip = branch.update(possible_transports)
1410
if revision is not None:
1411
revision_id = revision[0].as_revision_id(branch)
1413
revision_id = branch.last_revision()
1414
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1415
revno = branch.revision_id_to_revno(revision_id)
1416
note("Tree is up to date at revision %d of branch %s" %
1417
(revno, branch_location))
1419
view_info = _get_view_info_for_change_reporter(tree)
1420
change_reporter = delta._ChangeReporter(
1421
unversioned_filter=tree.is_ignored,
1422
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
1424
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'.")
1426
possible_transports=possible_transports,
1427
revision=revision_id,
1429
except errors.NoSuchRevision, e:
1430
raise errors.BzrCommandError(
1431
"branch has no revision %s\n"
1432
"bzr update --revision only works"
1433
" for a revision in the branch history"
1435
revno = tree.branch.revision_id_to_revno(
1436
_mod_revision.ensure_null(tree.last_revision()))
1437
note('Updated to revision %d of branch %s' %
1438
(revno, branch_location))
1439
if tree.get_parent_ids()[1:] != existing_pending_merges:
1440
note('Your local commits will now show as pending merges with '
1441
"'bzr status', and can be committed with 'bzr commit'.")
1415
1448
class cmd_info(Command):
1486
1519
file_list = [f for f in file_list]
1488
1521
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')
1522
self.add_cleanup(tree.unlock)
1523
# Heuristics should probably all move into tree.remove_smart or
1526
added = tree.changes_from(tree.basis_tree(),
1527
specific_files=file_list).added
1528
file_list = sorted([f[0] for f in added], reverse=True)
1529
if len(file_list) == 0:
1530
raise errors.BzrCommandError('No matching files.')
1531
elif file_list is None:
1532
# missing files show up in iter_changes(basis) as
1533
# versioned-with-no-kind.
1535
for change in tree.iter_changes(tree.basis_tree()):
1536
# Find paths in the working tree that have no kind:
1537
if change[1][1] is not None and change[6][1] is None:
1538
missing.append(change[1][1])
1539
file_list = sorted(missing, reverse=True)
1540
file_deletion_strategy = 'keep'
1541
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1542
keep_files=file_deletion_strategy=='keep',
1543
force=file_deletion_strategy=='force')
1515
1546
class cmd_file_id(Command):
1737
1768
class cmd_init_repository(Command):
1738
"""Create a shared repository to hold branches.
1769
"""Create a shared repository for branches to share storage space.
1740
1771
New branches created under the repository directory will store their
1741
revisions in the repository, not in the branch directory.
1772
revisions in the repository, not in the branch directory. For branches
1773
with shared history, this reduces the amount of storage needed and
1774
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.
1776
If the --no-trees option is given then the branches in the repository
1777
will not have working trees by default. They will still exist as
1778
directories on disk, but they will not have separate copies of the
1779
files at a certain revision. This can be useful for repositories that
1780
store branches which are interacted with through checkouts or remote
1781
branches, such as on a server.
1747
Create a shared repositories holding just branches::
1784
Create a shared repository holding just branches::
1749
1786
bzr init-repo --no-trees repo
1750
1787
bzr init repo/trunk
2304
2348
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)
2350
# Build the log formatter
2351
if log_format is None:
2352
log_format = log.log_formatter_registry.get_default(b)
2353
# Make a non-encoding output to include the diffs - bug 328007
2354
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2355
lf = log_format(show_ids=show_ids, to_file=self.outf,
2356
to_exact_file=unencoded_output,
2357
show_timezone=timezone,
2358
delta_format=get_verbosity_level(),
2360
show_advice=levels is None)
2362
# Choose the algorithm for doing the logging. It's annoying
2363
# having multiple code paths like this but necessary until
2364
# the underlying repository format is faster at generating
2365
# deltas or can provide everything we need from the indices.
2366
# The default algorithm - match-using-deltas - works for
2367
# multiple files and directories and is faster for small
2368
# amounts of history (200 revisions say). However, it's too
2369
# slow for logging a single file in a repository with deep
2370
# history, i.e. > 10K revisions. In the spirit of "do no
2371
# evil when adding features", we continue to use the
2372
# original algorithm - per-file-graph - for the "single
2373
# file that isn't a directory without showing a delta" case.
2374
partial_history = revision and b.repository._format.supports_chks
2375
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2376
or delta_type or partial_history)
2378
# Build the LogRequest and execute it
2379
if len(file_ids) == 0:
2381
rqst = make_log_request_dict(
2382
direction=direction, specific_fileids=file_ids,
2383
start_revision=rev1, end_revision=rev2, limit=limit,
2384
message_search=message, delta_type=delta_type,
2385
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2386
Logger(b, rqst).show(lf)
2346
2389
def _get_revision_range(revisionspec_list, branch, command_name):
2486
2532
note("Ignoring files outside view. View is %s" % view_str)
2488
2534
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:
2535
self.add_cleanup(tree.unlock)
2536
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2537
from_dir=relpath, recursive=recursive):
2538
# Apply additional masking
2539
if not all and not selection[fc]:
2541
if kind is not None and fkind != kind:
2546
fullpath = osutils.pathjoin(relpath, fp)
2549
views.check_path_in_view(tree, fullpath)
2550
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)
2555
fp = osutils.pathjoin(prefix, fp)
2556
kindch = entry.kind_character()
2557
outstring = fp + kindch
2558
ui.ui_factory.clear_term()
2560
outstring = '%-8s %s' % (fc, outstring)
2561
if show_ids and fid is not None:
2562
outstring = "%-50s %s" % (outstring, fid)
2563
self.outf.write(outstring + '\n')
2565
self.outf.write(fp + '\0')
2568
self.outf.write(fid)
2569
self.outf.write('\0')
2577
self.outf.write('%-50s %s\n' % (outstring, my_id))
2517
2579
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
2582
class cmd_unknowns(Command):
2761
2827
tree, branch, relpath = \
2762
2828
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2763
2829
branch.lock_read()
2765
return self._run(tree, branch, relpath, filename, revision,
2766
name_from_revision, filters)
2830
self.add_cleanup(branch.unlock)
2831
return self._run(tree, branch, relpath, filename, revision,
2832
name_from_revision, filters)
2770
2834
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2772
2836
if tree is None:
2773
2837
tree = b.basis_tree()
2774
2838
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2839
rev_tree.lock_read()
2840
self.add_cleanup(rev_tree.unlock)
2776
2842
old_file_id = rev_tree.path2id(relpath)
3441
3548
verbose = not is_quiet()
3442
3549
# TODO: should possibly lock the history file...
3443
3550
benchfile = open(".perf_history", "at", buffering=1)
3551
self.add_cleanup(benchfile.close)
3445
3553
test_suite_factory = None
3446
3554
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:
3555
selftest_kwargs = {"verbose": verbose,
3557
"stop_on_failure": one,
3558
"transport": transport,
3559
"test_suite_factory": test_suite_factory,
3560
"lsprof_timed": lsprof_timed,
3561
"lsprof_tests": lsprof_tests,
3562
"bench_history": benchfile,
3563
"matching_tests_first": first,
3564
"list_only": list_only,
3565
"random_seed": randomize,
3566
"exclude_pattern": exclude,
3568
"load_list": load_list,
3569
"debug_flags": debugflag,
3570
"starting_with": starting_with
3572
selftest_kwargs.update(self.additional_selftest_args)
3573
result = selftest(**selftest_kwargs)
3469
3574
return int(not result)
3633
3746
verified = 'inapplicable'
3634
3747
tree = WorkingTree.open_containing(directory)[0]
3636
# die as quickly as possible if there are uncommitted changes
3638
3750
basis_tree = tree.revision_tree(tree.last_revision())
3639
3751
except errors.NoSuchRevision:
3640
3752
basis_tree = tree.basis_tree()
3754
# die as quickly as possible if there are uncommitted changes
3642
if tree.has_changes(basis_tree):
3756
if tree.has_changes():
3643
3757
raise errors.UncommittedChanges(tree)
3645
3759
view_info = _get_view_info_for_change_reporter(tree)
3646
3760
change_reporter = delta._ChangeReporter(
3647
3761
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.')
3762
pb = ui.ui_factory.nested_progress_bar()
3763
self.add_cleanup(pb.finished)
3765
self.add_cleanup(tree.unlock)
3766
if location is not None:
3768
mergeable = bundle.read_mergeable_from_url(location,
3769
possible_transports=possible_transports)
3770
except errors.NotABundle:
3774
raise errors.BzrCommandError('Cannot use --uncommitted'
3775
' with bundles or merge directives.')
3777
if revision is not None:
3778
raise errors.BzrCommandError(
3779
'Cannot use -r with merge directives or bundles')
3780
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3783
if merger is None and uncommitted:
3784
if revision is not None and len(revision) > 0:
3785
raise errors.BzrCommandError('Cannot use --uncommitted and'
3786
' --revision at the same time.')
3787
merger = self.get_merger_from_uncommitted(tree, location, None)
3788
allow_pending = False
3791
merger, allow_pending = self._get_merger_from_branch(tree,
3792
location, revision, remember, possible_transports, None)
3794
merger.merge_type = merge_type
3795
merger.reprocess = reprocess
3796
merger.show_base = show_base
3797
self.sanity_check_merger(merger)
3798
if (merger.base_rev_id == merger.other_rev_id and
3799
merger.other_rev_id is not None):
3800
note('Nothing to do.')
3803
if merger.interesting_files is not None:
3804
raise errors.BzrCommandError('Cannot pull individual files')
3805
if (merger.base_rev_id == tree.last_revision()):
3806
result = tree.pull(merger.other_branch, False,
3807
merger.other_rev_id)
3808
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):
3810
if merger.this_basis is None:
3811
raise errors.BzrCommandError(
3812
"This branch has no commits."
3813
" (perhaps you would prefer 'bzr pull')")
3815
return self._do_preview(merger)
3817
return self._do_interactive(merger)
3819
return self._do_merge(merger, change_reporter, allow_pending,
3711
def _get_preview(self, merger, cleanups):
3822
def _get_preview(self, merger):
3712
3823
tree_merger = merger.make_merger()
3713
3824
tt = tree_merger.make_preview_transform()
3714
cleanups.append(tt.finalize)
3825
self.add_cleanup(tt.finalize)
3715
3826
result_tree = tt.get_preview_tree()
3716
3827
return result_tree
3718
def _do_preview(self, merger, cleanups):
3829
def _do_preview(self, merger):
3719
3830
from bzrlib.diff import show_diff_trees
3720
result_tree = self._get_preview(merger, cleanups)
3831
result_tree = self._get_preview(merger)
3721
3832
show_diff_trees(merger.this_tree, result_tree, self.outf,
3722
3833
old_label='', new_label='')
3912
4024
merge_type = _mod_merge.Merge3Merger
3913
4025
tree, file_list = tree_files(file_list)
3914
4026
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":
4027
self.add_cleanup(tree.unlock)
4028
parents = tree.get_parent_ids()
4029
if len(parents) != 2:
4030
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4031
" merges. Not cherrypicking or"
4033
repository = tree.branch.repository
4034
interesting_ids = None
4036
conflicts = tree.conflicts()
4037
if file_list is not None:
4038
interesting_ids = set()
4039
for filename in file_list:
4040
file_id = tree.path2id(filename)
4042
raise errors.NotVersionedError(filename)
4043
interesting_ids.add(file_id)
4044
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])
4047
for name, ie in tree.inventory.iter_entries(file_id):
4048
interesting_ids.add(ie.file_id)
4049
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4051
# Remerge only supports resolving contents conflicts
4052
allowed_conflicts = ('text conflict', 'contents conflict')
4053
restore_files = [c.path for c in conflicts
4054
if c.typestring in allowed_conflicts]
4055
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4056
tree.set_conflicts(ConflictList(new_conflicts))
4057
if file_list is not None:
4058
restore_files = file_list
4059
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)
4061
restore(tree.abspath(filename))
4062
except errors.NotConflicted:
4064
# Disable pending merges, because the file texts we are remerging
4065
# have not had those merges performed. If we use the wrong parents
4066
# list, we imply that the working tree text has seen and rejected
4067
# all the changes from the other tree, when in fact those changes
4068
# have not yet been seen.
4069
tree.set_parent_ids(parents[:1])
4071
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4072
merger.interesting_ids = interesting_ids
4073
merger.merge_type = merge_type
4074
merger.show_base = show_base
4075
merger.reprocess = reprocess
4076
conflicts = merger.do_merge()
4078
tree.set_parent_ids(parents)
3972
4079
if conflicts > 0:
3996
4103
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.
4106
If you have newly added files since the target revision, they will be
4107
removed. If the files to be removed have been changed, backups will be
4108
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
4111
The working tree contains a list of revisions that have been merged but
4112
not yet committed. These revisions will be included as additional parents
4113
of the next commit. Normally, using revert clears that list as well as
4114
reverting the files. If any files are specified, revert leaves the list
4115
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4116
.`` in the tree root to revert all files but keep the recorded merges,
4117
and ``bzr revert --forget-merges`` to clear the pending merge list without
4009
4118
reverting any files.
4120
Using "bzr revert --forget-merges", it is possible to apply all of the
4121
changes from a branch in a single revision. To do this, perform the merge
4122
as desired. Then doing revert with the "--forget-merges" option will keep
4123
the content of the tree as it was, but it will clear the list of pending
4124
merges. The next commit will then contain all of the changes that are
4125
present in the other branch, but without any other parent revisions.
4126
Because this technique forgets where these changes originated, it may
4127
cause additional conflicts on later merges involving the same source and
4012
4131
_see_also = ['cat', 'export']
4022
4141
forget_merges=None):
4023
4142
tree, file_list = tree_files(file_list)
4024
4143
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)
4144
self.add_cleanup(tree.unlock)
4146
tree.set_parent_ids(tree.get_parent_ids()[:1])
4148
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4034
4151
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4035
4152
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)
4153
tree.revert(file_list, rev_tree, not no_backup, None,
4154
report_changes=True)
4044
4157
class cmd_assert_fail(Command):
4181
4298
if remote_branch.base == local_branch.base:
4182
4299
remote_branch = local_branch
4301
local_branch.lock_read()
4302
self.add_cleanup(local_branch.unlock)
4184
4303
local_revid_range = _revision_range_to_revid_range(
4185
4304
_get_revision_range(my_revision, local_branch,
4307
remote_branch.lock_read()
4308
self.add_cleanup(remote_branch.unlock)
4188
4309
remote_revid_range = _revision_range_to_revid_range(
4189
4310
_get_revision_range(revision,
4190
4311
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()
4313
local_extra, remote_extra = find_unmerged(
4314
local_branch, remote_branch, restrict,
4315
backward=not reverse,
4316
include_merges=include_merges,
4317
local_revid_range=local_revid_range,
4318
remote_revid_range=remote_revid_range)
4320
if log_format is None:
4321
registry = log.log_formatter_registry
4322
log_format = registry.get_default(local_branch)
4323
lf = log_format(to_file=self.outf,
4325
show_timezone='original')
4328
if local_extra and not theirs_only:
4329
message("You have %d extra revision(s):\n" %
4331
for revision in iter_log_revisions(local_extra,
4332
local_branch.repository,
4334
lf.log_revision(revision)
4335
printed_local = True
4338
printed_local = False
4340
if remote_extra and not mine_only:
4341
if printed_local is True:
4343
message("You are missing %d revision(s):\n" %
4345
for revision in iter_log_revisions(remote_extra,
4346
remote_branch.repository,
4348
lf.log_revision(revision)
4351
if mine_only and not local_extra:
4352
# We checked local, and found nothing extra
4353
message('This branch is up to date.\n')
4354
elif theirs_only and not remote_extra:
4355
# We checked remote, and found nothing extra
4356
message('Other branch is up to date.\n')
4357
elif not (mine_only or theirs_only or local_extra or
4359
# We checked both branches, and neither one had extra
4361
message("Branches are up to date.\n")
4249
4363
if not status_code and parent is None and other_branch is not None:
4250
4364
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()
4365
self.add_cleanup(local_branch.unlock)
4366
# handle race conditions - a parent might be set while we run.
4367
if local_branch.get_parent() is None:
4368
local_branch.set_parent(remote_branch.base)
4257
4369
return status_code
4381
4491
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4382
4492
if wt is not None:
4494
self.add_cleanup(wt.unlock)
4385
4496
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,
4497
self.add_cleanup(branch.unlock)
4498
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4500
self.add_cleanup(tree.unlock)
4502
file_id = wt.path2id(relpath)
4504
file_id = tree.path2id(relpath)
4506
raise errors.NotVersionedError(filename)
4507
file_version = tree.inventory[file_id].revision
4508
if wt is not None and revision is None:
4509
# If there is a tree and we're not annotating historical
4510
# versions, annotate the working tree's content.
4511
annotate_file_tree(wt, file_id, self.outf, long, all,
4514
annotate_file(branch, file_version, file_id, long, all, self.outf,
4410
4518
class cmd_re_sign(Command):
4624
4729
end_revision=last_revno)
4627
print 'Dry-run, pretending to remove the above revisions.'
4629
val = raw_input('Press <enter> to continue')
4732
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'):
4734
ui.ui_factory.note('The above revision(s) will be removed.')
4737
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4738
ui.ui_factory.note('Canceled')
4638
4741
mutter('Uncommitting from {%s} to {%s}',
4639
4742
last_rev_id, rev_id)
4640
4743
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4641
4744
revno=revno, local=local)
4642
note('You can restore the old tip by running:\n'
4643
' bzr pull . -r revid:%s', last_rev_id)
4745
ui.ui_factory.note('You can restore the old tip by running:\n'
4746
' bzr pull . -r revid:%s' % last_rev_id)
4646
4749
class cmd_break_lock(Command):
4926
5035
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
5038
`bzr send` creates a compact data set that, when applied using bzr
5039
merge, has the same effect as merging from the source branch.
5041
By default the merge directive is self-contained and can be applied to any
5042
branch containing submit_branch in its ancestory without needing access to
5045
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5046
revisions, but only a structured request to merge from the
5047
public_location. In that case the public_branch is needed and it must be
5048
up-to-date and accessible to the recipient. The public_branch is always
5049
included if known, so that people can check it later.
5051
The submit branch defaults to the parent of the source branch, but can be
5052
overridden. Both submit branch and public branch will be remembered in
5053
branch.conf the first time they are used for a particular branch. The
5054
source branch defaults to that containing the working directory, but can
5055
be changed using --from.
5057
In order to calculate those changes, bzr must analyse the submit branch.
5058
Therefore it is most efficient for the submit branch to be a local mirror.
5059
If a public location is known for the submit_branch, that location is used
5060
in the merge directive.
5062
The default behaviour is to send the merge directive by mail, unless -o is
5063
given, in which case it is sent to a file.
4942
5065
Mail is sent using your preferred mail program. This should be transparent
4943
5066
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5127
5255
branch, relpath = Branch.open_containing(directory)
5128
5256
branch.lock_write()
5131
branch.tags.delete_tag(tag_name)
5132
self.outf.write('Deleted tag %s.\n' % tag_name)
5257
self.add_cleanup(branch.unlock)
5259
branch.tags.delete_tag(tag_name)
5260
self.outf.write('Deleted tag %s.\n' % tag_name)
5263
if len(revision) != 1:
5264
raise errors.BzrCommandError(
5265
"Tags can only be placed on a single revision, "
5267
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)
5269
revision_id = branch.last_revision()
5270
if (not force) and branch.tags.has_tag(tag_name):
5271
raise errors.TagAlreadyExists(tag_name)
5272
branch.tags.set_tag(tag_name, revision_id)
5273
self.outf.write('Created tag %s.\n' % tag_name)
5150
5276
class cmd_tags(Command):
5185
5311
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)
5312
self.add_cleanup(branch.unlock)
5314
graph = branch.repository.get_graph()
5315
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5316
revid1, revid2 = rev1.rev_id, rev2.rev_id
5317
# only show revisions between revid1 and revid2 (inclusive)
5318
tags = [(tag, revid) for tag, revid in tags if
5319
graph.is_between(revid, revid1, revid2)]
5322
elif sort == 'time':
5324
for tag, revid in tags:
5326
revobj = branch.repository.get_revision(revid)
5327
except errors.NoSuchRevision:
5328
timestamp = sys.maxint # place them at the end
5330
timestamp = revobj.timestamp
5331
timestamps[revid] = timestamp
5332
tags.sort(key=lambda x: timestamps[x[1]])
5334
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5335
for index, (tag, revid) in enumerate(tags):
5337
revno = branch.revision_id_to_dotted_revno(revid)
5338
if isinstance(revno, tuple):
5339
revno = '.'.join(map(str, revno))
5340
except errors.NoSuchRevision:
5341
# Bad tag data/merges can lead to tagged revisions
5342
# which are not in this branch. Fail gracefully ...
5344
tags[index] = (tag, revno)
5221
5346
for tag, revspec in tags:
5222
5347
self.outf.write('%-20s %s\n' % (tag, revspec))
5332
5457
/path/to/newbranch.
5334
5459
Bound branches use the nickname of its master branch unless it is set
5335
locally, in which case switching will update the the local nickname to be
5460
locally, in which case switching will update the local nickname to be
5336
5461
that of the master.
5339
takes_args = ['to_location']
5464
takes_args = ['to_location?']
5340
5465
takes_options = [Option('force',
5341
5466
help='Switch even if local commits will be lost.'),
5342
5468
Option('create-branch', short_name='b',
5343
5469
help='Create the target branch from this one before'
5344
5470
' switching to it.'),
5347
def run(self, to_location, force=False, create_branch=False):
5473
def run(self, to_location=None, force=False, create_branch=False,
5348
5475
from bzrlib import switch
5349
5476
tree_location = '.'
5477
revision = _get_one_revision('switch', revision)
5350
5478
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5479
if to_location is None:
5480
if revision is None:
5481
raise errors.BzrCommandError('You must supply either a'
5482
' revision or a location')
5352
5485
branch = control_dir.open_branch()
5353
5486
had_explicit_nick = branch.get_config().has_explicit_nickname()
5627
5757
if writer is None:
5628
5758
writer = bzrlib.option.diff_writer_registry.get()
5630
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5631
message, destroy=destroy).run()
5760
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5761
file_list, message, destroy=destroy)
5632
5766
except errors.UserAbort:
5635
5769
def run_for_list(self):
5636
5770
tree = WorkingTree.open_containing('.')[0]
5637
5771
tree.lock_read()
5639
manager = tree.get_shelf_manager()
5640
shelves = manager.active_shelves()
5641
if len(shelves) == 0:
5642
note('No shelved changes.')
5644
for shelf_id in reversed(shelves):
5645
message = manager.get_metadata(shelf_id).get('message')
5647
message = '<no message>'
5648
self.outf.write('%3d: %s\n' % (shelf_id, message))
5772
self.add_cleanup(tree.unlock)
5773
manager = tree.get_shelf_manager()
5774
shelves = manager.active_shelves()
5775
if len(shelves) == 0:
5776
note('No shelved changes.')
5778
for shelf_id in reversed(shelves):
5779
message = manager.get_metadata(shelf_id).get('message')
5781
message = '<no message>'
5782
self.outf.write('%3d: %s\n' % (shelf_id, message))
5654
5786
class cmd_unshelve(Command):
added
removed
bzrlib/builtins.py
