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
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
#ifndef __ROSTER_MERGE_HH__
#define __ROSTER_MERGE_HH__
// Copyright (C) 2005 Nathaniel Smith <njs@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 "rev_types.hh"
#include "diff_patch.hh"
#include "roster.hh" // needs full definition of roster_t available
// interactions between conflict types:
// node rename conflicts never participate in structural conflicts
// (e.g., merge <rename a foo; rename b bar>, <rename a bar> could be
// considered to have two conflicts -- 'a' being renamed to both 'foo' and
// 'bar', and 'a' and 'b' both being renamed to 'bar'. Only the former
// occurs; 'b' merges cleanly and will be named 'bar' in the resulting
// manifest.)
//
// renaming the root dir allows these:
// -- _MTN in root
// -- missing root directory
// this is a node that cleanly merged to some name, but that name was somehow
// forbidden. (Currently, the only forbidden name is "_MTN" in the root
// directory.)
struct invalid_name_conflict
{
node_id nid;
std::pair<node_id, path_component> parent_name;
};
struct directory_loop_conflict
{
node_id nid;
std::pair<node_id, path_component> parent_name;
};
// orphaned nodes always merged their name cleanly, so we simply put that name
// here. the node in the resulting roster is detached.
struct orphaned_node_conflict
{
node_id nid;
std::pair<node_id, path_component> parent_name;
};
// our general strategy is to return a (possibly insane) roster, and a list of
// conflicts encountered in that roster. Each conflict encountered in merging
// the roster creates an entry in this list.
// nodes with multiple name conflicts are left detached in the resulting
// roster, with null parent and name fields.
// note that it is possible that the parent node on the left, the right, or
// both, no longer exist in the merged roster. also note that it is possible
// that on one or both sides, they do exist, but already have an entry with
// the given name.
struct multiple_name_conflict
{
node_id nid;
multiple_name_conflict(node_id nid) : nid(nid) {}
std::pair<node_id, path_component> left, right;
};
// this is when two distinct nodes want to have the same name. these nodes
// always each merged their names cleanly. the nodes in the resulting roster
// are both detached.
// only two nodes are possible, because we
// -- only merge two rosters at a time
// -- merge (parent, basename) as a single scalar. If we merged them
// separately, then it would be possible to have one side of a merge
// rename a bunch of files in different directories to all have the same
// basename, and the other side of the merge to move them all into the
// same directory.
// a clean *-merge of a scalar always takes on the value of one parent or
// another, and the requirement here is that each node have a unique (parent,
// basename) tuple, and since our requirement matches our *-merge scalar,
// we're okay.
struct duplicate_name_conflict
{
node_id left_nid, right_nid;
std::pair<node_id, path_component> parent_name;
};
// nodes with attribute conflicts are left attached in the resulting tree (unless
// detached for some other reason), but with the given attribute left out of
// their full_attr_map_t. Note that this doesn't actually leave the resulting
// roster insane (FIXME: we could put an invalid attr value in instead, like a
// pair (false, "foo") (since the second value can only be non-null if the
// first is 'true'). Should we do this?)
struct attribute_conflict
{
node_id nid;
attribute_conflict(node_id nid) : nid(nid) {}
attr_key key; // attr_name?
std::pair<bool, attr_value> left, right;
};
// files with content conflicts are left attached in resulting tree (unless
// detached for some other reason), but with a null content hash.
struct file_content_conflict
{
node_id nid;
file_content_conflict(node_id nid) : nid(nid) {}
file_id left, right;
};
template <> void dump(invalid_name_conflict const & conflict, std::string & out);
template <> void dump(directory_loop_conflict const & conflict, std::string & out);
template <> void dump(orphaned_node_conflict const & conflict, std::string & out);
template <> void dump(multiple_name_conflict const & conflict, std::string & out);
template <> void dump(duplicate_name_conflict const & conflict, std::string & out);
template <> void dump(attribute_conflict const & conflict, std::string & out);
template <> void dump(file_content_conflict const & conflict, std::string & out);
struct roster_merge_result
{
// three main types of conflicts
// - structural conflicts (which have the following subtypes)
// - missing root directory
// - invalid name conflicts
// - duplicate name conflicts
// - orphaned node conflicts
// - multiple name conflicts
// - directory loop conflicts
// - attribute conflicts
// - file content conflicts
bool missing_root_dir;
std::vector<invalid_name_conflict> invalid_name_conflicts;
std::vector<directory_loop_conflict> directory_loop_conflicts;
std::vector<orphaned_node_conflict> orphaned_node_conflicts;
std::vector<multiple_name_conflict> multiple_name_conflicts;
std::vector<duplicate_name_conflict> duplicate_name_conflicts;
std::vector<attribute_conflict> attribute_conflicts;
std::vector<file_content_conflict> file_content_conflicts;
// this roster is sane if is_clean() returns true
roster_t roster;
bool is_clean() const;
bool has_content_conflicts() const;
bool has_non_content_conflicts() const;
void log_conflicts() const;
void report_missing_root_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void report_invalid_name_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void report_directory_loop_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void report_orphaned_node_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void report_multiple_name_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void report_duplicate_name_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void report_attribute_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void report_file_content_conflicts(roster_t const & left,
roster_t const & right,
content_merge_adaptor & adaptor) const;
void clear();
};
template <> void dump(roster_merge_result const & result, std::string & out);
void
roster_merge(roster_t const & left_parent,
marking_map const & left_markings,
std::set<revision_id> const & left_uncommon_ancestors,
roster_t const & right_parent,
marking_map const & right_markings,
std::set<revision_id> const & right_uncommon_ancestors,
roster_merge_result & result);
// 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
|
