← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
24
24
import sys
25
25
 
26
26
import bzrlib
 
27
from bzrlib import (
 
28
    branch,
 
29
    bundle,
 
30
    bzrdir,
 
31
    config,
 
32
    errors,
 
33
    ignores,
 
34
    log,
 
35
    osutils,
 
36
    repository,
 
37
    transport,
 
38
    ui,
 
39
    urlutils,
 
40
    )
27
41
from bzrlib.branch import Branch, BranchReferenceFormat
28
 
from bzrlib import (bundle, branch, bzrdir, errors, osutils, ui, config,
29
 
    repository, log)
30
42
from bzrlib.bundle import read_bundle_from_url
31
43
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
32
44
from bzrlib.conflicts import ConflictList
42
54
from bzrlib.revisionspec import RevisionSpec
43
55
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
44
56
from bzrlib.transport.local import LocalTransport
45
 
import bzrlib.urlutils as urlutils
46
57
from bzrlib.workingtree import WorkingTree
47
58
 
48
59
 
516
527
            create_prefix=False, verbose=False):
517
528
        # FIXME: Way too big!  Put this into a function called from the
518
529
        # command.
519
 
        from bzrlib.transport import get_transport
520
530
        
521
531
        br_from = Branch.open_containing('.')[0]
522
532
        stored_loc = br_from.get_push_location()
529
539
                self.outf.write("Using saved location: %s\n" % display_url)
530
540
                location = stored_loc
531
541
 
532
 
        transport = get_transport(location)
533
 
        location_url = transport.base
 
542
        to_transport = transport.get_transport(location)
 
543
        location_url = to_transport.base
534
544
 
535
545
        old_rh = []
536
546
        try:
538
548
            br_to = dir_to.open_branch()
539
549
        except NotBranchError:
540
550
            # create a branch.
541
 
            transport = transport.clone('..')
 
551
            to_transport = to_transport.clone('..')
542
552
            if not create_prefix:
543
553
                try:
544
 
                    relurl = transport.relpath(location_url)
 
554
                    relurl = to_transport.relpath(location_url)
545
555
                    mutter('creating directory %s => %s', location_url, relurl)
546
 
                    transport.mkdir(relurl)
 
556
                    to_transport.mkdir(relurl)
547
557
                except NoSuchFile:
548
558
                    raise BzrCommandError("Parent directory of %s "
549
559
                                          "does not exist." % location)
550
560
            else:
551
 
                current = transport.base
552
 
                needed = [(transport, transport.relpath(location_url))]
 
561
                current = to_transport.base
 
562
                needed = [(to_transport, to_transport.relpath(location_url))]
553
563
                while needed:
554
564
                    try:
555
 
                        transport, relpath = needed[-1]
556
 
                        transport.mkdir(relpath)
 
565
                        to_transport, relpath = needed[-1]
 
566
                        to_transport.mkdir(relpath)
557
567
                        needed.pop()
558
568
                    except NoSuchFile:
559
 
                        new_transport = transport.clone('..')
 
569
                        new_transport = to_transport.clone('..')
560
570
                        needed.append((new_transport,
561
 
                                       new_transport.relpath(transport.base)))
562
 
                        if new_transport.base == transport.base:
 
571
                                       new_transport.relpath(to_transport.base)))
 
572
                        if new_transport.base == to_transport.base:
563
573
                            raise BzrCommandError("Could not create "
564
574
                                                  "path prefix.")
