~bzr-pqm/bzr/bzr.dev

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