~bzr-pqm/bzr/bzr.dev

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
1996.3.8 by John Arbash Meinel
lazy_import bundle and bundle.commands
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
27
from bzrlib import (
28
    branch,
29
    errors,
30
    urlutils,
31
    )
32
from bzrlib.revision import common_ancestor
33
""")
34
35
from bzrlib.commands import Command
0.5.121 by John Arbash Meinel
Fixing options to apply-changeset
36
from bzrlib.option import Option
1185.84.4 by Aaron Bentley
Use parent branch as default base branch
37
from bzrlib.trace import note
1185.82.78 by Aaron Bentley
Cleanups
38
0.5.1 by John Arbash Meinel
Just an initial working step.
39
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
40
class cmd_send_changeset(Command):
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
41
    """Send a bundled up changset via mail.
42
43
    If no revision has been specified, the last commited change will
44
    be sent.
45
0.5.30 by John Arbash Meinel
Merging send-changeset updates from jrydberg
46
    Subject of the mail can be specified by the --message option,
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
47
    otherwise information from the changeset log will be used.
0.5.30 by John Arbash Meinel
Merging send-changeset updates from jrydberg
48
49
    A editor will be spawned where the user may enter a description
50
    of the changeset.  The description can be read from a file with
51
    the --file FILE option.
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
52
    """
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
53
    takes_options = ['revision', 'message', 'file']
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
54
    takes_args = ['to?']
55
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
56
    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.
57
        from bzrlib.errors import BzrCommandError
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
58
        from send_changeset import send_changeset
0.5.30 by John Arbash Meinel
Merging send-changeset updates from jrydberg
59
        
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
60
        if isinstance(revision, (list, tuple)):
61
            if len(revision) > 1:
62
                raise BzrCommandError('We do not support rollup-changesets yet.')
63
            revision = revision[0]
64
1996.3.8 by John Arbash Meinel
lazy_import bundle and bundle.commands
65
        b = branch.Branch.open_containing('.')
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
66
67
        if not to:
68
            try:
69
                to = b.controlfile('x-send-address', 'rb').read().strip('\n')
70
            except:
71
                raise BzrCommandError('destination address is not known')
72
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
73
        if not isinstance(revision, (list, tuple)):
74
            revision = [revision]
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
75
0.5.31 by John Arbash Meinel
Some cleanup to the send_changeset work.
76
        send_changeset(b, revision, to, message, file)
0.5.24 by John Arbash Meinel
Adding send-changeset from Johan Rydberg
77
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
78
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
79
class cmd_bundle_revisions(Command):
80
    """Generate a revision bundle.
0.5.1 by John Arbash Meinel
Just an initial working step.
81
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
82
    This bundle contains all of the meta-information of a
0.5.1 by John Arbash Meinel
Just an initial working step.
83
    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.
84
1185.82.81 by Aaron Bentley
Remove unused functionality
85
    You can apply it to another tree using 'bzr merge'.
86
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
87
    bzr bundle-revisions
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
88
        - Generate a bundle relative to a remembered location
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
89
    bzr bundle-revisions BASE
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
90
        - Bundle to apply the current tree into BASE
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
91
    bzr bundle-revisions --revision A
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
92
        - Bundle to apply revision A to remembered location 
1185.84.1 by Aaron Bentley
Use full command name in bundle-revisions help
93
    bzr bundle-revisions --revision A..B
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
94
        - Bundle to transform A into B
