bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
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.81
by John Arbash Meinel
Cleaning up from pychecker. |
9 |
from bzrlib.commands import Command, register_command, OPTIONS |
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
10 |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
11 |
class cmd_send_changeset(Command): |
|
0.5.24
by John Arbash Meinel
Adding send-changeset from Johan Rydberg |
12 |
"""Send a bundled up changset via mail. |
13 |
||
14 |
If no revision has been specified, the last commited change will
|
|
15 |
be sent.
|
|
16 |
||
|
0.5.30
by John Arbash Meinel
Merging send-changeset updates from jrydberg |
17 |
Subject of the mail can be specified by the --message option,
|
|
0.5.24
by John Arbash Meinel
Adding send-changeset from Johan Rydberg |
18 |
otherwise information from the changeset log will be used.
|
|
0.5.30
by John Arbash Meinel
Merging send-changeset updates from jrydberg |
19 |
|
20 |
A editor will be spawned where the user may enter a description
|
|
21 |
of the changeset. The description can be read from a file with
|
|
22 |
the --file FILE option.
|
|
|
0.5.24
by John Arbash Meinel
Adding send-changeset from Johan Rydberg |
23 |
"""
|
|
0.5.31
by John Arbash Meinel
Some cleanup to the send_changeset work. |
24 |
takes_options = ['revision', 'message', 'file'] |
|
0.5.24
by John Arbash Meinel
Adding send-changeset from Johan Rydberg |
25 |
takes_args = ['to?'] |
26 |
||
|
0.5.31
by John Arbash Meinel
Some cleanup to the send_changeset work. |
27 |
def run(self, to=None, message=None, revision=None, file=None): |
|
0.5.24
by John Arbash Meinel
Adding send-changeset from Johan Rydberg |
28 |
from bzrlib import find_branch |
|
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. |
29 |
from bzrlib.errors import BzrCommandError |
|
0.5.31
by John Arbash Meinel
Some cleanup to the send_changeset work. |
30 |
from send_changeset import send_changeset |
|
0.5.30
by John Arbash Meinel
Merging send-changeset updates from jrydberg |
31 |
|
|
0.5.24
by John Arbash Meinel
Adding send-changeset from Johan Rydberg |
32 |
if isinstance(revision, (list, tuple)): |
33 |
if len(revision) > 1: |
|
34 |
raise BzrCommandError('We do not support rollup-changesets yet.') |
|
35 |
revision = revision[0] |
|
36 |
||
37 |
b = find_branch('.') |
|
38 |
||
39 |
if not to: |
|
40 |
try: |
|
41 |
to = b.controlfile('x-send-address', 'rb').read().strip('\n') |
|
42 |
except: |
|
43 |
raise BzrCommandError('destination address is not known') |
|
44 |
||
|
0.5.31
by John Arbash Meinel
Some cleanup to the send_changeset work. |
45 |
if not isinstance(revision, (list, tuple)): |
46 |
revision = [revision] |
|
|
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 |
send_changeset(b, revision, to, message, file) |
|
0.5.24
by John Arbash Meinel
Adding send-changeset from Johan Rydberg |
49 |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
50 |
class cmd_changeset(Command): |
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
51 |
"""Generate a bundled up changeset. |
52 |
||
53 |
This changeset contains all of the meta-information of a
|
|
54 |
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. |
55 |
|
|
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. |
56 |
BASE - This is the target tree with which you want to merge.
|
57 |
It will be used as the base for all patches. Anyone
|
|
58 |
wanting to merge the changeset will be required to have BASE
|
|
59 |
TARGET - This is the final revision which is desired to be in the
|
|
60 |
changeset. It defaults to the last committed revision. './@'
|
|
61 |
STARTING-REV-ID - All revisions between STARTING-REV and TARGET will
|
|
62 |
be bundled up in the changeset. By default this is
|
|
63 |
chosen as the merge root.
|
|
64 |
(NOT Implemented yet)
|
|
65 |
||
66 |
||
67 |
If --verbose, renames will be given as an 'add + delete' style patch.
|
|
|
0.7.2
by John Arbash Meinel
Re-adding the --revision flag to make inspecting changes easier. |
68 |
If --revision is given, it has several states:
|
69 |
--revision A..B A is chosen as the base and B is chosen as the target
|
|
70 |
--revision A A is chosen as the target, and the base is it's primary parent
|
|
71 |
--revision ..B B is chosen as the target, and the base is it's primary parent
|
|
72 |
--revision A.. ???
|
|
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
73 |
"""
|
|
0.7.2
by John Arbash Meinel
Re-adding the --revision flag to make inspecting changes easier. |
74 |
takes_options = ['verbose', 'revision'] |
|
0.5.70
by John Arbash Meinel
Making BASE optional, defaulting to TARGET.parents[0] |
75 |
takes_args = ['base?', 'target?', 'starting-rev-id?'] |
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
76 |
aliases = ['cset'] |
77 |
||
|
0.7.2
by John Arbash Meinel
Re-adding the --revision flag to make inspecting changes easier. |
78 |
def run(self, base=None, target=None, starting_rev_id=None, verbose=False, revision=None): |
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
79 |
from bzrlib.branch import find_branch |
|
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. |
80 |
from bzrlib.commands import parse_spec |
81 |
from bzrlib.errors import BzrCommandError |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
82 |
from bzrlib import user_encoding |
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
83 |
import gen_changeset |
84 |
import sys |
|
|
0.5.29
by John Arbash Meinel
Added a file to put the changeset into. |
85 |
import codecs |
86 |
||
|
0.7.2
by John Arbash Meinel
Re-adding the --revision flag to make inspecting changes easier. |
87 |
if revision is not None: |
88 |
if (target is not None or base is not None): |
|
89 |
raise BzrCommandError('--revision superceeds base and target') |
|
90 |
if len(revision) == 1: |
|
91 |
target_info = revision[0] |
|
92 |
base_info = None |
|
93 |
elif len(revision) == 2: |
|
94 |
target_info = revision[1] |
|
95 |
base_info = revision[0] |
|
96 |
else: |
|
97 |
raise BzrCommandError('--revision can take at most 2 arguments') |
|
|
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. |
98 |
|
|
0.7.2
by John Arbash Meinel
Re-adding the --revision flag to make inspecting changes easier. |
99 |
target_branch = find_branch('.') |
100 |
target_rev_id = target_branch.lookup_revision(target_info) |
|
|
0.5.71
by John Arbash Meinel
Cleaning up code for latest bzr. |
101 |
base_branch = target_branch |
|
0.7.2
by John Arbash Meinel
Re-adding the --revision flag to make inspecting changes easier. |
102 |
if base_info is not None: |
103 |
base_rev_id = target_branch.lookup_revision(base_info) |
|
104 |
else: |
|
105 |
target_rev = target_branch.get_revision(target_rev_id) |
|
106 |
base_rev_id = target_rev.parents[0].revision_id |
|
|
0.5.70
by John Arbash Meinel
Making BASE optional, defaulting to TARGET.parents[0] |
107 |
else: |
|
0.7.2
by John Arbash Meinel
Re-adding the --revision flag to make inspecting changes easier. |
108 |
if target is None: |
109 |
target = './@' |
|
110 |
b_target_path, target_revno = parse_spec(target) |
|
111 |
target_branch = find_branch(b_target_path) |
|
112 |
if target_revno is None or target_revno == -1: |
|
113 |
target_rev_id = target_branch.last_patch() |
|
114 |
else: |
|
115 |
target_rev_id = target_branch.lookup_revision(target_revno) |
|
116 |
||
117 |
if base is None: |
|
118 |
base_branch = target_branch |
|
119 |
target_rev = target_branch.get_revision(target_rev_id) |
|
120 |
base_rev_id = target_rev.parents[0].revision_id |
|
121 |
else: |
|
122 |
base_path, base_revno = parse_spec(base) |
|
123 |
base_branch = find_branch(base_path) |
|
124 |
if base_revno is None or base_revno == -1: |
|
125 |
base_rev_id = base_branch.last_patch() |
|
126 |
else: |
|
127 |
base_rev_id = base_branch.lookup_revision(base_revno) |
|
|
0.5.70
by John Arbash Meinel
Making BASE optional, defaulting to TARGET.parents[0] |
128 |
|
|
0.5.87
by John Arbash Meinel
Handling international characters, added more test cases. |
129 |
# outf = codecs.getwriter(user_encoding)(sys.stdout,
|
130 |
# errors='replace')
|
|
|
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. |
131 |
|
132 |
if starting_rev_id is not None: |
|
133 |
raise BzrCommandError('Specifying the STARTING-REV-ID' |
|
134 |
' not yet supported') |
|
135 |
||
136 |
gen_changeset.show_changeset(base_branch, base_rev_id, |
|
137 |
target_branch, target_rev_id, |
|
138 |
starting_rev_id, |
|
|
0.5.87
by John Arbash Meinel
Handling international characters, added more test cases. |
139 |
to_file=sys.stdout, include_full_diff=verbose) |
|
0.5.1
by John Arbash Meinel
Just an initial working step. |
140 |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
141 |
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. |
142 |
"""Read a written changeset, and make sure it is valid. |
143 |
||
144 |
"""
|
|
145 |
takes_args = ['filename?'] |
|
146 |
||
147 |
def run(self, filename=None): |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
148 |
import sys |
149 |
from read_changeset import read_changeset |
|
150 |
from bzrlib.branch import find_branch |
|
|
0.5.37
by John Arbash Meinel
Made read_changeset able to spit out 'Revision' entities. |
151 |
from bzrlib.xml import pack_xml |
|
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. |
152 |
|
153 |
b = find_branch('.') |
|
154 |
||
|
0.5.7
by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information. |
155 |
if filename is None or filename == '-': |
156 |
f = sys.stdin |
|
157 |
else: |
|
|
0.5.33
by John Arbash Meinel
Use universal newlines wherever appropriate. |
158 |
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. |
159 |
|
|
0.5.88
by John Arbash Meinel
Fixed a bug in the rename code, added more tests. |
160 |
cset_info, cset_tree = read_changeset(f, b) |
|
0.5.63
by John Arbash Meinel
Moving the validation into part of the reading. |
161 |
print cset_info |
162 |
print cset_tree |
|
|
0.5.88
by John Arbash Meinel
Fixed a bug in the rename code, added more tests. |
163 |
pack_xml(cset_tree.inventory, sys.stdout) |
|
0.5.63
by John Arbash Meinel
Moving the validation into part of the reading. |
164 |
|
|
0.5.61
by John Arbash Meinel
verify-changeset now validates that revision hashes match the expected value. |
165 |
|
|
0.5.7
by John Arbash Meinel
Added a bunch more information about changesets. Can now read back in all of the meta information. |
166 |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
167 |
class cmd_apply_changeset(Command): |
|
0.5.15
by John Arbash Meinel
Created an apply-changeset function, and modified output for better parsing. |
168 |
"""Read in the given changeset, and apply it to the |
169 |
current tree.
|
|
170 |
||
171 |
"""
|
|
172 |
takes_args = ['filename?'] |
|
|
0.5.71
by John Arbash Meinel
Cleaning up code for latest bzr. |
173 |
takes_options = ['reverse', 'auto-commit'] |
|
0.5.15
by John Arbash Meinel
Created an apply-changeset function, and modified output for better parsing. |
174 |
|
|
0.5.18
by John Arbash Meinel
Some minor fixups |
175 |
def run(self, filename=None, reverse=False, auto_commit=False): |
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
176 |
from bzrlib.branch import find_branch |
|
0.5.17
by John Arbash Meinel
adding apply-changset, plus more meta information. |
177 |
import sys |
178 |
import apply_changeset |
|
|
0.5.15
by John Arbash Meinel
Created an apply-changeset function, and modified output for better parsing. |
179 |
|
180 |
b = find_branch('.') # Make sure we are in a branch |
|
181 |
if filename is None or filename == '-': |
|
182 |
f = sys.stdin |
|
183 |
else: |
|
|
0.5.72
by John Arbash Meinel
Switching away from universal newlines, |
184 |
# Actually, we should not use Universal newlines
|
185 |
# as this potentially modifies the patch.
|
|
186 |
# though it seems mailers save attachments with their
|
|
187 |
# own format of the files.
|
|
188 |
f = open(filename, 'rb') |
|
|
0.5.15
by John Arbash Meinel
Created an apply-changeset function, and modified output for better parsing. |
189 |
|
|
0.5.17
by John Arbash Meinel
adding apply-changset, plus more meta information. |
190 |
apply_changeset.apply_changeset(b, f, reverse=reverse, |
191 |
auto_commit=auto_commit) |
|
|
0.5.15
by John Arbash Meinel
Created an apply-changeset function, and modified output for better parsing. |
192 |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
193 |
register_command(cmd_changeset) |
194 |
register_command(cmd_verify_changeset) |
|
195 |
register_command(cmd_apply_changeset) |
|
196 |
register_command(cmd_send_changeset) |
|
|
0.5.41
by aaron.bentley at utoronto
Added non-working ChangesetTree |
197 |
|
|
0.5.81
by John Arbash Meinel
Cleaning up from pychecker. |
198 |
OPTIONS['reverse'] = None |
199 |
OPTIONS['auto-commit'] = None |
|
|
0.5.78
by John Arbash Meinel
Working on test cases, starting with the empty project issues. |
200 |
|
201 |
def test_suite(): |
|
|
0.5.79
by John Arbash Meinel
Added common to the set of tests, fixed a problem with time conversions. |
202 |
from doctest import DocTestSuite |
203 |
from unittest import TestSuite, TestLoader |
|
|
0.5.78
by John Arbash Meinel
Working on test cases, starting with the empty project issues. |
204 |
import testchangeset |
|
0.5.79
by John Arbash Meinel
Added common to the set of tests, fixed a problem with time conversions. |
205 |
import common |
|
0.5.93
by Aaron Bentley
Added patches.py |
206 |
import patches |
|
0.5.79
by John Arbash Meinel
Added common to the set of tests, fixed a problem with time conversions. |
207 |
|
208 |
suite = TestSuite() |
|
209 |
||
210 |
suite.addTest(TestLoader().loadTestsFromModule(testchangeset)) |
|
|
0.5.93
by Aaron Bentley
Added patches.py |
211 |
suite.addTest(TestLoader().loadTestsFromModule(patches)) |
|
0.5.79
by John Arbash Meinel
Added common to the set of tests, fixed a problem with time conversions. |
212 |
suite.addTest(DocTestSuite(common)) |
213 |
||
214 |
return suite |
|
215 |
||
|
0.5.78
by John Arbash Meinel
Working on test cases, starting with the empty project issues. |
216 |