/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
1
# Copyright (C) 2006 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
0.5.1 by John Arbash Meinel
Just an initial working step.
16
"""\
17
This is an attempt to take the internal delta object, and represent
18
it as a single-file text-only changeset.
19
This should have commands for both generating a changeset,
20
and for applying a changeset.
21
"""
22
0.5.99 by John Arbash Meinel
Updating to current Branch.open() and RevisionSpec changes.
23
import sys
1185.82.78 by Aaron Bentley
Cleanups
24
25
from bzrlib.branch import Branch
0.5.114 by John Arbash Meinel
Hiding OPTIONS since it has been removed. Updating for the new Branch.open_containing()
26
from bzrlib.commands import Command, register_command
1185.82.78 by Aaron Bentley
Cleanups
27
import bzrlib.errors as errors
0.5.121 by John Arbash Meinel
Fixing options to apply-changeset
28
from bzrlib.option import Option
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
29
from bzrlib.revision import (common_ancestor, MultipleRevisionSources,
1185.82.54 by Aaron Bentley
Removed import of get_intervening revision
30
                             NULL_REVISION)
1185.84.4 by Aaron Bentley
Use parent branch as default base branch
31
from bzrlib.trace import note
1793.2.15 by Aaron Bentley
Update bundle command to use urlutils for emitting saved location
32
from bzrlib import urlutils
1185.82.78 by Aaron Bentley
Cleanups
33
0.5.1 by John Arbash Meinel
Just an initial working step.
34
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
35
class cmd_send_changeset(Command):
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
36
    """Send a bundled up changset via mail.
37
38
    If no revision has been specified, the last commited change will
39
    be sent.
40
0.5.30 by John Arbash Meinel
Merging send-changeset updates from jrydberg
41
    Subject of the mail can be specified by the --message option,
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
42
    otherwise information from the changeset log will be used.
0.5.30 by John Arbash Meinel
Merging send-changeset updates from jrydberg
43
44
    A editor will be spawned where the user may enter a description
45
    of the changeset.  The description can be read from a file with
46
    the --file FILE option.
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
47
    """
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
48
    takes_options = ['revision', 'message', 'file']
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
49
    takes_args = ['to?']
50
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
51
    def run(self, to=None, message=None, revision=None, file=None):
0.5.68 by John Arbash Meinel
(broken), starting to change the syntax of the command to allow cset to take a base and a target.
52
        from bzrlib.errors import BzrCommandError
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
53
        from send_changeset import send_changeset
0.5.30 by John Arbash Meinel
Merging send-changeset updates from jrydberg
54
        
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
55
        if isinstance(revision, (list, tuple)):
56
            if len(revision) > 1:
57
                raise BzrCommandError('We do not support rollup-changesets yet.')
58
            revision = revision[0]
59
0.5.99 by John Arbash Meinel
Updating to current Branch.open() and RevisionSpec changes.
60
        b = Branch.open_containing('.')
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
61
62
        if not to:
63
            try:
64
                to = b.controlfile('x-send-address', 'rb').read().strip('\n')
65
            except:
66
                raise BzrCommandError('destination address is not known')
67
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
68
        if not isinstance(revision, (list, tuple)):
69
            revision = [revision]
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
70
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
71
        send_changeset(b, revision, to, message, file)
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
72
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
73
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
74
class cmd_bundle_revisions(Command):
75
    """Generate a revision bundle.
0.5.1 by John Arbash Meinel
Just an initial working step.
76
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
77
    This bundle contains all of the meta-information of a
0.5.1 by John Arbash Meinel
Just an initial working step.
78
    diff, rather than just containing the patch information.
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
79
1185.82.81 by Aaron Bentley
Remove unused functionality
80
    You can apply it to another tree using 'bzr merge'.
81
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
82
    bzr bundle-revisions
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
83
        - Generate a bundle relative to a remembered location
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
84
    bzr bundle-revisions BASE
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
85
        - Bundle to apply the current tree into BASE
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
86
    bzr bundle-revisions --revision A
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
87
        - Bundle to apply revision A to remembered location 
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
88
    bzr bundle-revisions --revision A..B
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
89
        - Bundle to transform A into B
0.5.1 by John Arbash Meinel
Just an initial working step.
90
    """
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
91
    takes_options = ['verbose', 'revision', 'remember',
1744.1.1 by Alexander Belchenko
Added --output option for bundle-revisions command
92
                     Option("output", help="write bundle to specified file",
93
                            type=unicode)]
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
94
    takes_args = ['base?']
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
95
    aliases = ['bundle']