0.5.1 by John Arbash Meinel
Just an initial working step.
95
    """
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
96
    takes_options = ['verbose', 'revision', 'remember',
1744.1.1 by Alexander Belchenko
Added --output option for bundle-revisions command
97
                     Option("output", help="write bundle to specified file",
98
                            type=unicode)]
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
99
    takes_args = ['base?']
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
100
    aliases = ['bundle']
0.5.1 by John Arbash Meinel
Just an initial working step.
101
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
102
    def run(self, base=None, revision=None, output=None, remember=False):
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
103
        from bzrlib import user_encoding
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
104
        from bzrlib.bundle.serializer import write_bundle
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
105
1996.3.8 by John Arbash Meinel
lazy_import bundle and bundle.commands
106
        target_branch = branch.Branch.open_containing(u'.')[0]
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
107
108
        if base is None:
109
            base_specified = False
110
        else:
111
            base_specified = True
1185.84.4 by Aaron Bentley
Use parent branch as default base branch
112
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
113
        if revision is None:
114
            target_revision = target_branch.last_revision()
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
115
        elif len(revision) < 3:
116
            target_revision = revision[-1].in_history(target_branch).rev_id
117
            if len(revision) == 2:
118
                if base_specified:
119
                    raise errors.BzrCommandError('Cannot specify base as well'
120
                                                 ' as two revision arguments.')
1185.82.85 by Aaron Bentley
Swap meaning of two-argument 'changeset' to match 'merge'
121
                base_revision = revision[0].in_history(target_branch).rev_id
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
122
        else:
123
            raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
124
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
125
        if revision is None or len(revision) < 2:
126
            submit_branch = target_branch.get_submit_branch()
127
            if base is None:
128
                base = submit_branch
129
            if base is None:
130
                base = target_branch.get_parent()
131
            if base is None:
132
                raise errors.BzrCommandError("No base branch known or"
133
                                             " specified.")
134
            elif not base_specified:
1793.2.16 by Aaron Bentley
More notes on 'note'
135
                # FIXME:
136
                # note() doesn't pay attention to terminal_encoding() so
137
                # we must format with 'ascii' to be safe
138
                note('Using saved location: %s',
139
                     urlutils.unescape_for_display(base, 'ascii'))
1996.3.8 by John Arbash Meinel
lazy_import bundle and bundle.commands
140
            base_branch = branch.Branch.open(base)
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
141
142
            # We don't want to lock the same branch across
143
            # 2 different branches
144
            if target_branch.base == base_branch.base:
145
                base_branch = target_branch 
146
            if submit_branch is None or remember:
147
                if base_specified:
148
                    target_branch.set_submit_branch(base_branch.base)
149
                elif remember:
150
                    raise errors.BzrCommandError('--remember requires a branch'
151
                                                 ' to be specified.')
1185.82.23 by Aaron Bentley
Switch the fetcher
152
            target_branch.repository.fetch(base_branch.repository, 
1793.2.14 by Aaron Bentley
Clean up bundle revision specification
153
                                           base_branch.last_revision())
154
            base_revision = common_ancestor(base_branch.last_revision(),
155
                                            target_revision,
156
                                            target_branch.repository)
157
1744.1.1 by Alexander Belchenko
Added --output option for bundle-revisions command
158
159
        if output is not None:
160
            fileobj = file(output, 'wb')
161
        else:
162
            fileobj = sys.stdout
1927.1.1 by John Arbash Meinel
Lock the repository more often
163
        target_branch.repository.lock_read()
164
        try:
165
            write_bundle(target_branch.repository, target_revision,
166
                         base_revision, fileobj)
167
        finally:
168
            target_branch.repository.unlock()
1185.82.10 by John Arbash Meinel
Worked out the changeset command.
169
0.5.1 by John Arbash Meinel
Just an initial working step.
170
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
171
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.
172
    """Read a written changeset, and make sure it is valid.
173
174
    """
175
    takes_args = ['filename?']
176
177
    def run(self, filename=None):
0.5.81 by John Arbash Meinel
Cleaning up from pychecker.
178
        from read_changeset import read_changeset
0.5.103 by John Arbash Meinel
Updated to having a changeset specific message.
179
        #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.
180
1996.3.8 by John Arbash Meinel
lazy_import bundle and bundle.commands
181
        b, relpath = branch.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.
182
0.5.7 by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information.
183
        if filename is None or filename == '-':
184
            f = sys.stdin
185
        else:
0.5.33 by John Arbash Meinel
Use universal newlines wherever appropriate.
186
            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.
187
0.5.88 by John Arbash Meinel
Fixed a bug in the rename code, added more tests.
188
        cset_info, cset_tree = read_changeset(f, b)
0.5.103 by John Arbash Meinel
Updated to having a changeset specific message.
189
        # print cset_info
190
        # print cset_tree
191
        #serializer_v4.write(cset_tree.inventory, sys.stdout)