blob: b36acc3bb2770709a437482a09bf1ab8cba0eea4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
# common_clean.lift
# These reposurgeon scripts are common to all repositories.
# They are run in order:
# 1. common_load.lift
# 2. common_merge.sh
# 3. common_clean.lift
# Set up options
set canonicalize
set progress
prefer git
read --format=git tmp_combined/
prefer git
read --format=git docutils_tmp_late/
prefer git
# Unite the combined histories with Late
# this makes the tip of tmp_combined the root commit for docutils_late
choose tmp_combined
@max(=C) & /~merge histories~/ graft docutils_tmp_late
rename docutils
renumber
# Delete surgery branches
branch delete heads/docutils
branch delete heads/docstring
branch delete heads/structuredtext
branch rename /heads\/(.*)-docutils_tmp_late/ "heads/\1"
# Update metadata of merge commit
# <2002-04-20T03:00:05Z#1> Initial revision (first commit of docutils_late)
# the parent of this commit is the merge commit, we can't rely on commit
# message matching as we blank out the commit message and the date is
# indeterminate
@max(@par(<2002-04-20T03:00:05Z#1>)) assign --singleton merge_commit
merge_commit setfield comment "Combine into Docutils\n\n***Commit added during git conversion***.\n\nMerged projects:\n\n- docutils (SVN)\n- docstring (CVS)\n- structuredtext (CVS)\n"
merge_commit attribution =A set "David Goodger" "goodger@python.org" "Sat Apr 20 02:00:00 2002 +0000"
merge_commit attribution =C set "David Goodger" "goodger@python.org" "Sat Apr 20 02:00:00 2002 +0000"
# Remove merge files
define delete_merge {
<2002-04-20T03:00:05Z#1> add D {0}
}
do delete_merge dps/COPYING.txt
do delete_merge dps/HISTORY.txt
do delete_merge dps/MANIFEST.in
do delete_merge dps/README.txt
do delete_merge dps/dps/__init__.py
do delete_merge dps/dps/core.py
do delete_merge dps/dps/languages/__init__.py
do delete_merge dps/dps/languages/en.py
do delete_merge dps/dps/nodes.py
do delete_merge dps/dps/parsers/__init__.py
do delete_merge dps/dps/readers/__init__.py
do delete_merge dps/dps/readers/standalone.py
do delete_merge dps/dps/roman.py
do delete_merge dps/dps/statemachine.py
do delete_merge dps/dps/transforms/__init__.py
do delete_merge dps/dps/transforms/components.py
do delete_merge dps/dps/transforms/frontmatter.py
do delete_merge dps/dps/transforms/references.py
do delete_merge dps/dps/transforms/universal.py
do delete_merge dps/dps/urischemes.py
do delete_merge dps/dps/utils.py
do delete_merge dps/dps/writers/__init__.py
do delete_merge dps/dps/writers/html.py
do delete_merge dps/dps/writers/pprint.py
do delete_merge dps/install.py
do delete_merge dps/setup.py
do delete_merge dps/spec/doctree.txt
do delete_merge dps/spec/dps-notes.txt
do delete_merge dps/spec/dps.cat
do delete_merge dps/spec/gpdi.dtd
do delete_merge dps/spec/pep-0256.txt
do delete_merge dps/spec/pep-0257.txt
do delete_merge dps/spec/pep-0258.txt
do delete_merge dps/spec/ppdi.dtd
do delete_merge dps/spec/pysource-reader.txt
do delete_merge dps/spec/soextblx.dtd
do delete_merge dps/test/DPSTestSupport.py
do delete_merge dps/test/UnitTestFolder.py
do delete_merge dps/test/alltests.py
do delete_merge dps/test/difflib.py
do delete_merge dps/test/test_nodes.py
do delete_merge dps/test/test_statemachine.py
do delete_merge dps/test/test_transforms/test_contents.py
do delete_merge dps/test/test_transforms/test_docinfo.py
do delete_merge dps/test/test_transforms/test_doctitle.py
do delete_merge dps/test/test_transforms/test_final_checks.py
do delete_merge dps/test/test_transforms/test_footnotes.py
do delete_merge dps/test/test_transforms/test_hyperlinks.py
do delete_merge dps/test/test_transforms/test_messages.py
do delete_merge dps/test/test_transforms/test_substitutions.py
do delete_merge dps/test/test_utils.py
do delete_merge restructuredtext/COPYING.txt
do delete_merge restructuredtext/HISTORY.txt
do delete_merge restructuredtext/MANIFEST.in
do delete_merge restructuredtext/README.txt
do delete_merge restructuredtext/docs/images/ball1.gif
do delete_merge restructuredtext/docs/images/biohazard.png
do delete_merge restructuredtext/docs/images/title.png
do delete_merge restructuredtext/docs/quickref.html
do delete_merge restructuredtext/docs/quickstart.txt
do delete_merge restructuredtext/install.py
do delete_merge restructuredtext/restructuredtext/__init__.py
do delete_merge restructuredtext/restructuredtext/directives/__init__.py
do delete_merge restructuredtext/restructuredtext/directives/admonitions.py
do delete_merge restructuredtext/restructuredtext/directives/components.py
do delete_merge restructuredtext/restructuredtext/directives/html.py
do delete_merge restructuredtext/restructuredtext/directives/images.py
do delete_merge restructuredtext/restructuredtext/directives/misc.py
do delete_merge restructuredtext/restructuredtext/languages/__init__.py
do delete_merge restructuredtext/restructuredtext/languages/en.py
do delete_merge restructuredtext/restructuredtext/states.py
do delete_merge restructuredtext/restructuredtext/tableparser.py
do delete_merge restructuredtext/setup.py
do delete_merge restructuredtext/spec/alternatives.txt
do delete_merge restructuredtext/spec/directives.txt
do delete_merge restructuredtext/spec/introduction.txt
do delete_merge restructuredtext/spec/problems.txt
do delete_merge restructuredtext/spec/reStructuredText.txt
do delete_merge restructuredtext/spec/rst-notes.txt
do delete_merge restructuredtext/test/RSTTestSupport.py
do delete_merge restructuredtext/test/UnitTestFolder.py
do delete_merge restructuredtext/test/alltests.py
do delete_merge restructuredtext/test/difflib.py
do delete_merge restructuredtext/test/test_states/test_TableParser.py
do delete_merge restructuredtext/test/test_states/test_block_quotes.py
do delete_merge restructuredtext/test/test_states/test_bullet_lists.py
do delete_merge restructuredtext/test/test_states/test_citations.py
do delete_merge restructuredtext/test/test_states/test_comments.py
do delete_merge restructuredtext/test/test_states/test_definition_lists.py
do delete_merge restructuredtext/test/test_states/test_directives/test_admonitions.py
do delete_merge restructuredtext/test/test_states/test_directives/test_contents.py
do delete_merge restructuredtext/test/test_states/test_directives/test_figures.py
do delete_merge restructuredtext/test/test_states/test_directives/test_images.py
do delete_merge restructuredtext/test/test_states/test_directives/test_meta.py
do delete_merge restructuredtext/test/test_states/test_directives/test_test_directives.py
do delete_merge restructuredtext/test/test_states/test_directives/test_unknown.py
do delete_merge restructuredtext/test/test_states/test_doctest_blocks.py
do delete_merge restructuredtext/test/test_states/test_enumerated_lists.py
do delete_merge restructuredtext/test/test_states/test_field_lists.py
do delete_merge restructuredtext/test/test_states/test_footnotes.py
do delete_merge restructuredtext/test/test_states/test_functions.py
do delete_merge restructuredtext/test/test_states/test_inline_markup.py
do delete_merge restructuredtext/test/test_states/test_literal_blocks.py
do delete_merge restructuredtext/test/test_states/test_option_lists.py
do delete_merge restructuredtext/test/test_states/test_outdenting.py
do delete_merge restructuredtext/test/test_states/test_paragraphs.py
do delete_merge restructuredtext/test/test_states/test_section_headers.py
do delete_merge restructuredtext/test/test_states/test_substitutions.py
do delete_merge restructuredtext/test/test_states/test_tables.py
do delete_merge restructuredtext/test/test_states/test_targets.py
do delete_merge restructuredtext/test/test_states/test_transitions.py
do delete_merge restructuredtext/tools/default.css
do delete_merge restructuredtext/tools/html.py
do delete_merge restructuredtext/tools/publish.py
do delete_merge restructuredtext/tools/quicktest.py
do delete_merge restructuredtext/tools/test.txt
# Ensure every commit message ends with a single new line
=C append "\n" --rstrip
=C append "\n"
exit
|
