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
|
#ifndef __DIFF_PATCH_HH__
#define __DIFF_PATCH_HH__
// copyright (C) 2002, 2003 graydon hoare <graydon@pobox.com>
// all rights reserved.
// licensed to the public under the terms of the GNU GPL (>= 2)
// see the file COPYING for details
#include "app_state.hh"
#include "cert.hh"
#include "vocab.hh"
#include <string>
#include <vector>
#include <iostream>
struct conflict {};
// this file is to contain some stripped down, in-process implementations
// of GNU-diffutils-like things (diff, diff3, maybe patch..)
bool guess_binary(std::string const & s);
enum diff_type
{
unified_diff,
context_diff
};
void make_diff(std::string const & filename1,
std::string const & filename2,
std::vector<std::string> const & lines1,
std::vector<std::string> const & lines2,
std::ostream & ost,
diff_type type);
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 merge_provider
{
app_state & app;
manifest_map const & anc_man;
manifest_map const & left_man;
manifest_map const & right_man;
merge_provider(app_state & app,
manifest_map const & anc_man,
manifest_map const & left_man,
manifest_map const & right_man);
// merge3 on a file (line by line)
virtual 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);
// merge2 on a file (line by line)
virtual bool try_to_merge_files(file_path const & left_path,
file_path const & right_path,
file_path const & merged_path,
file_id const & left_id,
file_id const & right_id,
file_id & merged);
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);
virtual void get_version(file_path const & path,
file_id const & ident,
file_data & dat);
virtual std::string get_file_encoding(file_path const & path,
manifest_map const & man);
virtual ~merge_provider() {}
};
struct update_merge_provider : public merge_provider
{
std::map<file_id, file_data> temporary_store;
update_merge_provider(app_state & app,
manifest_map const & anc_man,
manifest_map const & left_man,
manifest_map const & right_man);
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);
virtual void get_version(file_path const & path,
file_id const & ident,
file_data & dat);
virtual std::string get_file_encoding(file_path const & path,
manifest_map const & man);
virtual ~update_merge_provider() {}
};
#endif // __DIFF_PATCH_HH__
|