0.5.1 by John Arbash Meinel
Just an initial working step.
96
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
97
    def run(self, base=None, revision=None, output=None, remember=False):
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
98
        from bzrlib import user_encoding
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
99
        from bzrlib.bundle.serializer import write_bundle
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
100
1185.84.4 by Aaron Bentley
Use parent branch as default base branch
101
        target_branch = Branch.open_containing(u'.')[0]
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
102
103
        if base is None:
104
            base_specified = False
105
        else:
106
            base_specified = True
1185.84.4 by Aaron Bentley
Use parent branch as default base branch
107
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
108
        if revision is None:
109
            target_revision = target_branch.last_revision()
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
110
        elif len(revision) < 3:
111
            target_revision = revision[-1].in_history(target_branch).rev_id
112
            if len(revision) == 2:
113
                if base_specified:
114
                    raise errors.BzrCommandError('Cannot specify base as well'
115
                                                 ' as two revision arguments.')
1185.82.85 by Aaron Bentley
Swap meaning of two-argument 'changeset' to match 'merge'
116
                base_revision = revision[0].in_history(target_branch).rev_id
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
117
        else:
118
            raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
119
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
120
        if revision is None or len(revision) < 2:
121
            submit_branch = target_branch.get_submit_branch()
122
            if base is None:
123
                base = submit_branch
124
            if base is None:
125
                base = target_branch.get_parent()
126
            if base is None:
127
                raise errors.BzrCommandError("No base branch known or"
128
                                             " specified.")
129
            elif not base_specified:
1793.2.16 by Aaron Bentley
More notes on 'note'
130
                # FIXME:
131
                # note() doesn't pay attention to terminal_encoding() so
132
                # we must format with 'ascii' to be safe
133
                note('Using saved location: %s',
134
                     urlutils.unescape_for_display(base, 'ascii'))
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
135
            base_branch = Branch.open(base)
136
137
            # We don't want to lock the same branch across
138
            # 2 different branches
139
            if target_branch.base == base_branch.base:
140
                base_branch = target_branch 
141
            if submit_branch is None or remember:
142
                if base_specified:
143
                    target_branch.set_submit_branch(base_branch.base)
144
                elif remember:
145
                    raise errors.BzrCommandError('--remember requires a branch'
146
                                                 ' to be specified.')
1185.82.23 by Aaron Bentley
Switch the fetcher
147
            target_branch.repository.fetch(base_branch.repository, 
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
148
                                           base_branch.last_revision())
149
            base_revision = common_ancestor(base_branch.last_revision(),
150
                                            target_revision,
151
                                            target_branch.repository)
152
1744.1.1 by Alexander Belchenko
Added --output option for bundle-revisions command
153
154
        if output is not None:
155
            fileobj = file(output, 'wb')
156
        else:
157
            fileobj = sys.stdout
1927.1.1 by John Arbash Meinel
Lock the repository more often
158
        target_branch.repository.lock_read()
159
        try:
160
            write_bundle(target_branch.repository, target_revision,
161
                         base_revision, fileobj)
162
        finally:
163
            target_branch.repository.unlock()
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
164
0.5.1 by John Arbash Meinel
Just an initial working step.
165
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
166
class cmd_verify_changeset(Command):
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
167
    """Read a written changeset, and make sure it is valid.
168
169
    """
170
    takes_args = ['filename?']
171
172
    def run(self, filename=None):
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
173
        from read_changeset import read_changeset
0.5.103 by John Arbash Meinel
Updated to having a changeset specific message.
174
        #from bzrlib.xml import serializer_v4
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
175
0.5.114 by John Arbash Meinel
Hiding OPTIONS since it has been removed. Updating for the new Branch.open_containing()
176
        b, relpath = Branch.open_containing('.')
0.5.56 by John Arbash Meinel
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
177
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
178
        if filename is None or filename == '-':
179
            f = sys.stdin
180
        else:
0.5.33 by John Arbash Meinel
Use universal newlines wherever appropriate.
181
            f = open(filename, 'U')
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
182
0.5.88 by John Arbash Meinel
Fixed a bug in the rename code, added more tests.
183
        cset_info, cset_tree = read_changeset(f, b)
0.5.103 by John Arbash Meinel
Updated to having a changeset specific message.
184
        # print cset_info
185
        # print cset_tree
186
        #serializer_v4.write(cset_tree.inventory, sys.stdout)