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
|
#ifndef __DIFF_PATCH_HH__
#define __DIFF_PATCH_HH__
// Copyright (C) 2002 Graydon Hoare <graydon@pobox.com>
//
// This program is made available under the GNU GPL version 2.0 or
// greater. See the accompanying file COPYING for details.
//
// This program is distributed WITHOUT ANY WARRANTY; without even the
// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE.
#include "app_state.hh"
#include "cert.hh"
#include "vocab.hh"
#include <boost/shared_ptr.hpp>
#include <iostream>
#include <map>
#include <string>
#include <vector>
class roster_t;
struct conflict {};
// this file is to contain some stripped down, in-process implementations
// of GNU-diffutils-like things (diff, diff3, maybe patch..)
void make_diff(std::string const & filename1,
std::string const & filename2,
file_id const & id1,
file_id const & id2,
data const & data1,
data const & data2,
std::ostream & ost,
diff_type type,
std::string const & pattern);
bool merge3(std::vector<std::string> const & ancestor,
std::vector<std::string> const & left,
std::vector<std::string> const & right,
std::vector<std::string> & merged);
struct
content_merge_adaptor
{
virtual void record_merge(file_id const & left_ident,
file_id const & right_ident,
file_id const & merged_ident,
file_data const & left_data,
file_data const & merged_data) = 0;
virtual void get_ancestral_roster(node_id nid,
boost::shared_ptr<roster_t const> & anc) = 0;
virtual void get_version(file_path const & path,
file_id const & ident,
file_data & dat) const = 0;
virtual ~content_merge_adaptor() {}
};
struct
content_merge_database_adaptor
: public content_merge_adaptor
{
app_state & app;
revision_id lca;
marking_map const & mm;
std::map<revision_id, boost::shared_ptr<roster_t const> > rosters;
content_merge_database_adaptor (app_state & app,
revision_id const & left,
revision_id const & right,
marking_map const & mm);
void record_merge(file_id const & left_ident,
file_id const & right_ident,
file_id const & merged_ident,
file_data const & left_data,
file_data const & merged_data);
void get_ancestral_roster(node_id nid,
boost::shared_ptr<roster_t const> & anc);
void get_version(file_path const & path,
file_id const & ident,
file_data & dat) const;
};
struct
content_merge_workspace_adaptor
: public content_merge_adaptor
{
std::map<file_id, file_data> temporary_store;
app_state & app;
boost::shared_ptr<roster_t const> base;
content_merge_workspace_adaptor (app_state & app,
boost::shared_ptr<roster_t const> base)
: app(app), base(base)
{}
void record_merge(file_id const & left_ident,
file_id const & right_ident,
file_id const & merged_ident,
file_data const & left_data,
file_data const & merged_data);
void get_ancestral_roster(node_id nid,
boost::shared_ptr<roster_t const> & anc);
void get_version(file_path const & path,
file_id const & ident,
file_data & dat) const;
};
struct content_merger
{
app_state & app;
roster_t const & anc_ros;
roster_t const & left_ros;
roster_t const & right_ros;
content_merge_adaptor & adaptor;
content_merger(app_state & app,
roster_t const & anc_ros,
roster_t const & left_ros,
roster_t const & right_ros,
content_merge_adaptor & adaptor);
// merge3 on a file (line by line)
bool try_to_merge_files(file_path const & anc_path,
file_path const & left_path,
file_path const & right_path,
file_path const & merged_path,
file_id const & ancestor_id,
file_id const & left_id,
file_id const & right,
file_id & merged_id);
std::string get_file_encoding(file_path const & path,
roster_t const & ros);
bool attribute_manual_merge(file_path const & path,
roster_t const & ros);
};
// Local Variables:
// mode: C++
// fill-column: 76
// c-file-style: "gnu"
// indent-tabs-mode: nil
// End:
// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
#endif // __DIFF_PATCH_HH__
|
