362
212
' --revision or a revision_id')
363
213
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
370
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
395
PATH is a btree index file, it can be any URL. This includes things like
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
398
By default, the tuples stored in the index file will be displayed. With
399
--raw, we will uncompress the pages, but otherwise display the raw bytes
403
# TODO: Do we want to dump the internal nodes as well?
404
# TODO: It would be nice to be able to dump the un-parsed information,
405
# rather than only going through iter_all_entries. However, this is
406
# good enough for a start
408
encoding_type = 'exact'
409
takes_args = ['path']
410
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
411
' rather than the parsed tuples.'),
414
def run(self, path, raw=False):
415
dirname, basename = osutils.split(path)
416
t = transport.get_transport(dirname)
418
self._dump_raw_bytes(t, basename)
420
self._dump_entries(t, basename)
422
def _get_index_and_bytes(self, trans, basename):
423
"""Create a BTreeGraphIndex and raw bytes."""
424
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
427
bt._size = len(bytes)
430
def _dump_raw_bytes(self, trans, basename):
433
# We need to parse at least the root node.
434
# This is because the first page of every row starts with an
435
# uncompressed header.
436
bt, bytes = self._get_index_and_bytes(trans, basename)
437
for page_idx, page_start in enumerate(xrange(0, len(bytes),
438
btree_index._PAGE_SIZE)):
439
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
440
page_bytes = bytes[page_start:page_end]
442
self.outf.write('Root node:\n')
443
header_end, data = bt._parse_header_from_bytes(page_bytes)
444
self.outf.write(page_bytes[:header_end])
446
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
451
def _dump_entries(self, trans, basename):
453
st = trans.stat(basename)
454
except errors.TransportNotPossible:
455
# We can't stat, so we'll fake it because we have to do the 'get()'
457
bt, _ = self._get_index_and_bytes(trans, basename)
459
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
460
for node in bt.iter_all_entries():
461
# Node is made up of:
462
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
215
# TODO: jam 20060112 should cat-revision always output utf-8?
216
if revision_id is not None:
217
revision_id = osutils.safe_revision_id(revision_id, warn=False)
218
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
219
elif revision is not None:
222
raise errors.BzrCommandError('You cannot specify a NULL'
224
revno, rev_id = rev.in_history(b)
225
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
473
228
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
229
"""Remove the working tree from a given branch/checkout.
476
231
Since a lightweight checkout is little more than a working tree
477
232
this will refuse to run against one.
479
234
To re-create the working tree, use "bzr checkout".
481
236
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
485
help='Remove the working tree even if it has '
486
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
238
takes_args = ['location?']
240
def run(self, location='.'):
241
d = bzrdir.BzrDir.open(location)
244
working = d.open_workingtree()
245
except errors.NoWorkingTree:
246
raise errors.BzrCommandError("No working tree to remove")
247
except errors.NotLocalUrl:
248
raise errors.BzrCommandError("You cannot remove the working tree of a "
251
working_path = working.bzrdir.root_transport.base
252
branch_path = working.branch.bzrdir.root_transport.base
253
if working_path != branch_path:
254
raise errors.BzrCommandError("You cannot remove the working tree from "
255
"a lightweight checkout")
257
d.destroy_workingtree()
514
260
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
261
"""Show current revision number.
517
263
This is equal to the number of revisions on this branch.
520
266
_see_also = ['info']
521
267
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
547
self.outf.write(str(revno) + '\n')
270
def run(self, location=u'.'):
271
self.outf.write(str(Branch.open_containing(location)[0].revno()))
272
self.outf.write('\n')
550
275
class cmd_revision_info(Command):
551
__doc__ = """Show revision number and revision id for a given revision identifier.
276
"""Show revision number and revision id for a given revision identifier.
554
279
takes_args = ['revision_info*']
558
help='Branch to examine, '
559
'rather than the one containing the working directory.',
563
Option('tree', help='Show revno of working tree'),
280
takes_options = ['revision']
567
def run(self, revision=None, directory=u'.', tree=False,
568
revision_info_list=[]):
283
def run(self, revision=None, revision_info_list=[]):
571
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
581
286
if revision is not None:
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
287
revs.extend(revision)
583
288
if revision_info_list is not None:
584
for rev_str in revision_info_list:
585
rev_spec = RevisionSpec.from_string(rev_str)
586
revision_ids.append(rev_spec.as_revision_id(b))
587
# No arguments supplied, default to the last revision
588
if len(revision_ids) == 0:
591
raise errors.NoWorkingTree(directory)
592
revision_ids.append(wt.last_revision())
289
for rev in revision_info_list:
290
revs.append(RevisionSpec.from_string(rev))
292
b = Branch.open_containing(u'.')[0]
295
revs.append(RevisionSpec.from_string('-1'))
298
revinfo = rev.in_history(b)
299
if revinfo.revno is None:
300
dotted_map = b.get_revision_id_to_revno_map()
301
revno = '.'.join(str(i) for i in dotted_map[revinfo.rev_id])
302
print '%s %s' % (revno, revinfo.rev_id)
594
revision_ids.append(b.last_revision())
598
for revision_id in revision_ids:
600
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
601
revno = '.'.join(str(i) for i in dotted_revno)
602
except errors.NoSuchRevision:
604
maxlen = max(maxlen, len(revno))
605
revinfos.append([revno, revision_id])
609
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
304
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
612
307
class cmd_add(Command):
613
__doc__ = """Add specified files or directories.
308
"""Add specified files or directories.
615
310
In non-recursive mode, all the named items are added, regardless
616
311
of whether they were previously ignored. A warning is given if
817
523
takes_args = ['names*']
818
524
takes_options = [Option("after", help="Move only the bzr identifier"
819
525
" of the file, because the file has already been moved."),
820
Option('auto', help='Automatically guess renames.'),
821
Option('dry-run', help='Avoid making changes when guessing renames.'),
823
527
aliases = ['move', 'rename']
824
528
encoding_type = 'replace'
826
def run(self, names_list, after=False, auto=False, dry_run=False):
828
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
530
def run(self, names_list, after=False):
831
531
if names_list is None:
833
534
if len(names_list) < 2:
834
535
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
838
self._run(tree, names_list, rel_names, after)
840
def run_auto(self, names_list, after, dry_run):
841
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
def _run(self, tree, names_list, rel_names, after):
853
into_existing = osutils.isdir(names_list[-1])
854
if into_existing and len(names_list) == 2:
856
# a. case-insensitive filesystem and change case of dir
857
# b. move directory after the fact (if the source used to be
858
# a directory, but now doesn't exist in the working tree
859
# and the target is an existing directory, just rename it)
860
if (not tree.case_sensitive
861
and rel_names[0].lower() == rel_names[1].lower()):
862
into_existing = False
865
# 'fix' the case of a potential 'from'
866
from_id = tree.path2id(
867
tree.get_canonical_inventory_path(rel_names[0]))
868
if (not osutils.lexists(names_list[0]) and
869
from_id and inv.get_file_kind(from_id) == "directory"):
870
into_existing = False
536
tree, rel_names = tree_files(names_list)
538
if os.path.isdir(names_list[-1]):
873
539
# move into existing directory
874
# All entries reference existing inventory items, so fix them up
875
# for cicp file-systems.
876
rel_names = tree.get_canonical_inventory_paths(rel_names)
877
for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
879
self.outf.write("%s => %s\n" % (src, dest))
540
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
541
self.outf.write("%s => %s\n" % pair)
881
543
if len(names_list) != 2:
882
544
raise errors.BzrCommandError('to mv multiple files the'
883
545
' destination must be a versioned'
886
# for cicp file-systems: the src references an existing inventory
888
src = tree.get_canonical_inventory_path(rel_names[0])
889
# Find the canonical version of the destination: In all cases, the
890
# parent of the target must be in the inventory, so we fetch the
891
# canonical version from there (we do not always *use* the
892
# canonicalized tail portion - we may be attempting to rename the
894
canon_dest = tree.get_canonical_inventory_path(rel_names[1])
895
dest_parent = osutils.dirname(canon_dest)
896
spec_tail = osutils.basename(rel_names[1])
897
# For a CICP file-system, we need to avoid creating 2 inventory
898
# entries that differ only by case. So regardless of the case
899
# we *want* to use (ie, specified by the user or the file-system),
900
# we must always choose to use the case of any existing inventory
901
# items. The only exception to this is when we are attempting a
902
# case-only rename (ie, canonical versions of src and dest are
904
dest_id = tree.path2id(canon_dest)
905
if dest_id is None or tree.path2id(src) == dest_id:
906
# No existing item we care about, so work out what case we
907
# are actually going to use.
909
# If 'after' is specified, the tail must refer to a file on disk.
911
dest_parent_fq = osutils.pathjoin(tree.basedir, dest_parent)
913
# pathjoin with an empty tail adds a slash, which breaks
915
dest_parent_fq = tree.basedir
917
dest_tail = osutils.canonical_relpath(
919
osutils.pathjoin(dest_parent_fq, spec_tail))
921
# not 'after', so case as specified is used
922
dest_tail = spec_tail
924
# Use the existing item so 'mv' fails with AlreadyVersioned.
925
dest_tail = os.path.basename(canon_dest)
926
dest = osutils.pathjoin(dest_parent, dest_tail)
927
mutter("attempting to move %s => %s", src, dest)
928
tree.rename_one(src, dest, after=after)
930
self.outf.write("%s => %s\n" % (src, dest))
547
tree.rename_one(rel_names[0], rel_names[1], after=after)
548
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
933
551
class cmd_pull(Command):
934
__doc__ = """Turn this branch into a mirror of another branch.
552
"""Turn this branch into a mirror of another branch.
936
By default, this command only works on branches that have not diverged.
937
Branches are considered diverged if the destination branch's most recent
938
commit is one that has not been merged (directly or indirectly) into the
554
This command only works on branches that have not diverged. Branches are
555
considered diverged if the destination branch's most recent commit is one
556
that has not been merged (directly or indirectly) into the parent.
941
558
If branches have diverged, you can use 'bzr merge' to integrate the changes
942
559
from one into the other. Once one branch has merged, the other should
943
560
be able to pull it again.
945
If you want to replace your local changes and just want your branch to
946
match the remote one, use pull --overwrite. This will work even if the two
947
branches have diverged.
562
If you want to forget your local changes and just update your branch to
563
match the remote one, use pull --overwrite.
949
565
If there is no default location set, the first pull will set it. After
950
566
that, you can omit the location to use the default. To change the
951
567
default, use --remember. The value will only be saved if the remote
952
568
location can be accessed.
954
Note: The location can be specified either in the form of a branch,
955
or in the form of a path to a file containing a merge directive generated
959
_see_also = ['push', 'update', 'status-flags', 'send']
571
_see_also = ['push', 'update', 'status-flags']
960
572
takes_options = ['remember', 'overwrite', 'revision',
961
573
custom_help('verbose',
962
574
help='Show logs of pulled revisions.'),
1099
697
' directory exists, but does not already'
1100
698
' have a control directory. This flag will'
1101
699
' allow push to proceed.'),
1103
help='Create a stacked branch that references the public location '
1104
'of the parent branch.'),
1105
Option('stacked-on',
1106
help='Create a stacked branch that refers to another branch '
1107
'for the commit history. Only the work not present in the '
1108
'referenced branch is included in the branch created.',
1111
help='Refuse to push if there are uncommitted changes in'
1112
' the working tree, --no-strict disables the check.'),
1114
701
takes_args = ['location?']
1115
702
encoding_type = 'replace'
1117
704
def run(self, location=None, remember=False, overwrite=False,
1118
create_prefix=False, verbose=False, revision=None,
1119
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
705
create_prefix=False, verbose=False,
706
use_existing_dir=False,
708
# FIXME: Way too big! Put this into a function called from the
1123
710
if directory is None:
1125
# Get the source branch
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1128
# Get the tip's revision_id
1129
revision = _get_one_revision('push', revision)
1130
if revision is not None:
1131
revision_id = revision.in_history(br_from).rev_id
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1139
# Get the stacked_on branch, if any
1140
if stacked_on is not None:
1141
stacked_on = urlutils.normalize_url(stacked_on)
1143
parent_url = br_from.get_parent()
1145
parent = Branch.open(parent_url)
1146
stacked_on = parent.get_public_branch()
1148
# I considered excluding non-http url's here, thus forcing
1149
# 'public' branches only, but that only works for some
1150
# users, so it's best to just depend on the user spotting an
1151
# error by the feedback given to them. RBC 20080227.
1152
stacked_on = parent_url
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1157
# Get the destination location
712
br_from = Branch.open_containing(directory)[0]
713
stored_loc = br_from.get_push_location()
1158
714
if location is None:
1159
stored_loc = br_from.get_push_location()
1160
715
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
716
raise errors.BzrCommandError("No push location known or specified.")
1164
718
display_url = urlutils.unescape_for_display(stored_loc,
1165
719
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
720
self.outf.write("Using saved location: %s\n" % display_url)
1167
721
location = stored_loc
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
723
to_transport = transport.get_transport(location)
725
br_to = repository_to = dir_to = None
727
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
728
except errors.NotBranchError:
729
pass # Didn't find anything
731
# If we can open a branch, use its direct repository, otherwise see
732
# if there is a repository without a branch.
734
br_to = dir_to.open_branch()
735
except errors.NotBranchError:
736
# Didn't find a branch, can we find a repository?
738
repository_to = dir_to.find_repository()
739
except errors.NoRepositoryPresent:
742
# Found a branch, so we must have found a repository
743
repository_to = br_to.repository
748
# The destination doesn't exist; create it.
749
# XXX: Refactor the create_prefix/no_create_prefix code into a
750
# common helper function
752
def make_directory(transport):
756
def redirected(redirected_transport, e, redirection_notice):
757
return transport.get_transport(e.get_target_url())
760
to_transport = transport.do_catching_redirections(
761
make_directory, to_transport, redirected)
762
except errors.FileExists:
763
if not use_existing_dir:
764
raise errors.BzrCommandError("Target directory %s"
765
" already exists, but does not have a valid .bzr"
766
" directory. Supply --use-existing-dir to push"
767
" there anyway." % location)
768
except errors.NoSuchFile:
769
if not create_prefix:
770
raise errors.BzrCommandError("Parent directory of %s"
772
"\nYou may supply --create-prefix to create all"
773
" leading parent directories."
775
_create_prefix(to_transport)
776
except errors.TooManyRedirections:
777
raise errors.BzrCommandError("Too many redirections trying "
778
"to make %s." % location)
780
# Now the target directory exists, but doesn't have a .bzr
781
# directory. So we need to create it, along with any work to create
782
# all of the dependent branches, etc.
783
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
784
revision_id=br_from.last_revision())
785
br_to = dir_to.open_branch()
786
# TODO: Some more useful message about what was copied
787
note('Created new branch.')
788
# We successfully created the target, remember it
789
if br_from.get_push_location() is None or remember:
790
br_from.set_push_location(br_to.base)
791
elif repository_to is None:
792
# we have a bzrdir but no branch or repository
793
# XXX: Figure out what to do other than complain.
794
raise errors.BzrCommandError("At %s you have a valid .bzr control"
795
" directory, but not a branch or repository. This is an"
796
" unsupported configuration. Please move the target directory"
797
" out of the way and try again."
800
# We have a repository but no branch, copy the revisions, and then
802
last_revision_id = br_from.last_revision()
803
repository_to.fetch(br_from.repository,
804
revision_id=last_revision_id)
805
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
806
note('Created new branch.')
807
if br_from.get_push_location() is None or remember:
808
br_from.set_push_location(br_to.base)
809
else: # We have a valid to branch
810
# We were able to connect to the remote location, so remember it
811
# we don't need to successfully push because of possible divergence.
812
if br_from.get_push_location() is None or remember:
813
br_from.set_push_location(br_to.base)
815
old_rh = br_to.revision_history()
818
tree_to = dir_to.open_workingtree()
819
except errors.NotLocalUrl:
820
warning("This transport does not update the working "
821
"tree of: %s. See 'bzr help working-trees' for "
822
"more information." % br_to.base)
823
push_result = br_from.push(br_to, overwrite)
824
except errors.NoWorkingTree:
825
push_result = br_from.push(br_to, overwrite)
829
push_result = br_from.push(tree_to.branch, overwrite)
833
except errors.DivergedBranches:
834
raise errors.BzrCommandError('These branches have diverged.'
835
' Try using "merge" and then "push".')
836
if push_result is not None:
837
push_result.report(self.outf)
839
new_rh = br_to.revision_history()
842
from bzrlib.log import show_changed_revisions
843
show_changed_revisions(br_to, old_rh, new_rh,
846
# we probably did a clone rather than a push, so a message was
1175
851
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
852
"""Create a new copy of a branch.
1178
854
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
855
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1189
865
_see_also = ['checkout']
1190
866
takes_args = ['from_location', 'to_location?']
1191
867
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1194
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1199
help='Create a stacked branch referring to the source branch. '
1200
'The new branch will depend on the availability of the source '
1201
'branch for all operations.'),
1202
Option('standalone',
1203
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
868
help='Hard-link working tree files where possible.')]
1212
869
aliases = ['get', 'clone']
1214
871
def run(self, from_location, to_location=None, revision=None,
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1218
873
from bzrlib.tag import _merge_tags_if_possible
876
elif len(revision) > 1:
877
raise errors.BzrCommandError(
878
'bzr branch --revision takes exactly 1 revision value')
1219
880
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1221
revision = _get_one_revision('branch', revision)
1222
882
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1224
if revision is not None:
1225
revision_id = revision.as_revision_id(br_from)
1227
# FIXME - wt.last_revision, fallback to branch, fall back to
1228
# None or perhaps NULL_REVISION to mean copy nothing
1230
revision_id = br_from.last_revision()
1231
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1233
to_transport = transport.get_transport(to_location)
1235
to_transport.mkdir('.')
1236
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1243
except errors.NotBranchError:
1246
raise errors.AlreadyBranchError(to_location)
1247
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1266
# If the source branch is stacked, the new branch may
1267
# be stacked whether we asked for that explicitly or not.
1268
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
884
if len(revision) == 1 and revision[0] is not None:
885
revision_id = revision[0].in_history(br_from)[1]
887
# FIXME - wt.last_revision, fallback to branch, fall back to
888
# None or perhaps NULL_REVISION to mean copy nothing
890
revision_id = br_from.last_revision()
891
if to_location is None:
892
to_location = urlutils.derive_to_location(from_location)
895
name = os.path.basename(to_location) + '\n'
897
to_transport = transport.get_transport(to_location)
899
to_transport.mkdir('.')
900
except errors.FileExists:
901
raise errors.BzrCommandError('Target directory "%s" already'
902
' exists.' % to_location)
903
except errors.NoSuchFile:
904
raise errors.BzrCommandError('Parent of "%s" does not exist.'
907
# preserve whatever source format we have.
908
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
909
possible_transports=[to_transport],
910
accelerator_tree=accelerator_tree,
912
branch = dir.open_branch()
913
except errors.NoSuchRevision:
914
to_transport.delete_tree('.')
915
msg = "The branch %s has no revision %s." % (from_location, revision[0])
916
raise errors.BzrCommandError(msg)
918
branch.control_files.put_utf8('branch-name', name)
919
_merge_tags_if_possible(br_from, branch)
1274
920
note('Branched %d revision(s).' % branch.revno())
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1281
# Switch to the new branch
1282
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1288
925
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
926
"""Create a new checkout of an existing branch.
1291
928
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
929
the branch found in '.'. This is useful if you have removed the working tree
1293
930
or if it was never created - i.e. if you pushed the branch to its current
1294
931
location using SFTP.
1296
933
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1297
934
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1298
935
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1367
1009
def run(self, dir=u'.'):
1368
1010
tree = WorkingTree.open_containing(dir)[0]
1369
1011
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1372
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1383
renames.append(paths)
1385
for old_name, new_name in renames:
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1013
new_inv = tree.inventory
1014
old_tree = tree.basis_tree()
1015
old_tree.lock_read()
1017
old_inv = old_tree.inventory
1018
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1020
for old_name, new_name in renames:
1021
self.outf.write("%s => %s\n" % (old_name, new_name))
1389
1028
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1029
"""Update a tree to have the latest code committed to its branch.
1392
1031
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1032
conflicts. If you have any local changes, you will still
1394
1033
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1035
If you want to discard your local changes, you can just do a
1397
1036
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1400
the branch from the master.
1403
1039
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1040
takes_args = ['dir?']
1405
takes_options = ['revision']
1406
1041
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1409
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1043
def run(self, dir='.'):
1412
1044
tree = WorkingTree.open_containing(dir)[0]
1413
branch = tree.branch
1414
1045
possible_transports = []
1415
master = branch.get_master_branch(
1046
master = tree.branch.get_master_branch(
1416
1047
possible_transports=possible_transports)
1417
1048
if master is not None:
1418
1049
tree.lock_write()
1419
branch_location = master.base
1421
1051
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
self.add_cleanup(tree.unlock)
1424
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1428
existing_pending_merges = tree.get_parent_ids()[1:]
1432
# may need to fetch data into a heavyweight checkout
1433
# XXX: this may take some time, maybe we should display a
1435
old_tip = branch.update(possible_transports)
1436
if revision is not None:
1437
revision_id = revision[0].as_revision_id(branch)
1439
revision_id = branch.last_revision()
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1445
view_info = _get_view_info_for_change_reporter(tree)
1446
change_reporter = delta._ChangeReporter(
1447
unversioned_filter=tree.is_ignored,
1448
view_info=view_info)
1053
existing_pending_merges = tree.get_parent_ids()[1:]
1054
last_rev = _mod_revision.ensure_null(tree.last_revision())
1055
if last_rev == _mod_revision.ensure_null(
1056
tree.branch.last_revision()):
1057
# may be up to date, check master too.
1058
if master is None or last_rev == _mod_revision.ensure_null(
1059
master.last_revision()):
1060
revno = tree.branch.revision_id_to_revno(last_rev)
1061
note("Tree is up to date at revision %d." % (revno,))
1450
1063
conflicts = tree.update(
1452
possible_transports=possible_transports,
1453
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1457
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1461
revno = tree.branch.revision_id_to_dotted_revno(
1462
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1064
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1065
possible_transports=possible_transports)
1066
revno = tree.branch.revision_id_to_revno(
1067
_mod_revision.ensure_null(tree.last_revision()))
1068
note('Updated to revision %d.' % (revno,))
1069
if tree.get_parent_ids()[1:] != existing_pending_merges:
1070
note('Your local commits will now show as pending merges with '
1071
"'bzr status', and can be committed with 'bzr commit'.")
1475
1080
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1081
"""Show information about a working tree, branch or repository.
1478
1083
This command will show all known locations and formats associated to the
1479
tree, branch or repository.
1481
In verbose mode, statistical information is included with each report.
1482
To see extended statistic information, use a verbosity level of 2 or
1483
higher by specifying the verbose option multiple times, e.g. -vv.
1084
tree, branch or repository. Statistical information is included with
1485
1087
Branches and working trees will also report any missing revisions.
1489
Display information on the format and related locations:
1493
Display the above together with extended format information and
1494
basic statistics (like the number of files in the working tree and
1495
number of revisions in the branch and repository):
1499
Display the above together with number of committers to the branch:
1503
1089
_see_also = ['revno', 'working-trees', 'repositories']
1504
1090
takes_args = ['location?']
2103
1621
raise errors.BzrCommandError(msg)
2106
def _parse_levels(s):
2110
msg = "The levels argument must be an integer."
2111
raise errors.BzrCommandError(msg)
2114
1624
class cmd_log(Command):
2115
__doc__ = """Show historical log for a branch or subset of a branch.
2117
log is bzr's default tool for exploring the history of a branch.
2118
The branch to use is taken from the first parameter. If no parameters
2119
are given, the branch containing the working directory is logged.
2120
Here are some simple examples::
2122
bzr log log the current branch
2123
bzr log foo.py log a file in its branch
2124
bzr log http://server/branch log a branch on a server
2126
The filtering, ordering and information shown for each revision can
2127
be controlled as explained below. By default, all revisions are
2128
shown sorted (topologically) so that newer revisions appear before
2129
older ones and descendants always appear before ancestors. If displayed,
2130
merged revisions are shown indented under the revision in which they
2135
The log format controls how information about each revision is
2136
displayed. The standard log formats are called ``long``, ``short``
2137
and ``line``. The default is long. See ``bzr help log-formats``
2138
for more details on log formats.
2140
The following options can be used to control what information is
2143
-l N display a maximum of N revisions
2144
-n N display N levels of revisions (0 for all, 1 for collapsed)
2145
-v display a status summary (delta) for each revision
2146
-p display a diff (patch) for each revision
2147
--show-ids display revision-ids (and file-ids), not just revnos
2149
Note that the default number of levels to display is a function of the
2150
log format. If the -n option is not used, the standard log formats show
2151
just the top level (mainline).
2153
Status summaries are shown using status flags like A, M, etc. To see
2154
the changes explained using words like ``added`` and ``modified``
2155
instead, use the -vv option.
2159
To display revisions from oldest to newest, use the --forward option.
2160
In most cases, using this option will have little impact on the total
2161
time taken to produce a log, though --forward does not incrementally
2162
display revisions like --reverse does when it can.
2164
:Revision filtering:
2166
The -r option can be used to specify what revision or range of revisions
2167
to filter against. The various forms are shown below::
2169
-rX display revision X
2170
-rX.. display revision X and later
2171
-r..Y display up to and including revision Y
2172
-rX..Y display from X to Y inclusive
2174
See ``bzr help revisionspec`` for details on how to specify X and Y.
2175
Some common examples are given below::
2177
-r-1 show just the tip
2178
-r-10.. show the last 10 mainline revisions
2179
-rsubmit:.. show what's new on this branch
2180
-rancestor:path.. show changes since the common ancestor of this
2181
branch and the one at location path
2182
-rdate:yesterday.. show changes since yesterday
2184
When logging a range of revisions using -rX..Y, log starts at
2185
revision Y and searches back in history through the primary
2186
("left-hand") parents until it finds X. When logging just the
2187
top level (using -n1), an error is reported if X is not found
2188
along the way. If multi-level logging is used (-n0), X may be
2189
a nested merge revision and the log will be truncated accordingly.
2193
If parameters are given and the first one is not a branch, the log
2194
will be filtered to show only those revisions that changed the
2195
nominated files or directories.
2197
Filenames are interpreted within their historical context. To log a
2198
deleted file, specify a revision range so that the file existed at
2199
the end or start of the range.
2201
Historical context is also important when interpreting pathnames of
2202
renamed files/directories. Consider the following example:
2204
* revision 1: add tutorial.txt
2205
* revision 2: modify tutorial.txt
2206
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
2210
* ``bzr log guide.txt`` will log the file added in revision 1
2212
* ``bzr log tutorial.txt`` will log the new file added in revision 3
2214
* ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2215
the original file in revision 2.
2217
* ``bzr log -r2 -p guide.txt`` will display an error message as there
2218
was no file called guide.txt in revision 2.
2220
Renames are always followed by log. By design, there is no need to
2221
explicitly ask for this (and no way to stop logging a file back
2222
until it was last renamed).
2226
The --message option can be used for finding revisions that match a
2227
regular expression in a commit message.
2231
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2237
You may find it useful to add the aliases below to ``bazaar.conf``::
2241
top = log -l10 --line
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2245
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2248
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2252
very slow. A fix for this issue is currently under development.
2253
With or without that fix, it is recommended that a revision range
2254
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2257
used to find revisions matching user names, commit messages, etc.
2258
Among other features, this plugin can find all revisions containing
2259
a list of words but not others.
2261
When exploring non-mainline history on large projects with deep
2262
history, the performance of log can be greatly improved by installing
2263
the historycache plugin. This plugin buffers historical information
2264
trading disk space for faster speed.
1625
"""Show log of a branch, file, or directory.
1627
By default show the log of the branch containing the working directory.
1629
To request a range of logs, you can use the command -r begin..end
1630
-r revision requests a specific revision, -r ..end or -r begin.. are
1634
Log the current branch::
1642
Log the last 10 revisions of a branch::
1644
bzr log -r -10.. http://server/branch
2266
takes_args = ['file*']
2267
_see_also = ['log-formats', 'revisionspec']
1647
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1649
takes_args = ['location?']
2268
1650
takes_options = [
2269
1651
Option('forward',
2270
1652
help='Show from oldest to newest.'),
1655
help='Display timezone as local, original, or utc.'),
2272
1656
custom_help('verbose',
2273
1657
help='Show files changed in each revision.'),
2277
type=bzrlib.option._parse_revision_str,
2279
help='Show just the specified revision.'
2280
' See also "help revisionspec".'),
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2286
type=_parse_levels),
2287
1661
Option('message',
2288
1662
short_name='m',
2289
1663
help='Show revisions whose message matches this '
2378
1711
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
1712
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
# Decide on the type of delta & diff filtering to use
2385
# TODO: add an --all-files option to make this configurable & consistent
2393
diff_type = 'partial'
2397
# Build the log formatter
2398
if log_format is None:
2399
log_format = log.log_formatter_registry.get_default(b)
2400
# Make a non-encoding output to include the diffs - bug 328007
2401
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2402
lf = log_format(show_ids=show_ids, to_file=self.outf,
2403
to_exact_file=unencoded_output,
2404
show_timezone=timezone,
2405
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2409
# Choose the algorithm for doing the logging. It's annoying
2410
# having multiple code paths like this but necessary until
2411
# the underlying repository format is faster at generating
2412
# deltas or can provide everything we need from the indices.
2413
# The default algorithm - match-using-deltas - works for
2414
# multiple files and directories and is faster for small
2415
# amounts of history (200 revisions say). However, it's too
2416
# slow for logging a single file in a repository with deep
2417
# history, i.e. > 10K revisions. In the spirit of "do no
2418
# evil when adding features", we continue to use the
2419
# original algorithm - per-file-graph - for the "single
2420
# file that isn't a directory without showing a delta" case.
2421
partial_history = revision and b.repository._format.supports_chks
2422
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2423
or delta_type or partial_history)
2425
# Build the LogRequest and execute it
2426
if len(file_ids) == 0:
2428
rqst = make_log_request_dict(
2429
direction=direction, specific_fileids=file_ids,
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2431
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2435
Logger(b, rqst).show(lf)
2438
def _get_revision_range(revisionspec_list, branch, command_name):
2439
"""Take the input of a revision option and turn it into a revision range.
2441
It returns RevisionInfo objects which can be used to obtain the rev_id's
2442
of the desired revisions. It does some user input validations.
2444
if revisionspec_list is None:
2447
elif len(revisionspec_list) == 1:
2448
rev1 = rev2 = revisionspec_list[0].in_history(branch)
2449
elif len(revisionspec_list) == 2:
2450
start_spec = revisionspec_list[0]
2451
end_spec = revisionspec_list[1]
2452
if end_spec.get_branch() != start_spec.get_branch():
2453
# b is taken from revision[0].get_branch(), and
2454
# show_log will use its revision_history. Having
2455
# different branches will lead to weird behaviors.
2456
raise errors.BzrCommandError(
2457
"bzr %s doesn't accept two revisions in different"
2458
" branches." % command_name)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2463
rev1 = start_spec.in_history(branch)
2464
# Avoid loading all of history when we know a missing
2465
# end of range means the last revision ...
2466
if end_spec.spec is None:
2467
last_revno, last_revision_id = branch.last_revision_info()
2468
rev2 = RevisionInfo(branch, last_revno, last_revision_id)
2470
rev2 = end_spec.in_history(branch)
2472
raise errors.BzrCommandError(
2473
'bzr %s --revision takes one or two values.' % command_name)
2477
def _revision_range_to_revid_range(revision_range):
2480
if revision_range[0] is not None:
2481
rev_id1 = revision_range[0].rev_id
2482
if revision_range[1] is not None:
2483
rev_id2 = revision_range[1].rev_id
2484
return rev_id1, rev_id2
1716
if revision is None:
1719
elif len(revision) == 1:
1720
rev1 = rev2 = revision[0].in_history(b)
1721
elif len(revision) == 2:
1722
if revision[1].get_branch() != revision[0].get_branch():
1723
# b is taken from revision[0].get_branch(), and
1724
# show_log will use its revision_history. Having
1725
# different branches will lead to weird behaviors.
1726
raise errors.BzrCommandError(
1727
"Log doesn't accept two revisions in different"
1729
rev1 = revision[0].in_history(b)
1730
rev2 = revision[1].in_history(b)
1732
raise errors.BzrCommandError(
1733
'bzr log --revision takes one or two values.')
1735
if log_format is None:
1736
log_format = log.log_formatter_registry.get_default(b)
1738
lf = log_format(show_ids=show_ids, to_file=self.outf,
1739
show_timezone=timezone)
1745
direction=direction,
1746
start_revision=rev1,
2486
1754
def get_log_format(long=False, short=False, line=False, default='long'):
2487
1755
log_format = default
2829
2074
================= =========================
2831
takes_args = ['dest', 'branch_or_subdir?']
2076
takes_args = ['dest', 'branch?']
2832
2077
takes_options = [
2833
2078
Option('format',
2834
2079
help="Type of file to export to.",
2837
Option('filters', help='Apply content filters to export the '
2838
'convenient form.'),
2841
2084
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2086
def run(self, dest, branch=None, revision=None, format=None, root=None):
2848
2087
from bzrlib.export import export
2850
if branch_or_subdir is None:
2851
2090
tree = WorkingTree.open_containing(u'.')[0]
2852
2091
b = tree.branch
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2093
b = Branch.open(branch)
2095
if revision is None:
2096
# should be tree.last_revision FIXME
2097
rev_id = b.last_revision()
2099
if len(revision) != 1:
2100
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2101
rev_id = revision[0].in_history(b).rev_id
2102
t = b.repository.revision_tree(rev_id)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2104
export(t, dest, format, root)
2862
2105
except errors.NoSuchExportFormat, e:
2863
2106
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2866
2109
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2110
"""Write the contents of a file as of a given revision to standard output.
2869
2112
If no revision is nominated, the last revision is used.
2871
2114
Note: Take care to redirect standard output when using this command on a
2875
2118
_see_also = ['ls']
2876
2119
takes_options = [
2877
2120
Option('name-from-revision', help='The path name in the old tree.'),
2878
Option('filters', help='Apply content filters to display the '
2879
'convenience form.'),
2882
2123
takes_args = ['filename']
2883
2124
encoding_type = 'exact'
2885
2126
@display_command
2886
def run(self, filename, revision=None, name_from_revision=False,
2127
def run(self, filename, revision=None, name_from_revision=False):
2888
2128
if revision is not None and len(revision) != 1:
2889
2129
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2130
" one revision specifier")
2891
2131
tree, branch, relpath = \
2892
2132
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
2133
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2895
return self._run(tree, branch, relpath, filename, revision,
2896
name_from_revision, filters)
2135
return self._run(tree, branch, relpath, filename, revision,
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2140
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2900
2141
if tree is None:
2901
2142
tree = b.basis_tree()
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2143
if revision is None:
2144
revision_id = b.last_revision()
2146
revision_id = revision[0].in_history(b).rev_id
2148
cur_file_id = tree.path2id(relpath)
2149
rev_tree = b.repository.revision_tree(revision_id)
2906
2150
old_file_id = rev_tree.path2id(relpath)
2908
2152
if name_from_revision:
2909
# Try in revision if requested
2910
2153
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
2913
filename, rev_tree.get_revision_id()))
2154
raise errors.BzrCommandError("%r is not present in revision %s"
2155
% (filename, revision_id))
2915
content = rev_tree.get_file_text(old_file_id)
2917
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
2935
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
2949
self.outf.write(content)
2157
rev_tree.print_file(old_file_id)
2158
elif cur_file_id is not None:
2159
rev_tree.print_file(cur_file_id)
2160
elif old_file_id is not None:
2161
rev_tree.print_file(old_file_id)
2163
raise errors.BzrCommandError("%r is not present in revision %s" %
2164
(filename, revision_id))
2952
2167
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2168
"""Show the offset in seconds from GMT to local time."""
2955
2170
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2172
print osutils.local_time_offset()
2961
2176
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2964
An explanatory message needs to be given for each commit. This is
2965
often done by using the --message option (getting the message from the
2966
command line) or by using the --file option (getting the message from
2967
a file). If neither of these options is given, an editor is opened for
2968
the user to enter the message. To see the changed files in the
2969
boilerplate text loaded into the editor, use the --show-diff option.
2971
By default, the entire tree is committed and the person doing the
2972
commit is assumed to be the author. These defaults can be overridden
2977
If selected files are specified, only changes to those files are
2978
committed. If a directory is specified then the directory and
2979
everything within it is committed.
2981
When excludes are given, they take precedence over selected files.
2982
For example, to commit only changes within foo, but not changes
2985
bzr commit foo -x foo/bar
2987
A selective commit after a merge is not yet supported.
2991
If the author of the change is not the same person as the committer,
2992
you can specify the author's name using the --author option. The
2993
name should be in the same format as a committer-id, e.g.
2994
"John Doe <jdoe@example.com>". If there is more than one author of
2995
the change you can specify the option multiple times, once for each
3000
A common mistake is to forget to add a new file or directory before
3001
running the commit command. The --strict option checks for unknown
3002
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3008
If you accidentially commit the wrong changes or make a spelling
3009
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3012
Hooks can also be configured to run after a commit. This allows you
3013
to trigger updates to external systems like bug trackers. The --fixes
3014
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2177
"""Commit changes into a new revision.
2179
If no arguments are given, the entire tree is committed.
2181
If selected files are specified, only changes to those files are
2182
committed. If a directory is specified then the directory and everything
2183
within it is committed.
2185
If author of the change is not the same person as the committer, you can
2186
specify the author's name using the --author option. The name should be
2187
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2189
A selected-file commit may fail in some cases where the committed
2190
tree would be invalid. Consider::
2195
bzr commit foo -m "committing foo"
2196
bzr mv foo/bar foo/baz
2199
bzr commit foo/bar -m "committing bar but not baz"
2201
In the example above, the last commit will fail by design. This gives
2202
the user the opportunity to decide whether they want to commit the
2203
rename at the same time, separately first, or not at all. (As a general
2204
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2206
Note: A selected-file commit after a merge is not yet supported.
3034
2208
# TODO: Run hooks on tree to-be-committed, and after commit.
3217
2346
raise errors.BzrCommandError("Commit refused because there are"
3218
2347
" unknown files in the working tree.")
3219
2348
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
2349
raise errors.BzrCommandError(str(e) + "\n"
2350
'To commit to master branch, run update and then commit.\n'
2351
'You can also pass --local to commit to continue working '
3227
2355
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3230
This command checks various invariants about branch and repository storage
3231
to detect data corruption or bzr bugs.
3233
The working tree and branch checks will only give output if a problem is
3234
detected. The output fields of the repository check are:
3237
This is just the number of revisions checked. It doesn't
3241
This is just the number of versionedfiles checked. It
3242
doesn't indicate a problem.
3244
unreferenced ancestors
3245
Texts that are ancestors of other texts, but
3246
are not properly referenced by the revision ancestry. This is a
3247
subtle problem that Bazaar can work around.
3250
This is the total number of unique file contents
3251
seen in the checked revisions. It does not indicate a problem.
3254
This is the total number of repeated texts seen
3255
in the checked revisions. Texts can be repeated when their file
3256
entries are modified, but the file contents are not. It does not
3259
If no restrictions are specified, all Bazaar data that is found at the given
3260
location will be checked.
3264
Check the tree and branch at 'foo'::
3266
bzr check --tree --branch foo
3268
Check only the repository at 'bar'::
3270
bzr check --repo bar
3272
Check everything at 'baz'::
2356
"""Validate consistency of branch history.
2358
This command checks various invariants about the branch storage to
2359
detect data corruption or bzr bugs.
2363
revisions: This is just the number of revisions checked. It doesn't
2365
versionedfiles: This is just the number of versionedfiles checked. It
2366
doesn't indicate a problem.
2367
unreferenced ancestors: Texts that are ancestors of other texts, but
2368
are not properly referenced by the revision ancestry. This is a
2369
subtle problem that Bazaar can work around.
2370
unique file texts: This is the total number of unique file contents
2371
seen in the checked revisions. It does not indicate a problem.
2372
repeated file texts: This is the total number of repeated texts seen
2373
in the checked revisions. Texts can be repeated when their file
2374
entries are modified, but the file contents are not. It does not
3277
2378
_see_also = ['reconcile']
3278
takes_args = ['path?']
3279
takes_options = ['verbose',
3280
Option('branch', help="Check the branch related to the"
3281
" current directory."),
3282
Option('repo', help="Check the repository related to the"
3283
" current directory."),
3284
Option('tree', help="Check the working tree related to"
3285
" the current directory.")]
2379
takes_args = ['branch?']
2380
takes_options = ['verbose']
3287
def run(self, path=None, verbose=False, branch=False, repo=False,
3289
from bzrlib.check import check_dwim
3292
if not branch and not repo and not tree:
3293
branch = repo = tree = True
3294
check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
2382
def run(self, branch=None, verbose=False):
2383
from bzrlib.check import check
2385
branch_obj = Branch.open_containing('.')[0]
2387
branch_obj = Branch.open(branch)
2388
check(branch_obj, verbose)
2389
# bit hacky, check the tree parent is accurate
2392
tree = WorkingTree.open_containing('.')[0]
2394
tree = WorkingTree.open(branch)
2395
except (errors.NoWorkingTree, errors.NotLocalUrl):
2398
# This is a primitive 'check' for tree state. Currently this is not
2399
# integrated into the main check logic as yet.
2402
tree_basis = tree.basis_tree()
2403
tree_basis.lock_read()
2405
repo_basis = tree.branch.repository.revision_tree(
2406
tree.last_revision())
2407
if len(list(repo_basis._iter_changes(tree_basis))):
2408
raise errors.BzrCheckError(
2409
"Mismatched basis inventory content.")
3297
2417
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
2418
"""Upgrade branch storage to current format.
3300
2420
The check command or bzr developers may sometimes advise you to run
3301
2421
this command. When the default format has changed you may also be warned
3564
2603
short_name='x',
3565
2604
help='Exclude tests that match this regular'
3566
2605
' expression.'),
3568
help='Output test progress via subunit.'),
3569
2606
Option('strict', help='Fail on missing dependencies or '
3570
2607
'known failures.'),
3571
2608
Option('load-list', type=str, argname='TESTLISTFILE',
3572
2609
help='Load a test id list from a text file.'),
3573
ListOption('debugflag', type=str, short_name='E',
3574
help='Turn on a selftest debug flag.'),
3575
ListOption('starting-with', type=str, argname='TESTID',
3576
param_name='starting_with', short_name='s',
3578
'Load only the tests starting with TESTID.'),
3580
2611
encoding_type = 'replace'
3583
Command.__init__(self)
3584
self.additional_selftest_args = {}
3586
2613
def run(self, testspecs_list=None, verbose=False, one=False,
3587
2614
transport=None, benchmark=None,
3588
2615
lsprof_timed=None, cache_dir=None,
3589
2616
first=False, list_only=False,
3590
2617
randomize=None, exclude=None, strict=False,
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
2620
from bzrlib.tests import selftest
3594
2621
import bzrlib.benchmarks as benchmarks
3595
2622
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
2624
if cache_dir is not None:
3601
2625
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2627
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2628
print ' %s (%s python%s)' % (
2630
bzrlib.version_string,
2631
'.'.join(map(str, sys.version_info)),
3602
2634
if testspecs_list is not None:
3603
2635
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
self.additional_selftest_args.setdefault(
3620
'suite_decorators', []).append(parallel)
3622
2639
test_suite_factory = benchmarks.test_suite
3623
2640
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
2641
verbose = not is_quiet()
3625
2642
# TODO: should possibly lock the history file...
3626
2643
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
2645
test_suite_factory = None
3630
2646
benchfile = None
3631
selftest_kwargs = {"verbose": verbose,
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
3648
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
2648
result = selftest(verbose=verbose,
2650
stop_on_failure=one,
2651
transport=transport,
2652
test_suite_factory=test_suite_factory,
2653
lsprof_timed=lsprof_timed,
2654
bench_history=benchfile,
2655
matching_tests_first=first,
2656
list_only=list_only,
2657
random_seed=randomize,
2658
exclude_pattern=exclude,
2660
load_list=load_list,
2663
if benchfile is not None:
2666
note('tests passed')
2668
note('tests failed')
3650
2669
return int(not result)
3653
2672
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
2673
"""Show version of bzr."""
3656
2675
encoding_type = 'replace'
3658
Option("short", help="Print just the version number."),
3661
2677
@display_command
3662
def run(self, short=False):
3663
2679
from bzrlib.version import show_version
3665
self.outf.write(bzrlib.version_string + '\n')
3667
show_version(to_file=self.outf)
2680
show_version(to_file=self.outf)
3670
2683
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
2684
"""Statement of optimism."""
3675
2688
@display_command
3677
self.outf.write("It sure does!\n")
2690
print "It sure does!"
3680
2693
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
2694
"""Find and print a base revision for merging two branches."""
3682
2695
# TODO: Options to specify revisions on either side, as if
3683
2696
# merging only part of the history.
3684
2697
takes_args = ['branch', 'other']
3687
2700
@display_command
3688
2701
def run(self, branch, other):
3689
2702
from bzrlib.revision import ensure_null
3691
2704
branch1 = Branch.open_containing(branch)[0]
3692
2705
branch2 = Branch.open_containing(other)[0]
3693
2706
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3697
last1 = ensure_null(branch1.last_revision())
3698
last2 = ensure_null(branch2.last_revision())
3700
graph = branch1.repository.get_graph(branch2.repository)
3701
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
2710
last1 = ensure_null(branch1.last_revision())
2711
last2 = ensure_null(branch2.last_revision())
2713
graph = branch1.repository.get_graph(branch2.repository)
2714
base_rev_id = graph.find_unique_lca(last1, last2)
2716
print 'merge base is revision %s' % base_rev_id
3706
2723
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3709
The source of the merge can be specified either in the form of a branch,
3710
or in the form of a path to a file containing a merge directive generated
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
2724
"""Perform a three-way merge.
2726
The branch is the branch you will merge from. By default, it will merge
2727
the latest revision. If you specify a revision, that revision will be
2728
merged. If you specify two revisions, the first will be used as a BASE,
2729
and the second one as OTHER. Revision numbers are always relative to the
3721
2732
By default, bzr will try to merge in all new work from the other
3722
2733
branch, automatically determining an appropriate base. If this
3723
2734
fails, you may need to give an explicit base.
3725
2736
Merge will do its best to combine the changes in two branches, but there
3726
2737
are some kinds of problems only a human can fix. When it encounters those,
3727
2738
it will mark a conflict. A conflict means that you need to fix something,
3821
2813
allow_pending = True
3822
2814
verified = 'inapplicable'
3823
2815
tree = WorkingTree.open_containing(directory)[0]
2816
change_reporter = delta._ChangeReporter(
2817
unversioned_filter=tree.is_ignored)
3826
basis_tree = tree.revision_tree(tree.last_revision())
3827
except errors.NoSuchRevision:
3828
basis_tree = tree.basis_tree()
3830
# die as quickly as possible if there are uncommitted changes
3832
if tree.has_changes():
3833
raise errors.UncommittedChanges(tree)
3835
view_info = _get_view_info_for_change_reporter(tree)
3836
change_reporter = delta._ChangeReporter(
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
pb = ui.ui_factory.nested_progress_bar()
3839
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3842
if location is not None:
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
3846
except errors.NotABundle:
2820
pb = ui.ui_factory.nested_progress_bar()
2821
cleanups.append(pb.finished)
2823
cleanups.append(tree.unlock)
2824
if location is not None:
2825
mergeable, other_transport = _get_mergeable_helper(location)
2828
raise errors.BzrCommandError('Cannot use --uncommitted'
2829
' with bundles or merge directives.')
2831
if revision is not None:
2832
raise errors.BzrCommandError(
2833
'Cannot use -r with merge directives or bundles')
2834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2836
possible_transports.append(other_transport)
2838
if merger is None and uncommitted:
2839
if revision is not None and len(revision) > 0:
2840
raise errors.BzrCommandError('Cannot use --uncommitted and'
2841
' --revision at the same time.')
2842
location = self._select_branch_location(tree, location)[0]
2843
other_tree, other_path = WorkingTree.open_containing(location)
2844
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2846
allow_pending = False
2847
if other_path != '':
2848
merger.interesting_files = [other_path]
2851
merger, allow_pending = self._get_merger_from_branch(tree,
2852
location, revision, remember, possible_transports, pb)
2854
merger.merge_type = merge_type
2855
merger.reprocess = reprocess
2856
merger.show_base = show_base
2857
self.sanity_check_merger(merger)
2858
if (merger.base_rev_id == merger.other_rev_id and
2859
merger.other_rev_id != None):
2860
note('Nothing to do.')
2863
if merger.interesting_files is not None:
2864
raise errors.BzrCommandError('Cannot pull individual files')
2865
if (merger.base_rev_id == tree.last_revision()):
2866
result = tree.pull(merger.other_branch, False,
2867
merger.other_rev_id)
2868
result.report(self.outf)
2870
merger.check_basis(not force)
2872
return self._do_preview(merger)
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
3853
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
if merger is None and uncommitted:
3860
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
allow_pending = False
3867
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3870
merger.merge_type = merge_type
3871
merger.reprocess = reprocess
3872
merger.show_base = show_base
3873
self.sanity_check_merger(merger)
3874
if (merger.base_rev_id == merger.other_rev_id and
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
3879
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
3881
if (merger.base_rev_id == tree.last_revision()):
3882
result = tree.pull(merger.other_branch, False,
3883
merger.other_rev_id)
3884
result.report(self.outf)
3886
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
3888
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
3891
return self._do_preview(merger)
3893
return self._do_interactive(merger)
3895
return self._do_merge(merger, change_reporter, allow_pending,
3898
def _get_preview(self, merger):
2874
return self._do_merge(merger, change_reporter, allow_pending,
2877
for cleanup in reversed(cleanups):
2880
def _do_preview(self, merger):
2881
from bzrlib.diff import show_diff_trees
3899
2882
tree_merger = merger.make_merger()
3900
2883
tt = tree_merger.make_preview_transform()
3901
self.add_cleanup(tt.finalize)
3902
result_tree = tt.get_preview_tree()
3905
def _do_preview(self, merger):
3906
from bzrlib.diff import show_diff_trees
3907
result_tree = self._get_preview(merger)
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
2885
result_tree = tt.get_preview_tree()
2886
show_diff_trees(merger.this_tree, result_tree, self.outf,
2887
old_label='', new_label='')
3911
2891
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
2892
merger.change_reporter = change_reporter
4097
3043
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3044
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3045
if merge_type is None:
4101
3046
merge_type = _mod_merge.Merge3Merger
4102
3047
tree, file_list = tree_files(file_list)
4103
3048
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4105
parents = tree.get_parent_ids()
4106
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4110
repository = tree.branch.repository
4111
interesting_ids = None
4113
conflicts = tree.conflicts()
4114
if file_list is not None:
4115
interesting_ids = set()
4116
for filename in file_list:
4117
file_id = tree.path2id(filename)
4119
raise errors.NotVersionedError(filename)
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4128
# Remerge only supports resolving contents conflicts
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4130
restore_files = [c.path for c in conflicts
4131
if c.typestring in allowed_conflicts]
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4133
tree.set_conflicts(ConflictList(new_conflicts))
4134
if file_list is not None:
4135
restore_files = file_list
4136
for filename in restore_files:
3050
parents = tree.get_parent_ids()
3051
if len(parents) != 2:
3052
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3053
" merges. Not cherrypicking or"
3055
repository = tree.branch.repository
3056
interesting_ids = None
3058
conflicts = tree.conflicts()
3059
if file_list is not None:
3060
interesting_ids = set()
3061
for filename in file_list:
3062
file_id = tree.path2id(filename)
3064
raise errors.NotVersionedError(filename)
3065
interesting_ids.add(file_id)
3066
if tree.kind(file_id) != "directory":
3069
for name, ie in tree.inventory.iter_entries(file_id):
3070
interesting_ids.add(ie.file_id)
3071
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3073
# Remerge only supports resolving contents conflicts
3074
allowed_conflicts = ('text conflict', 'contents conflict')
3075
restore_files = [c.path for c in conflicts
3076
if c.typestring in allowed_conflicts]
3077
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3078
tree.set_conflicts(ConflictList(new_conflicts))
3079
if file_list is not None:
3080
restore_files = file_list
3081
for filename in restore_files:
3083
restore(tree.abspath(filename))
3084
except errors.NotConflicted:
3086
# Disable pending merges, because the file texts we are remerging
3087
# have not had those merges performed. If we use the wrong parents
3088
# list, we imply that the working tree text has seen and rejected
3089
# all the changes from the other tree, when in fact those changes
3090
# have not yet been seen.
3091
pb = ui.ui_factory.nested_progress_bar()
3092
tree.set_parent_ids(parents[:1])
4138
restore(tree.abspath(filename))
4139
except errors.NotConflicted:
4141
# Disable pending merges, because the file texts we are remerging
4142
# have not had those merges performed. If we use the wrong parents
4143
# list, we imply that the working tree text has seen and rejected
4144
# all the changes from the other tree, when in fact those changes
4145
# have not yet been seen.
4146
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4149
merger.interesting_ids = interesting_ids
4150
merger.merge_type = merge_type
4151
merger.show_base = show_base
4152
merger.reprocess = reprocess
4153
conflicts = merger.do_merge()
3094
merger = _mod_merge.Merger.from_revision_ids(pb,
3096
merger.interesting_ids = interesting_ids
3097
merger.merge_type = merge_type
3098
merger.show_base = show_base
3099
merger.reprocess = reprocess
3100
conflicts = merger.do_merge()
3102
tree.set_parent_ids(parents)
4155
tree.set_parent_ids(parents)
4156
3106
if conflicts > 0:
4371
3277
" or specified.")
4372
3278
display_url = urlutils.unescape_for_display(parent,
4373
3279
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
3280
self.outf.write("Using last location: " + display_url + "\n")
4377
3282
remote_branch = Branch.open(other_branch)
4378
3283
if remote_branch.base == local_branch.base:
4379
3284
remote_branch = local_branch
3285
local_branch.lock_read()
4381
3287
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4384
local_revid_range = _revision_range_to_revid_range(
4385
_get_revision_range(my_revision, local_branch,
4388
remote_revid_range = _revision_range_to_revid_range(
4389
_get_revision_range(revision,
4390
remote_branch, self.name()))
4392
local_extra, remote_extra = find_unmerged(
4393
local_branch, remote_branch, restrict,
4394
backward=not reverse,
4395
include_merges=include_merges,
4396
local_revid_range=local_revid_range,
4397
remote_revid_range=remote_revid_range)
4399
if log_format is None:
4400
registry = log.log_formatter_registry
4401
log_format = registry.get_default(local_branch)
4402
lf = log_format(to_file=self.outf,
4404
show_timezone='original')
4407
if local_extra and not theirs_only:
4408
message("You have %d extra revision(s):\n" %
4410
for revision in iter_log_revisions(local_extra,
4411
local_branch.repository,
4413
lf.log_revision(revision)
4414
printed_local = True
4417
printed_local = False
4419
if remote_extra and not mine_only:
4420
if printed_local is True:
4422
message("You are missing %d revision(s):\n" %
4424
for revision in iter_log_revisions(remote_extra,
4425
remote_branch.repository,
4427
lf.log_revision(revision)
4430
if mine_only and not local_extra:
4431
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4433
elif theirs_only and not remote_extra:
4434
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4436
elif not (mine_only or theirs_only or local_extra or
4438
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
3289
local_extra, remote_extra = find_unmerged(local_branch,
3291
if log_format is None:
3292
registry = log.log_formatter_registry
3293
log_format = registry.get_default(local_branch)
3294
lf = log_format(to_file=self.outf,
3296
show_timezone='original')
3297
if reverse is False:
3298
local_extra.reverse()
3299
remote_extra.reverse()
3300
if local_extra and not theirs_only:
3301
self.outf.write("You have %d extra revision(s):\n" %
3303
for revision in iter_log_revisions(local_extra,
3304
local_branch.repository,
3306
lf.log_revision(revision)
3307
printed_local = True
3309
printed_local = False
3310
if remote_extra and not mine_only:
3311
if printed_local is True:
3312
self.outf.write("\n\n\n")
3313
self.outf.write("You are missing %d revision(s):\n" %
3315
for revision in iter_log_revisions(remote_extra,
3316
remote_branch.repository,
3318
lf.log_revision(revision)
3319
if not remote_extra and not local_extra:
3321
self.outf.write("Branches are up to date.\n")
3325
remote_branch.unlock()
3327
local_branch.unlock()
4442
3328
if not status_code and parent is None and other_branch is not None:
4443
3329
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4445
# handle race conditions - a parent might be set while we run.
4446
if local_branch.get_parent() is None:
4447
local_branch.set_parent(remote_branch.base)
3331
# handle race conditions - a parent might be set while we run.
3332
if local_branch.get_parent() is None:
3333
local_branch.set_parent(remote_branch.base)
3335
local_branch.unlock()
4448
3336
return status_code
4451
3339
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
3340
"""Compress the data within a repository."""
4470
3342
_see_also = ['repositories']
4471
3343
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
3345
def run(self, branch_or_repo='.'):
4477
3346
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
3348
branch = dir.open_branch()
4480
3349
repository = branch.repository
4481
3350
except errors.NotBranchError:
4482
3351
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
3355
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
3356
"""List the installed plugins.
4489
3358
This command displays the list of installed plugins including
4490
3359
version of plugin and a short description of each.
5209
4050
'rather than the one containing the working directory.',
5210
4051
short_name='f',
5212
Option('output', short_name='o',
5213
help='Write merge directive to this file or directory; '
5214
'use - for stdout.',
4053
Option('output', short_name='o', help='Write directive to this file.',
5217
help='Refuse to send if there are uncommitted changes in'
5218
' the working tree, --no-strict disables the check.'),
5219
4055
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5224
RegistryOption('format',
5225
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
4059
RegistryOption.from_kwargs('format',
4060
'Use the specified output format.',
4061
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4062
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5229
4065
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
4066
no_patch=False, revision=None, remember=False, output=None,
5231
format=None, mail_to=None, message=None, body=None,
5232
strict=None, **kwargs):
5233
from bzrlib.send import send
5234
return send(submit_branch, revision, public_branch, remember,
5235
format, no_bundle, no_patch, output,
5236
kwargs.get('from', '.'), mail_to, message, body,
4067
format='4', mail_to=None, message=None, **kwargs):
4068
return self._run(submit_branch, revision, public_branch, remember,
4069
format, no_bundle, no_patch, output,
4070
kwargs.get('from', '.'), mail_to, message)
4072
def _run(self, submit_branch, revision, public_branch, remember, format,
4073
no_bundle, no_patch, output, from_, mail_to, message):
4074
from bzrlib.revision import NULL_REVISION
4075
branch = Branch.open_containing(from_)[0]
4077
outfile = StringIO()
4081
outfile = open(output, 'wb')
4082
# we may need to write data into branch's repository to calculate
4087
config = branch.get_config()
4089
mail_to = config.get_user_option('submit_to')
4090
mail_client = config.get_mail_client()
4091
if remember and submit_branch is None:
4092
raise errors.BzrCommandError(
4093
'--remember requires a branch to be specified.')
4094
stored_submit_branch = branch.get_submit_branch()
4095
remembered_submit_branch = False
4096
if submit_branch is None:
4097
submit_branch = stored_submit_branch
4098
remembered_submit_branch = True
4100
if stored_submit_branch is None or remember:
4101
branch.set_submit_branch(submit_branch)
4102
if submit_branch is None:
4103
submit_branch = branch.get_parent()
4104
remembered_submit_branch = True
4105
if submit_branch is None:
4106
raise errors.BzrCommandError('No submit branch known or'
4108
if remembered_submit_branch:
4109
note('Using saved location: %s', submit_branch)
4111
stored_public_branch = branch.get_public_branch()
4112
if public_branch is None:
4113
public_branch = stored_public_branch
4114
elif stored_public_branch is None or remember:
4115
branch.set_public_branch(public_branch)
4116
if no_bundle and public_branch is None:
4117
raise errors.BzrCommandError('No public branch specified or'
4119
base_revision_id = None
4121
if revision is not None:
4122
if len(revision) > 2:
4123
raise errors.BzrCommandError('bzr send takes '
4124
'at most two one revision identifiers')
4125
revision_id = revision[-1].in_history(branch).rev_id
4126
if len(revision) == 2:
4127
base_revision_id = revision[0].in_history(branch).rev_id
4128
if revision_id is None:
4129
revision_id = branch.last_revision()
4130
if revision_id == NULL_REVISION:
4131
raise errors.BzrCommandError('No revisions to submit.')
4133
directive = merge_directive.MergeDirective2.from_objects(
4134
branch.repository, revision_id, time.time(),
4135
osutils.local_time_offset(), submit_branch,
4136
public_branch=public_branch, include_patch=not no_patch,
4137
include_bundle=not no_bundle, message=message,
4138
base_revision_id=base_revision_id)
4139
elif format == '0.9':
4142
patch_type = 'bundle'
4144
raise errors.BzrCommandError('Format 0.9 does not'
4145
' permit bundle with no patch')
4151
directive = merge_directive.MergeDirective.from_objects(
4152
branch.repository, revision_id, time.time(),
4153
osutils.local_time_offset(), submit_branch,
4154
public_branch=public_branch, patch_type=patch_type,
4157
outfile.writelines(directive.to_lines())
4159
subject = '[MERGE] '
4160
if message is not None:
4163
revision = branch.repository.get_revision(revision_id)
4164
subject += revision.get_summary()
4165
mail_client.compose_merge_request(mail_to, subject,
5241
4173
class cmd_bundle_revisions(cmd_send):
5242
__doc__ = """Create a merge-directive for submitting changes.
4175
"""Create a merge-directive for submiting changes.
5244
4177
A merge directive provides many things needed for requesting merges:
5472
4365
If none of these is available, --bind-to must be specified.
5475
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
5476
4368
takes_args = ['location?']
5478
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5482
value_switches=True, enum_switch=False,
5483
branch='Reconfigure to be an unbound branch with no working tree.',
5484
tree='Reconfigure to be an unbound branch with a working tree.',
5485
checkout='Reconfigure to be a bound branch with a working tree.',
5486
lightweight_checkout='Reconfigure to be a lightweight'
5487
' checkout (with no local history).',
5488
standalone='Reconfigure to be a standalone branch '
5489
'(i.e. stop using shared repository).',
5490
use_shared='Reconfigure to use a shared repository.',
5491
with_trees='Reconfigure repository to create '
5492
'working trees on branches by default.',
5493
with_no_trees='Reconfigure repository to not create '
5494
'working trees on branches by default.'
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
5498
help='Perform reconfiguration even if local changes'
5500
Option('stacked-on',
5501
help='Reconfigure a branch to be stacked on another branch.',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
4369
takes_options = [RegistryOption.from_kwargs('target_type',
4370
title='Target type',
4371
help='The type to reconfigure the directory to.',
4372
value_switches=True, enum_switch=False,
4373
branch='Reconfigure to a branch.',
4374
tree='Reconfigure to a tree.',
4375
checkout='Reconfigure to a checkout.',
4376
lightweight_checkout='Reconfigure to a lightweight'
4378
Option('bind-to', help='Branch to bind checkout to.',
4381
help='Perform reconfiguration even if local changes'
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
4385
def run(self, location=None, target_type=None, bind_to=None, force=False):
5513
4386
directory = bzrdir.BzrDir.open(location)
5514
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5516
elif stacked_on is not None:
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5519
reconfigure.ReconfigureUnstacked().apply(directory)
5520
# At the moment you can use --stacked-on and a different
5521
# reconfiguration shape at the same time; there seems no good reason
5523
4387
if target_type is None:
5524
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
4388
raise errors.BzrCommandError('No target configuration specified')
5529
4389
elif target_type == 'branch':
5530
4390
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
4391
elif target_type == 'tree':
5532
4392
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
4393
elif target_type == 'checkout':
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
4394
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
5536
4396
elif target_type == 'lightweight-checkout':
5537
4397
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
4398
directory, bind_to)
5539
elif target_type == 'use-shared':
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5546
elif target_type == 'with-no-trees':
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5549
4399
reconfiguration.apply(force)
5552
4402
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
4403
"""Set the branch of a checkout and update.
5555
4405
For lightweight checkouts, this changes the branch being referenced.
5556
4406
For heavyweight checkouts, this checks that there are no local commits
5557
4407
versus the current bound branch, then it makes the local branch a mirror
5558
4408
of the new location and binds to it.
5560
4410
In both cases, the working tree is updated and uncommitted changes
5561
4411
are merged. The user can commit or revert these as they desire.
5563
4413
Pending merges need to be committed or reverted before using switch.
5565
The path to the branch to switch to can be specified relative to the parent
5566
directory of the current branch. For example, if you are currently in a
5567
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
5570
Bound branches use the nickname of its master branch unless it is set
5571
locally, in which case switching will update the local nickname to be
5575
takes_args = ['to_location?']
4416
takes_args = ['to_location']
5576
4417
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
5579
Option('create-branch', short_name='b',
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
4418
help='Switch even if local commits will be lost.')
5584
def run(self, to_location=None, force=False, create_branch=False,
4421
def run(self, to_location, force=False):
5586
4422
from bzrlib import switch
4423
to_branch = Branch.open(to_location)
5587
4424
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
4425
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5596
branch = control_dir.open_branch()
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
except errors.NotBranchError:
5600
had_explicit_nick = False
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
if had_explicit_nick:
5625
branch = control_dir.open_branch() #get the new branch!
5626
branch.nick = to_branch.nick
4426
switch.switch(control_dir, to_branch, force)
5627
4427
note('Switched to branch: %s',
5628
4428
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5648
class cmd_view(Command):
5649
__doc__ = """Manage filtered views.
5651
Views provide a mask over the tree so that users can focus on
5652
a subset of a tree when doing their work. After creating a view,
5653
commands that support a list of files - status, diff, commit, etc -
5654
effectively have that list of files implicitly given each time.
5655
An explicit list of files can still be given but those files
5656
must be within the current view.
5658
In most cases, a view has a short life-span: it is created to make
5659
a selected change and is deleted once that change is committed.
5660
At other times, you may wish to create one or more named views
5661
and switch between them.
5663
To disable the current view without deleting it, you can switch to
5664
the pseudo view called ``off``. This can be useful when you need
5665
to see the whole tree for an operation or two (e.g. merge) but
5666
want to switch back to your view after that.
5669
To define the current view::
5671
bzr view file1 dir1 ...
5673
To list the current view::
5677
To delete the current view::
5681
To disable the current view without deleting it::
5683
bzr view --switch off
5685
To define a named view and switch to it::
5687
bzr view --name view-name file1 dir1 ...
5689
To list a named view::
5691
bzr view --name view-name
5693
To delete a named view::
5695
bzr view --name view-name --delete
5697
To switch to a named view::
5699
bzr view --switch view-name
5701
To list all views defined::
5705
To delete all views::
5707
bzr view --delete --all
5711
takes_args = ['file*']
5714
help='Apply list or delete action to all views.',
5717
help='Delete the view.',
5720
help='Name of the view to define, list or delete.',
5724
help='Name of the view to switch to.',
5729
def run(self, file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
5736
current_view, view_dict = tree.views.get_view_info()
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
5747
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
5750
raise errors.BzrCommandError("No current view to delete")
5752
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
5761
elif switch == 'off':
5762
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
5764
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
5767
tree.views.set_view_info(switch, view_dict)
5768
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
5772
self.outf.write('Views defined:\n')
5773
for view in sorted(view_dict):
5774
if view == current_view:
5778
view_str = views.view_display_str(view_dict[view])
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
5784
# No name given and no current view set
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
5789
tree.views.set_view(name, sorted(file_list))
5790
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
5795
# No name given and no current view set
5796
self.outf.write('No current view.\n')
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
5802
class cmd_hooks(Command):
5803
__doc__ = """Show hooks."""
5808
for hook_key in sorted(hooks.known_hooks.keys()):
5809
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5810
self.outf.write("%s:\n" % type(some_hooks).__name__)
5811
for hook_name, hook_point in sorted(some_hooks.items()):
5812
self.outf.write(" %s:\n" % (hook_name,))
5813
found_hooks = list(hook_point)
5815
for hook in found_hooks:
5816
self.outf.write(" %s\n" %
5817
(some_hooks.get_hook_name(hook),))
5819
self.outf.write(" <no hooks installed>\n")
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5830
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
5836
takes_args = ["location?"]
5838
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5847
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5850
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
ie. out of the way, until a later time when you can bring them back from
5852
the shelf with the 'unshelve' command. The changes are stored alongside
5853
your working tree, and so they aren't propagated along with your branch nor
5854
will they survive its deletion.
5856
If shelve --list is specified, previously-shelved changes are listed.
5858
Shelve is intended to help separate several sets of changes that have
5859
been inappropriately mingled. If you just want to get rid of all changes
5860
and you don't need to restore them later, use revert. If you want to
5861
shelve all text changes at once, use shelve --all.
5863
If filenames are specified, only the changes to those files will be
5864
shelved. Other files will be left untouched.
5866
If a revision is specified, changes since that revision will be shelved.
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
restore the most recently shelved changes.
5872
takes_args = ['file*']
5876
Option('all', help='Shelve all changes.'),
5878
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
5880
value_switches=True, enum_switch=False),
5882
Option('list', help='List shelved changes.'),
5884
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
5888
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
5894
writer = bzrlib.option.diff_writer_registry.get()
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5902
except errors.UserAbort:
5905
def run_for_list(self):
5906
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
5909
manager = tree.get_shelf_manager()
5910
shelves = manager.active_shelves()
5911
if len(shelves) == 0:
5912
note('No shelved changes.')
5914
for shelf_id in reversed(shelves):
5915
message = manager.get_metadata(shelf_id).get('message')
5917
message = '<no message>'
5918
self.outf.write('%3d: %s\n' % (shelf_id, message))
5922
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5925
By default, the most recently shelved changes are restored. However if you
5926
specify a shelf by id those changes will be restored instead. This works
5927
best when the changes don't depend on each other.
5930
takes_args = ['shelf_id?']
5932
RegistryOption.from_kwargs(
5933
'action', help="The action to perform.",
5934
enum_switch=False, value_switches=True,
5935
apply="Apply changes and remove from the shelf.",
5936
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
delete_only="Delete changes without applying them.",
5940
keep="Apply changes but don't delete them.",
5943
_see_also = ['shelve']
5945
def run(self, shelf_id=None, action='apply'):
5946
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5951
unshelver.tree.unlock()
5954
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5957
By default, only unknown files, not ignored files, are deleted. Versioned
5958
files are never deleted.
5960
Another class is 'detritus', which includes files emitted by bzr during
5961
normal operations and selftests. (The value of these files decreases with
5964
If no options are specified, unknown files are deleted. Otherwise, option
5965
flags are respected, and may be combined.
5967
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
5971
' backups, and failed selftest dirs.'),
5973
help='Delete files unknown to bzr (default).'),
5974
Option('dry-run', help='Show files to delete instead of'
5976
Option('force', help='Do not prompt before deleting.')]
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
5980
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5988
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5991
If no arguments are provided, lists the branch locations for nested trees.
5992
If one argument is provided, display the branch location for that tree.
5993
If two arguments are provided, set the branch location for that tree.
5998
takes_args = ['path?', 'location?']
6000
def run(self, path=None, location=None):
6002
if path is not None:
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6006
if path is not None:
6009
tree = branch.basis_tree()
6011
info = branch._get_all_reference_info().iteritems()
6012
self._display_reference_info(tree, branch, info)
6014
file_id = tree.path2id(path)
6016
raise errors.NotVersionedError(path)
6017
if location is None:
6018
info = [(file_id, branch.get_reference_info(file_id))]
6019
self._display_reference_info(tree, branch, info)
6021
branch.set_reference_info(file_id, path, location)
6023
def _display_reference_info(self, tree, branch, info):
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6030
ref_list.append((path, location))
6031
for path, location in sorted(ref_list):
6032
self.outf.write('%s %s\n' % (path, location))
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
4431
def _create_prefix(cur_transport):
4432
needed = [cur_transport]
4433
# Recurse upwards until we can create a directory successfully
4435
new_transport = cur_transport.clone('..')
4436
if new_transport.base == cur_transport.base:
4437
raise errors.BzrCommandError(
4438
"Failed to create path prefix for %s."
4439
% cur_transport.base)
4441
new_transport.mkdir('.')
4442
except errors.NoSuchFile:
4443
needed.append(new_transport)
4444
cur_transport = new_transport
4447
# Now we only need to create child directories
4449
cur_transport = needed.pop()
4450
cur_transport.ensure_base()
4453
def _get_mergeable_helper(location):
4454
"""Get a merge directive or bundle if 'location' points to one.
4456
Try try to identify a bundle and returns its mergeable form. If it's not,
4457
we return the tried transport anyway so that it can reused to access the
4460
:param location: can point to a bundle or a branch.
4462
:return: mergeable, transport
4465
url = urlutils.normalize_url(location)
4466
url, filename = urlutils.split(url, exclude_trailing_slash=False)
4467
location_transport = transport.get_transport(url)
4470
# There may be redirections but we ignore the intermediate
4471
# and final transports used
4472
read = bundle.read_mergeable_from_transport
4473
mergeable, t = read(location_transport, filename)
4474
except errors.NotABundle:
4475
# Continue on considering this url a Branch but adjust the
4476
# location_transport
4477
location_transport = location_transport.clone(filename)
4478
return mergeable, location_transport
4481
# these get imported and then picked up by the scan for cmd_*
4482
# TODO: Some more consistent way to split command definitions across files;
4483
# we do need to load at least some information about them to know of
4484
# aliases. ideally we would avoid loading the implementation until the
4485
# details were needed.
4486
from bzrlib.cmd_version_info import cmd_version_info
4487
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4488
from bzrlib.bundle.commands import (
4491
from bzrlib.sign_my_commits import cmd_sign_my_commits
4492
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
4493
cmd_weave_plan_merge, cmd_weave_merge_text