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
|
2374.1.1
by Ian Clatworthy
Help and man page fixes |
89 |
|
1185.84.1
by Aaron Bentley
Use full command name in bundle-revisions help |
90 |
bzr bundle-revisions BASE
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
91 |
- Bundle to apply the current tree into BASE
|
2374.1.1
by Ian Clatworthy
Help and man page fixes |
92 |
|
1185.84.1
by Aaron Bentley
Use full command name in bundle-revisions help |
93 |
bzr bundle-revisions --revision A
|
1793.2.14
by Aaron Bentley
Clean up bundle revision specification |
94 |
- Bundle to apply revision A to remembered location
|
2374.1.1
by Ian Clatworthy
Help and man page fixes |
95 |
|
1185.84.1
by Aaron Bentley
Use full command name in bundle-revisions help |
96 |
bzr bundle-revisions --revision A..B
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
97 |
- Bundle to transform A into B
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
98 |
"""
|
2379.5.1
by John Arbash Meinel
(Robert Widhopf-Fenk, bug #98591) Remove --verbose flag from 'bzr bundle'. |
99 |
takes_options = ['revision', 'remember', |
1744.1.1
by Alexander Belchenko
Added --output option for bundle-revisions command |
100 |
Option("output", help="write bundle to specified file", |
101 |
type=unicode)] |
|
1185.82.10
by John Arbash Meinel
Worked out the changeset command. |
102 |
takes_args = ['base?'] |
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
103 |
aliases = ['bundle'] |
2178.4.4
by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32 |
104 |
encoding_type = 'exact' |
0.5.1
by John Arbash Meinel
Just an initial working step. |
105 |
|
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
106 |
def run(self, base=None, revision=None, output=None, remember=False): |
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
107 |
from bzrlib import user_encoding |
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
108 |
from bzrlib.bundle.serializer import write_bundle |
1185.82.10
by John Arbash Meinel
Worked out the changeset command. |
109 |
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
110 |
target_branch = branch.Branch.open_containing(u'.')[0] |
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
111 |
|
112 |
if base is None: |
|
113 |
base_specified = False |
|
114 |
else: |
|
115 |
base_specified = True |
|
1185.84.4
by Aaron Bentley
Use parent branch as default base branch |
116 |
|
1185.82.10
by John Arbash Meinel
Worked out the changeset command. |
117 |
if revision is None: |
118 |
target_revision = target_branch.last_revision() |
|
1793.2.14
by Aaron Bentley
Clean up bundle revision specification |
119 |
elif len(revision) < 3: |
120 |
target_revision = revision[-1].in_history(target_branch).rev_id |
|
121 |
if len(revision) == 2: |
|
122 |
if base_specified: |
|
123 |
raise errors.BzrCommandError('Cannot specify base as well' |
|
124 |
' as two revision arguments.') |
|
1185.82.85
by Aaron Bentley
Swap meaning of two-argument 'changeset' to match 'merge' |
125 |
base_revision = revision[0].in_history(target_branch).rev_id |
1185.82.10
by John Arbash Meinel
Worked out the changeset command. |
126 |
else: |
127 |
raise errors.BzrCommandError('--revision takes 1 or 2 parameters') |
|
128 |
||
1793.2.14
by Aaron Bentley
Clean up bundle revision specification |
129 |
if revision is None or len(revision) < 2: |
130 |
submit_branch = target_branch.get_submit_branch() |
|
131 |
if base is None: |
|
132 |
base = submit_branch |
|
133 |
if base is None: |
|
134 |
base = target_branch.get_parent() |
|
135 |
if base is None: |
|
136 |
raise errors.BzrCommandError("No base branch known or" |
|
137 |
" specified.") |
|
138 |
elif not base_specified: |
|
1793.2.16
by Aaron Bentley
More notes on 'note' |
139 |
# FIXME:
|
140 |
# note() doesn't pay attention to terminal_encoding() so
|
|
141 |
# we must format with 'ascii' to be safe
|
|
142 |
note('Using saved location: %s', |
|
143 |
urlutils.unescape_for_display(base, 'ascii')) |
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
144 |
base_branch = branch.Branch.open(base) |
1793.2.14
by Aaron Bentley
Clean up bundle revision specification |
145 |
|
146 |
# We don't want to lock the same branch across
|
|
147 |
# 2 different branches
|
|
148 |
if target_branch.base == base_branch.base: |
|
149 |
base_branch = target_branch |
|
150 |
if submit_branch is None or remember: |
|
151 |
if base_specified: |
|
152 |
target_branch.set_submit_branch(base_branch.base) |
|
153 |
elif remember: |
|
154 |
raise errors.BzrCommandError('--remember requires a branch' |
|
155 |
' to be specified.') |
|
1185.82.23
by Aaron Bentley
Switch the fetcher |
156 |
target_branch.repository.fetch(base_branch.repository, |
1793.2.14
by Aaron Bentley
Clean up bundle revision specification |
157 |
base_branch.last_revision()) |
158 |
base_revision = common_ancestor(base_branch.last_revision(), |
|
159 |
target_revision, |
|
160 |
target_branch.repository) |
|
161 |
||
1744.1.1
by Alexander Belchenko
Added --output option for bundle-revisions command |
162 |
|
163 |
if output is not None: |
|
164 |
fileobj = file(output, 'wb') |
|
165 |
else: |
|
166 |
fileobj = sys.stdout |
|
1927.1.1
by John Arbash Meinel
Lock the repository more often |
167 |
target_branch.repository.lock_read() |
168 |
try: |
|
169 |
write_bundle(target_branch.repository, target_revision, |
|
170 |
base_revision, fileobj) |
|
171 |
finally: |
|
172 |
target_branch.repository.unlock() |
|
1185.82.10
by John Arbash Meinel
Worked out the changeset command. |
173 |
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
174 |
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
175 |
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. |
176 |
"""Read a written changeset, and make sure it is valid.
|
177 |
||
178 |
"""
|
|
179 |
takes_args = ['filename?'] |
|
180 |
||
181 |
def run(self, filename=None): |
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
182 |
from read_changeset import read_changeset |
0.5.103
by John Arbash Meinel
Updated to having a changeset specific message. |
183 |
#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. |
184 |
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
185 |
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. |
186 |
|
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 |
if filename is None or filename == '-': |
188 |
f = sys.stdin |
|
189 |
else: |
|
0.5.33
by John Arbash Meinel
Use universal newlines wherever appropriate. |
190 |
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. |
191 |
|
0.5.88
by John Arbash Meinel
Fixed a bug in the rename code, added more tests. |
192 |
cset_info, cset_tree = read_changeset(f, b) |
0.5.103
by John Arbash Meinel
Updated to having a changeset specific message. |
193 |
# print cset_info
|
194 |
# print cset_tree
|
|
195 |
#serializer_v4.write(cset_tree.inventory, sys.stdout)
|