##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

opemvms: add specific files and utilities
Jean-Francois Pieronne -
r51894:44001e6f default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,422 b''
1 $!
2 $! Build Python C extension
3 $!
4 $ cc/name=(short,as_is)-
5 /incl=("/python$root/include", "../../mercurial") -
6 [--.mercurial.cext]base85.c
7 $ cc/name=(short,as_is)-
8 /incl=("/python$root/include", "../../mercurial") -
9 [--.mercurial]bdiff.c
10 $ cc/name=(short,as_is)-
11 /incl=("/python$root/include", "../../mercurial") -
12 [--.mercurial.cext]bdiff.c -
13 /obj=[]bdiff-mod.obj
14 $ cc/name=(short,as_is)-
15 /incl=("/python$root/include", "../../mercurial") -
16 [--.mercurial.thirdparty.xdiff]xdiffi.c
17 $ cc/name=(short,as_is)-
18 /incl=("/python$root/include", "../../mercurial") -
19 [--.mercurial.thirdparty.xdiff]xprepare.c
20 $ cc/name=(short,as_is)-
21 /incl=("/python$root/include", "../../mercurial") -
22 [--.mercurial.thirdparty.xdiff]xutils.c
23 $ cc/name=(short,as_is)-
24 /incl=("/python$root/include", "../../mercurial") -
25 [--.mercurial.cext]mpatch.c/obj=mpatch-mod.obj
26 $ cc/name=(short,as_is)-
27 /incl=("/python$root/include", "../../mercurial") -
28 [--.mercurial]mpatch.c
29 $ cc/name=(short,as_is)-
30 /incl=("/python$root/include", "../../mercurial") -
31 /warn=disa=QUESTCOMPARE -
32 [--.mercurial.cext]dirs.c
33 $ cc/name=(short,as_is)-
34 /incl=("/python$root/include", "../../mercurial") -
35 [--.mercurial.cext]charencode.c
36 $ cc/name=(short,as_is)-
37 /incl=("/python$root/include", "../../mercurial") -
38 [--.mercurial.cext]revlog.c
39 $ cc/name=(short,as_is)-
40 /incl=("/python$root/include", "../../mercurial") -
41 [--.mercurial.cext]manifest.c
42 $ cc/name=(short,as_is)-
43 /incl=("/python$root/include", "../../mercurial") -
44 [--.mercurial.cext]pathencode.c
45 $ cc/name=(short,as_is)-
46 /incl=("/python$root/include", "../../mercurial") -
47 /warn=disa=CVTDIFTYPES -
48 [--.mercurial.cext]osutil.c
49 $ cc/name=(short,as_is)-
50 /incl=("/python$root/include", "../../mercurial") -
51 /warn=disa=EXTRASEMI -
52 [--.mercurial.cext]parsers.c
53 $ cc/name=(short,as_is)-
54 /incl=("/python$root/include", "../../mercurial", -
55 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
56 "../python-zstandard/zstd/dictBuilder") -
57 [-.python-zstandard]zstd.c
58 $ cc/name=(short,as_is)-
59 /incl=("/python$root/include", "../../mercurial", -
60 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
61 "../python-zstandard/zstd/dictBuilder") -
62 [-.python-zstandard.c-ext]frameparams.c
63 $ cc/name=(short,as_is)-
64 /incl=("/python$root/include", "../../mercurial", -
65 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
66 "../python-zstandard/zstd/dictBuilder") -
67 [-.python-zstandard.c-ext]compressobj.c
68 $ cc/name=(short,as_is)-
69 /incl=("/python$root/include", "../../mercurial", -
70 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
71 "../python-zstandard/zstd/dictBuilder", -
72 "../python-zstandard/zstd/common") -
73 [-.python-zstandard.c-ext]compressor.c
74 $ cc/name=(short,as_is)-
75 /incl=("/python$root/include", "../../mercurial", -
76 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
77 "../python-zstandard/zstd/dictBuilder") -
78 [-.python-zstandard.c-ext]bufferutil.c
79 $ cc/name=(short,as_is)-
80 /incl=("/python$root/include", "../../mercurial", -
81 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
82 "../python-zstandard/zstd/dictBuilder") -
83 [-.python-zstandard.c-ext]decompressoriterator.c
84 $ cc/name=(short,as_is)-
85 /incl=("/python$root/include", "../../mercurial", -
86 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
87 "../python-zstandard/zstd/dictBuilder", -
88 "../python-zstandard/zstd/common") -
89 [-.python-zstandard.c-ext]decompressor.c
90 $ cc/name=(short,as_is)-
91 /incl=("/python$root/include", "../../mercurial", -
92 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
93 "../python-zstandard/zstd/dictBuilder") -
94 [-.python-zstandard.c-ext]frameparams.c
95 $ cc/name=(short,as_is)-
96 /incl=("/python$root/include", "../../mercurial", -
97 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
98 "../python-zstandard/zstd/dictBuilder") -
99 [-.python-zstandard.c-ext]constants.c
100 $ cc/name=(short,as_is)-
101 /incl=("/python$root/include", "../../mercurial", -
102 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
103 "../python-zstandard/zstd/dictBuilder") -
104 [-.python-zstandard.c-ext]decompressionreader.c
105 $ cc/name=(short,as_is)-
106 /incl=("/python$root/include", "../../mercurial", -
107 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
108 "../python-zstandard/zstd/dictBuilder") -
109 [-.python-zstandard.c-ext]decompressionwriter.c
110 $ cc/name=(short,as_is)-
111 /incl=("/python$root/include", "../../mercurial", -
112 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
113 "../python-zstandard/zstd/dictBuilder") -
114 [-.python-zstandard.c-ext]compressiondict.c
115 $ cc/name=(short,as_is)-
116 /incl=("/python$root/include", "../../mercurial", -
117 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
118 "../python-zstandard/zstd/dictBuilder") -
119 [-.python-zstandard.c-ext]decompressobj.c
120 $ cc/name=(short,as_is)-
121 /incl=("/python$root/include", "../../mercurial", -
122 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
123 "../python-zstandard/zstd/dictBuilder") -
124 [-.python-zstandard.c-ext]compressionwriter.c
125 $ cc/name=(short,as_is)-
126 /incl=("/python$root/include", "../../mercurial", -
127 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
128 "../python-zstandard/zstd/dictBuilder") -
129 [-.python-zstandard.c-ext]compressionreader.c
130 $ cc/name=(short,as_is)-
131 /incl=("/python$root/include", "../../mercurial", -
132 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
133 "../python-zstandard/zstd/dictBuilder") -
134 [-.python-zstandard.c-ext]compressoriterator.c
135 $ cc/name=(short,as_is)-
136 /incl=("/python$root/include", "../../mercurial", -
137 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
138 "../python-zstandard/zstd/dictBuilder") -
139 [-.python-zstandard.c-ext]compressionparams.c
140 $ cc/name=(short,as_is)-
141 /incl=("/python$root/include", "../../mercurial", -
142 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
143 "../python-zstandard/zstd/dictBuilder") -
144 [-.python-zstandard.c-ext]compressionchunker.c
145 $ cc/name=(short,as_is)-
146 /incl=("/python$root/include", "../../mercurial", -
147 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
148 "../python-zstandard/zstd/dictBuilder") -
149 [-.python-zstandard.zstd.common]zstd_common.c
150 $ cc/name=(short,as_is)-
151 /incl=("/python$root/include", "../../mercurial", -
152 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
153 "../python-zstandard/zstd/dictBuilder") -
154 [-.python-zstandard.zstd.common]error_private.c
155 $ cc/name=(short,as_is)-
156 /incl=("/python$root/include", "../../mercurial", -
157 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
158 "../python-zstandard/zstd/dictBuilder", -
159 "../python-zstandard/zstd/common") -
160 /warn=disa=TOOFEWACTUALS -
161 [-.python-zstandard.zstd.compress]zstd_compress.c
162 $ cc/name=(short,as_is)-
163 /incl=("/python$root/include", "../../mercurial", -
164 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
165 "../python-zstandard/zstd/dictBuilder", -
166 "../python-zstandard/zstd/common") -
167 /warn=disa=TOOFEWACTUALS -
168 [-.python-zstandard.zstd.compress]zstd_ldm.c
169 $ cc/name=(short,as_is)-
170 /incl=("/python$root/include", "../../mercurial", -
171 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
172 "../python-zstandard/zstd/dictBuilder", -
173 "../python-zstandard/zstd/common") -
174 /warn=disa=TOOFEWACTUALS -
175 [-.python-zstandard.zstd.compress]zstd_opt.c
176 $ cc/name=(short,as_is)-
177 /incl=("/python$root/include", "../../mercurial", -
178 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
179 "../python-zstandard/zstd/dictBuilder", -
180 "../python-zstandard/zstd/common") -
181 /warn=disa=TOOFEWACTUALS -
182 [-.python-zstandard.zstd.compress]zstd_lazy.c
183 $ cc/name=(short,as_is)-
184 /incl=("/python$root/include", "../../mercurial", -
185 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
186 "../python-zstandard/zstd/dictBuilder", -
187 "../python-zstandard/zstd/common") -
188 [-.python-zstandard.zstd.compress]huf_compress.c
189 $ cc/name=(short,as_is)-
190 /incl=("/python$root/include", "../../mercurial", -
191 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
192 "../python-zstandard/zstd/dictBuilder", -
193 "../python-zstandard/zstd/common") -
194 [-.python-zstandard.zstd.common]entropy_common.c
195 $ cc/name=(short,as_is)-
196 /incl=("/python$root/include", "../../mercurial", -
197 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
198 "../python-zstandard/zstd/dictBuilder", -
199 "../python-zstandard/zstd/common") -
200 [-.python-zstandard.zstd.compress]fse_compress.c
201 $ cc/name=(short,as_is)-
202 /incl=("/python$root/include", "../../mercurial", -
203 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
204 "../python-zstandard/zstd/dictBuilder", -
205 "../python-zstandard/zstd/common") -
206 /warn=disa=TOOFEWACTUALS -
207 [-.python-zstandard.zstd.compress]zstd_fast.c
208 $ cc/name=(short,as_is)-
209 /incl=("/python$root/include", "../../mercurial", -
210 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
211 "../python-zstandard/zstd/dictBuilder", -
212 "../python-zstandard/zstd/common") -
213 [-.python-zstandard.zstd.common]fse_decompress.c
214 $ cc/name=(short,as_is)-
215 /incl=("/python$root/include", "../../mercurial", -
216 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
217 "../python-zstandard/zstd/dictBuilder", -
218 "../python-zstandard/zstd/common") -
219 [-.python-zstandard.zstd.compress]hist.c
220 $ cc/name=(short,as_is)-
221 /incl=("/python$root/include", "../../mercurial", -
222 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
223 "../python-zstandard/zstd/dictBuilder", -
224 "../python-zstandard/zstd/common") -
225 /warn=disa=TOOFEWACTUALS -
226 [-.python-zstandard.zstd.compress]zstd_double_fast.c
227 $ cc/name=(short,as_is)-
228 /incl=("/python$root/include", "../../mercurial", -
229 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
230 "../python-zstandard/zstd/dictBuilder", -
231 "../python-zstandard/zstd/common") -
232 [-.python-zstandard.zstd.common]pool.c
233 $ cc/name=(short,as_is)-
234 /incl=("/python$root/include", "../../mercurial", -
235 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
236 "../python-zstandard/zstd/dictBuilder", -
237 "../python-zstandard/zstd/common") -
238 [-.python-zstandard.zstd.common]xxhash.c
239 $ cc/name=(short,as_is)-
240 /incl=("/python$root/include", "../../mercurial", -
241 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
242 "../python-zstandard/zstd/dictBuilder", -
243 "../python-zstandard/zstd/common") -
244 /warn=disa=TOOFEWACTUALS -
245 [-.python-zstandard.zstd.compress]zstd_compress_sequences.c
246 $ cc/name=(short,as_is)-
247 /incl=("/python$root/include", "../../mercurial", -
248 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
249 "../python-zstandard/zstd/dictBuilder", -
250 "../python-zstandard/zstd/common") -
251 /warn=disa=TOOFEWACTUALS -
252 [-.python-zstandard.zstd.compress]zstd_compress_literals.c
253 $ cc/name=(short,as_is)-
254 /incl=("/python$root/include", "../../mercurial", -
255 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
256 "../python-zstandard/zstd/dictBuilder", -
257 "../python-zstandard/zstd/common") -
258 /warn=disa=TOOFEWACTUALS -
259 [-.python-zstandard.zstd.decompress]zstd_ddict.c
260 $ cc/name=(short,as_is)-
261 /incl=("/python$root/include", "../../mercurial", -
262 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
263 "../python-zstandard/zstd/dictBuilder", -
264 "../python-zstandard/zstd/common") -
265 /warn=disa=TOOFEWACTUALS -
266 [-.python-zstandard.zstd.decompress]zstd_decompress.c
267 $ cc/name=(short,as_is)-
268 /incl=("/python$root/include", "../../mercurial", -
269 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
270 "../python-zstandard/zstd/dictBuilder", -
271 "../python-zstandard/zstd/common") -
272 [-.python-zstandard.zstd.decompress]huf_decompress.c
273 $ cc/name=(short,as_is)-
274 /incl=("/python$root/include", "../../mercurial", -
275 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
276 "../python-zstandard/zstd/dictBuilder", -
277 "../python-zstandard/zstd/common") -
278 /warn=disa=TOOFEWACTUALS -
279 [-.python-zstandard.zstd.decompress]zstd_decompress_block.c
280 $ cc/name=(short,as_is)-
281 /incl=("/python$root/include", "../../mercurial", -
282 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
283 "../python-zstandard/zstd/dictBuilder", -
284 "../python-zstandard/zstd/common") -
285 /warn=disa=TOOFEWACTUALS -
286 [-.python-zstandard.zstd.compress]zstdmt_compress.c
287 $ cc/name=(short,as_is)-
288 /incl=("/python$root/include", "../../mercurial", -
289 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
290 "../python-zstandard/zstd/dictBuilder", -
291 "../python-zstandard/zstd/common") -
292 [-.python-zstandard.zstd.dictBuilder]cover.c
293 $ cc/name=(short,as_is)-
294 /incl=("/python$root/include", "../../mercurial", -
295 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
296 "../python-zstandard/zstd/dictBuilder", -
297 "../python-zstandard/zstd/common") -
298 [-.python-zstandard.zstd.dictBuilder]fastcover.c
299 $ cc/name=(short,as_is)-
300 /incl=("/python$root/include", "../../mercurial", -
301 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
302 "../python-zstandard/zstd/dictBuilder", -
303 "../python-zstandard/zstd/common") -
304 [-.python-zstandard.zstd.dictBuilder]divsufsort.c
305 $ cc/name=(short,as_is)-
306 /incl=("/python$root/include", "../../mercurial", -
307 "../python-zstandard/c-ext", "../python-zstandard/zstd", -
308 "../python-zstandard/zstd/dictBuilder", -
309 "../python-zstandard/zstd/common") -
310 [-.python-zstandard.zstd.dictBuilder]zdict.c
311 $
312 $ link/share=base65.exe sys$input/opt
313 GSMATCH=lequal,1,1000
314 case_sensitive=YES
315 SYMBOL_VECTOR = (PyInit_base85=PROCEDURE)
316 SYMBOL_VECTOR = (PYINIT_BASE85/PyInit_base85=PROCEDURE)
317 base85.obj
318 python$shr/share
319 case_sensitive=NO
320 $
321 $ link/share=bdiff.exe sys$input/opt
322 GSMATCH=lequal,1,1000
323 case_sensitive=YES
324 SYMBOL_VECTOR = (PyInit_bdiff=PROCEDURE)
325 SYMBOL_VECTOR = (PYINIT_BDIFF/PyInit_bdiff=PROCEDURE)
326 bdiff.obj
327 bdiff-mod.obj
328 xdiffi.obj
329 xprepare.obj
330 xutils.obj
331 python$shr/share
332 case_sensitive=NO
333 $
334 $ link/share=mpatch.exe sys$input/opt
335 GSMATCH=lequal,1,1000
336 case_sensitive=YES
337 SYMBOL_VECTOR = (PyInit_mpatch=PROCEDURE)
338 SYMBOL_VECTOR = (PYINIT_MPATCH/PyInit_mpatch=PROCEDURE)
339 mpatch.obj
340 mpatch-mod.obj
341 python$shr/share
342 case_sensitive=NO
343 $
344 $ link/share=osutil.exe sys$input/opt
345 GSMATCH=lequal,1,1000
346 case_sensitive=YES
347 SYMBOL_VECTOR = (PyInit_osutil=PROCEDURE)
348 SYMBOL_VECTOR = (PYINIT_OSUTIL/PyInit_osutil=PROCEDURE)
349 osutil.obj
350 python$shr/share
351 case_sensitive=NO
352 $
353 $ link/share=parsers.exe sys$input/opt
354 GSMATCH=lequal,1,1000
355 case_sensitive=YES
356 SYMBOL_VECTOR = (PyInit_parsers=PROCEDURE)
357 SYMBOL_VECTOR = (PYINIT_PARSERS/PyInit_parsers=PROCEDURE)
358 parsers.obj
359 dirs.obj
360 charencode.obj
361 pathencode.obj
362 revlog.obj
363 manifest.obj
364 python$shr/share
365 case_sensitive=NO
366 $
367 $ link/share=zstd.exe sys$input/opt
368 GSMATCH=lequal,1,1000
369 case_sensitive=YES
370 SYMBOL_VECTOR = (PyInit_zstd=PROCEDURE)
371 SYMBOL_VECTOR = (PYINIT_ZSTD/PyInit_zstd=PROCEDURE)
372 zstd.obj
373 frameparams.obj
374 decompressobj.obj
375 zstd_common.obj
376 compressionreader.obj
377 compressionwriter.obj
378 compressoriterator.obj
379 zstd_compress.obj
380 zstd_opt.obj
381 zstd_lazy.obj
382 huf_compress.obj
383 entropy_common.obj
384 fse_compress.obj
385 fse_decompress.obj
386 zstd_fast.obj
387 zstd_ldm.obj
388 hist.obj
389 zstd_double_fast.obj
390 zstd_compress_sequences.obj
391 zstd_compress_literals.obj
392 zstdmt_compress.obj
393 compressiondict.obj
394 zstd_ddict.obj
395 zstd_decompress.obj
396 zstd_decompress_block.obj
397 zdict.obj
398 huf_decompress.obj
399 compressionparams.obj
400 compressobj.obj
401 decompressionreader.obj
402 compressionchunker.obj
403 decompressionwriter.obj
404 decompressor.obj
405 decompressoriterator.obj
406 compressor.obj
407 divsufsort.obj
408 bufferutil.obj
409 constants.obj
410 error_private.obj
411 cover.obj
412 fastcover.obj
413 pool.obj
414 xxhash.obj
415 python$shr/share
416 case_sensitive=NO
417 $
418 $ delete/noconf *.obj;
419 $ rename zstd.exe [--.mercurial]/log
420 $ rename *.exe [--.mercurial.cext]/log
421 $
422 $ exit
Show file before | Show file after | Hide comments
@@ -0,0 +1,12 b''
1 $!
2 $! Call OpenVMS editor with a conversion from Unix filename syntax to OpenVMS syntax
3 $!
4 $ set proc/par=extend
5 $ ufile = p1
6 $ tovms :== $ MERCURIAL_ROOT:[vms]tovms
7 $ tovms 'ufile'
8 $ vfile = tmpfn
9 $ deassign sys$input
10 $ edit 'vfile'
11 $ purge/nolog 'vfile'
12 $ exit
Show file before | Show file after | Hide comments
@@ -0,0 +1,76 b''
1 $!
2 $! Custom merge tool to help solve merge conflict in OpenVMS
3 $! We recommand to solve this on other system
4 $!
5 $ set proc/par=extend
6 $ mine = p1
7 $ orig = p2
8 $ theirs = p3
9 $ tovms :== $ MERCURIAL_ROOT:[vms]tovms
10 $ merged = p1 + ".hgmerge"
11 $ tovms 'merged'
12 $ merged = tmpfn
13 $
14 $ define DECC$UNIX_LEVEL 90
15 $ gdiff3 :== $ MERCURIAL_ROOT:[vms]gdiff3
16 $ gdiff == "$ MERCURIAL_ROOT:[VMS]gdiff"
17 $! gdiff -u 'orig' 'mine'
18 $! gdiff -u 'orig' 'theirs'
19 $ if (f$search("''merged'") .nes. "") then -
20 delete 'merged';*
21 $ define sys$output 'merged'
22 $ gdiff3 -"L" mine -"L" original -"L" theirs -"E" -m 'mine' 'orig' 'theirs'
23 $ status = $status
24 $ deassign sys$output
25 $ convert/fdl=mercurial_root:[vms]stmlf.fdl 'merged' 'merged'
26 $ purge/nolog 'merged'
27 $! No conflicts found. Merge done.
28 $ if status .eqs. "%X006C8009"
29 $ then
30 $ tovms 'p1'
31 $ mine = tmpfn
32 $ rename 'merged' 'mine'
33 $ purge/nolog 'mine'
34 $ write sys$output "Merged ''mine'"
35 $ exit 1
36 $ endif
37 $
38 $! In all other cases, diff3 has found conflicts, added the proper conflict
39 $! markers to the merged file and we should now edit this file. Fire up an
40 $! editor with the merged file and let the user manually resolve the conflicts.
41 $! When the editor exits successfully, there should be no conflict markers in
42 $! the merged file, otherwise we consider this merge failed.
43 $
44 $ if status .eqs. "%X006C8013"
45 $ then
46 $ deassign sys$input
47 $ edit 'merged'
48 $ open fi 'merged'
49 $ loop:
50 $ read fi srec/end=endloop
51 $ rec7 = f$extract(0, 7, srec)
52 $ if rec7 .eqs. "<<<<<<<" then goto conflict
53 $ if rec7 .eqs. "|||||||" then goto conflict
54 $ if rec7 .eqs. "=======" then goto conflict
55 $ if rec7 .eqs. ">>>>>>>" then goto conflict
56 $ goto loop
57 $ endloop:
58 $ close fi
59 $ tovms 'p1'
60 $ mine = tmpfn
61 $ rename 'merged' 'mine'
62 $ purge/nolog 'mine'
63 $ exit
64 $ endif
65 $ if (f$search("''merged'") .nes. "") then -
66 delete 'merged';*
67 $ write sys$output "serious diff3 error, while trying to merge ''mine'"
68 $ exit 44
69 $
70 $ conflict:
71 $ close fi
72 $ if (f$search("''merged'") .nes. "") then -
73 delete 'merged';*
74 $ write sys$output -
75 "conflict markers still found in the working-copy. Merge aborted for ''mine'"
76 $ exit 44
Show file before | Show file after | Hide comments
@@ -0,0 +1,20 b''
1 $!
2 $! Define mercurial_root logical
3 $! p1: define parameter (/system for example)
4 $!
5 $ proc = f$environment("PROCEDURE")
6 $ proc = f$parse(proc,"sys$disk:[]",,,"NO_CONCEAL")
7 $ cur_dev = f$parse(proc,,,"DEVICE","SYNTAX_ONLY")
8 $ cur_dir = f$parse(proc,,,"DIRECTORY","SYNTAX_ONLY")
9 $ cur_dir = f$extract(1,f$length(cur_dir)-2,cur_dir)
10 $ cur_dir = cur_dir - "["
11 $ cur_dir = cur_dir - "]"
12 $ cur_dir = cur_dir - "<"
13 $ cur_dir = cur_dir - ">"
14 $
15 $! remove trailing .VMS
16 $ root_dir = f$extract(0,f$length(cur_dir)-4,cur_dir)
17 $
18 $ define/nolog 'p1' /trans=concealed mercurial_root 'cur_dev'['root_dir'.]
19 $
20 $ exit
Show file before | Show file after | Hide comments
@@ -0,0 +1,7 b''
1 $!
2 $! Set hg and hgeditor symbol
3 $!
4 $ HG == "$ PYTHON$ROOT:[BIN]PYTHON /MERCURIAL_ROOT/HG"
5 $ HGEDITOR == "@MERCURIAL_ROOT:[VMS]HGEDITOR"
6 $
7 $ exit No newline at end of file
Show file before | Show file after | Hide comments
@@ -0,0 +1,12 b''
1 $!
2 $! Mercurial startup file
3 $!
4 $ proc = f$environment("PROCEDURE")
5 $ cur_dev = f$parse(proc,,,"DEVICE","SYNTAX_ONLY")
6 $ cur_dir = f$parse(proc,,,"DIRECTORY","SYNTAX_ONLY")
7 $!
8 $! Define logicals
9 $!
10 $ @'cur_dev''cur_dir'logicals "/system/exec"
11 $
12 $ exit
Show file before | Show file after | Hide comments
@@ -0,0 +1,7 b''
1 !
2 ! Used by hgmerge.com to convert file to stream_lf record format
3 !
4 RECORD
5 BLOCK_SPAN yes
6 CARRIAGE_CONTROL carriage_return
7 FORMAT stream_lf
General Comments 0
You need to be logged in to leave comments. Login now