565
575
            dir_to = br_from.bzrdir.clone(location_url,
618
628
    aliases = ['get', 'clone']
619
629
 
620
630
    def run(self, from_location, to_location=None, revision=None, basis=None):
621
 
        from bzrlib.transport import get_transport
622
631
        if revision is None:
623
632
            revision = [None]
624
633
        elif len(revision) > 1:
651
660
            else:
652
661
                name = os.path.basename(to_location) + '\n'
653
662
 
654
 
            to_transport = get_transport(to_location)
 
663
            to_transport = transport.get_transport(to_location)
655
664
            try:
656
665
                to_transport.mkdir('.')
657
666
            except errors.FileExists:
800
809
    'bzr revert' instead of 'bzr commit' after the update.
801
810
    """
802
811
    takes_args = ['dir?']
 
812
    aliases = ['up']
803
813
 
804
814
    def run(self, dir='.'):
805
815
        tree = WorkingTree.open_containing(dir)[0]
866
876
                raise BzrCommandError('Specify one or more files to remove, or'
867
877
                                      ' use --new.')
868
878
        else:
869
 
            from bzrlib.delta import compare_trees
870
 
            added = [compare_trees(tree.basis_tree(), tree,
871
 
                                   specific_files=file_list).added]
872
 
            file_list = sorted([f[0] for f in added[0]], reverse=True)
 
879
            added = tree.changes_from(tree.basis_tree(),
 
880
                specific_files=file_list).added
 
881
            file_list = sorted([f[0] for f in added], reverse=True)
873
882
            if len(file_list) == 0:
874
883
                raise BzrCommandError('No matching files.')
875
884
        tree.remove(file_list, verbose=verbose, to_file=self.outf)
1016
1025
            format = get_format_type('default')
1017
1026
        if location is None:
1018
1027
            location = u'.'
1019
 
        else:
1020
 
            # The path has to exist to initialize a
1021
 
            # branch inside of it.
1022
 
            # Just using os.mkdir, since I don't
1023
 
            # believe that we want to create a bunch of
1024
 
            # locations if the user supplies an extended path
1025
 
            if not os.path.exists(location):
1026
 
                os.mkdir(location)
 
1028
 
 
1029
        to_transport = transport.get_transport(location)
 
1030
 
 
1031
        # The path has to exist to initialize a
 
1032
        # branch inside of it.
 
1033
        # Just using os.mkdir, since I don't
 
1034
        # believe that we want to create a bunch of
 
1035
        # locations if the user supplies an extended path
 
1036
        # TODO: create-prefix
 
1037
        try:
 
1038
            to_transport.mkdir('.')
 
1039
        except errors.FileExists:
 
1040
            pass
 
1041
                    
1027
1042
        try:
1028
1043
            existing_bzrdir = bzrdir.BzrDir.open(location)
1029
1044
        except NotBranchError:
1031
1046
            bzrdir.BzrDir.create_branch_convenience(location, format=format)
1032
1047
        else:
1033
1048
            if existing_bzrdir.has_branch():
1034
 
                if existing_bzrdir.has_workingtree():
1035
 
                    raise errors.AlreadyBranchError(location)
1036
 
                else:
1037
 
                    raise errors.BranchExistsWithoutWorkingTree(location)
 
1049
                if (isinstance(to_transport, LocalTransport)
 
1050
                    and not existing_bzrdir.has_workingtree()):
 
1051
                        raise errors.BranchExistsWithoutWorkingTree(location)
 
1052
                raise errors.AlreadyBranchError(location)
1038
1053
            else:
1039
1054
                existing_bzrdir.create_branch()
1040
1055
                existing_bzrdir.create_workingtree()
1066
1081
                             ' a working tree')]
1067
1082
    aliases = ["init-repo"]
1068
1083
    def run(self, location, format=None, trees=False):
1069
 
        from bzrlib.transport import get_transport
1070
1084
        if format is None:
1071
1085
            format = get_format_type('default')
1072
 
        transport = get_transport(location)
1073
 
        if not transport.has('.'):
1074
 
            transport.mkdir('')
1075
 
        newdir = format.initialize_on_transport(transport)
 
1086
 
 
1087
        if location is None:
 
1088
            location = '.'
 
1089
 
 
1090
        to_transport = transport.get_transport(location)
 
1091
        try:
 
1092
            to_transport.mkdir('.')
 
1093
        except errors.FileExists:
 
1094
            pass
 
1095
 
 
1096
        newdir = format.initialize_on_transport(to_transport)
1076
1097
        repo = newdir.create_repository(shared=True)
1077
1098
        repo.set_make_working_trees(trees)
1078
1099
 
1149
1170
                raise BzrCommandError("Files are in different branches")
1150
1171
            file_list = None
1151
1172
        except NotBranchError:
1152
 
            # Don't raise an error when bzr diff is called from
1153
 
            # outside a working tree.
1154
 
            tree1, tree2 = None, None
 
1173
            if (revision is not None and len(revision) == 2
 
1174
                and not revision[0].needs_branch()
 
1175
                and not revision[1].needs_branch()):
 
1176
                # If both revision specs include a branch, we can
 
1177
                # diff them without needing a local working tree
 
1178
                tree1, tree2 = None, None
 
1179
            else:
 
1180
                raise
1155
1181
        if revision is not None:
1156
1182
            if tree2 is not None:
1157
1183
                raise BzrCommandError("Can't specify -r with two branches")
1205
1231
    hidden = True
1206
1232
    @display_command
1207
1233
    def run(self):
1208
 
        from bzrlib.delta import compare_trees
1209
 
 
1210
1234
        tree = WorkingTree.open_containing(u'.')[0]
1211
 
        td = compare_trees(tree.basis_tree(), tree)
1212
 
 
 
1235
        td = tree.changes_from(tree.basis_tree())
1213
1236
        for path, id, kind, text_modified, meta_modified in td.modified:
1214
1237
            self.outf.write(path + '\n')
1215
1238
 
1480
1503
        from bzrlib.atomicfile import AtomicFile
1481
1504
        if old_default_rules is not None:
1482
1505
            # dump the rules and exit
1483
 
            for pattern in bzrlib.DEFAULT_IGNORE:
 
1506
            for pattern in ignores.OLD_DEFAULTS:
1484
1507
                print pattern
1485
1508
            return
1486
1509
        if name_pattern is None:
2008
2031
 
2009
2032
class cmd_version(Command):
2010
2033
    """Show version of bzr."""
 
2034
 
2011
2035
    @display_command
2012
2036
    def run(self):
2013
2037
        show_version()
2014
2038
 
 
2039
 
2015
2040
class cmd_rocks(Command):
2016
2041
    """Statement of optimism."""
 
2042
 
2017
2043
    hidden = True
 
2044
 
2018
2045
    @display_command
2019
2046
    def run(self):
2020
2047
        print "it sure does!"
2021
2048
 
2022
2049
 
2023
2050
class cmd_find_merge_base(Command):
2024
 
    """Find and print a base revision for merging two branches.
2025
 
    """
 
2051
    """Find and print a base revision for merging two branches."""
2026
2052
    # TODO: Options to specify revisions on either side, as if
2027
2053
    #       merging only part of the history.
2028
2054
    takes_args = ['branch', 'other']
2395
2421
        if other_branch is None:
2396
2422
            other_branch = parent
2397
2423
            if other_branch is None:
2398
 
                raise BzrCommandError("No missing location known or specified.")
 
2424
                raise BzrCommandError("No peer location known or specified.")
2399
2425
            print "Using last location: " + local_branch.get_parent()
2400
2426
        remote_branch = Branch.open(other_branch)
2401
2427
        if remote_branch.base == local_branch.base:
2637
2663
    takes_args = ['location?']
2638
2664
    aliases = []
2639
2665
 
2640
 
    def run(self, location=None, 
 
2666
    def run(self, location=None,
2641
2667
            dry_run=False, verbose=False,
2642
2668
            revision=None, force=False):
2643
 
        from bzrlib.log import log_formatter
 
2669
        from bzrlib.log import log_formatter, show_log
2644
2670
        import sys
2645
2671
        from bzrlib.uncommit import uncommit
2646
2672
 
2654
2680
            tree = None
2655
2681
            b = control.open_branch()
2656
2682
 
 
2683
        rev_id = None
2657
2684
        if revision is None:
2658
2685
            revno = b.revno()
2659
 
            rev_id = b.last_revision()
2660
2686
        else:
2661
 
            revno, rev_id = revision[0].in_history(b)
 
2687
            # 'bzr uncommit -r 10' actually means uncommit
 
2688
            # so that the final tree is at revno 10.
 
2689
            # but bzrlib.uncommit.uncommit() actually uncommits
 
2690
            # the revisions that are supplied.
 
2691
            # So we need to offset it by one
 
2692
            revno = revision[0].in_history(b).revno+1
 
2693
 
 
2694
        if revno <= b.revno():
 
2695
            rev_id = b.get_rev_id(revno)
2662
2696
        if rev_id is None:
2663
 
            print 'No revisions to uncommit.'
2664
 
 
2665
 
        for r in range(revno, b.revno()+1):
2666
 
            rev_id = b.get_rev_id(r)
2667
 
            lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2668
 
            lf.show(r, b.repository.get_revision(rev_id), None)
 
2697
            self.outf.write('No revisions to uncommit.\n')
 
2698
            return 1
 
2699
 
 
2700
        lf = log_formatter('short',
 
2701
                           to_file=self.outf,
 
2702
                           show_timezone='original')
 
2703
 
 
2704
        show_log(b,
 
2705
                 lf,
 
2706
                 verbose=False,
 
2707
                 direction='forward',
 
2708
                 start_revision=revno,
 
2709
                 end_revision=b.revno())
2669
2710
 
2670
2711
        if dry_run:
2671
2712
            print 'Dry-run, pretending to remove the above revisions.'