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
|
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title>merge (WFO)</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
</head>
<body class="standalone-code">
<pre><span class="ruby-comment cmt"># File wfo/main.rb, line 219</span>
<span class="ruby-keyword kw">def</span> <span class="ruby-identifier">merge</span>(<span class="ruby-identifier">local_text</span>, <span class="ruby-identifier">original_text</span>, <span class="ruby-identifier">remote_text</span>)
<span class="ruby-identifier">original_file</span> = <span class="ruby-identifier">tempfile</span>(<span class="ruby-value str">"wfo.original"</span>, <span class="ruby-identifier">original_text</span>)
<span class="ruby-identifier">local_file</span> = <span class="ruby-identifier">tempfile</span>(<span class="ruby-value str">"wfo.local"</span>, <span class="ruby-identifier">local_text</span>)
<span class="ruby-identifier">remote_file</span> = <span class="ruby-identifier">tempfile</span>(<span class="ruby-value str">"wfo.remote"</span>, <span class="ruby-identifier">remote_text</span>)
<span class="ruby-identifier">command</span> = [<span class="ruby-value str">'diff3'</span>, <span class="ruby-value str">'-mE'</span>,
<span class="ruby-value str">'-L'</span>, <span class="ruby-value str">'edited by you'</span>,
<span class="ruby-value str">'-L'</span>, <span class="ruby-value str">'before edited'</span>,
<span class="ruby-value str">'-L'</span>, <span class="ruby-value str">'edited by others'</span>,
<span class="ruby-identifier">local_file</span>.<span class="ruby-identifier">path</span>,
<span class="ruby-identifier">original_file</span>.<span class="ruby-identifier">path</span>,
<span class="ruby-identifier">remote_file</span>.<span class="ruby-identifier">path</span>]
<span class="ruby-identifier">merged</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">popen</span>(<span class="ruby-constant">Escape</span>.<span class="ruby-identifier">shell_command</span>(<span class="ruby-identifier">command</span>), <span class="ruby-value str">'r'</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
<span class="ruby-identifier">f</span>.<span class="ruby-identifier">read</span>
}
<span class="ruby-identifier">status</span> = <span class="ruby-identifier">$?</span>
<span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">status</span>.<span class="ruby-identifier">exited?</span>
<span class="ruby-identifier">raise</span> <span class="ruby-node">"[bug] unexpected diff3 failure: #{status.inspect}"</span>
<span class="ruby-keyword kw">end</span>
<span class="ruby-keyword kw">case</span> <span class="ruby-identifier">status</span>.<span class="ruby-identifier">exitstatus</span>
<span class="ruby-keyword kw">when</span> <span class="ruby-value">0</span>
<span class="ruby-identifier">conflict</span> = <span class="ruby-keyword kw">false</span>
<span class="ruby-keyword kw">when</span> <span class="ruby-value">1</span>
<span class="ruby-identifier">conflict</span> = <span class="ruby-keyword kw">true</span>
<span class="ruby-keyword kw">when</span> <span class="ruby-value">2</span>
<span class="ruby-identifier">raise</span> <span class="ruby-value str">"diff3 failed"</span>
<span class="ruby-keyword kw">else</span>
<span class="ruby-identifier">raise</span> <span class="ruby-node">"[bug] unexpected diff3 status: #{status.inspect}"</span>
<span class="ruby-keyword kw">end</span>
<span class="ruby-keyword kw">return</span> <span class="ruby-identifier">merged</span>, <span class="ruby-identifier">conflict</span>
<span class="ruby-keyword kw">end</span></pre>
</body>
</html>
|
