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
|
# Copyright (C) the Rugged contributors. All rights reserved.
#
# This file is part of Rugged, distributed under the MIT license.
# For full terms see the included LICENSE file.
module Rugged
class Index
include Enumerable
# call-seq:
# index.diff([options]) -> diff
# index.diff(diffable[, options]) -> diff
#
# The first form returns a diff between the index and the current working
# directory.
#
# The second form returns a diff between the index and the given diffable object.
# +diffable+ can either be a +Rugged::Commit+ or a +Rugged::Tree+.
#
# The index will be used as the "old file" side of the diff, while the working
# directory or the +diffable+ will be used for the "new file" side.
#
# The following options can be passed in the +options+ Hash:
#
# :paths ::
# An array of paths / fnmatch patterns to constrain the diff to a specific
# set of files. Also see +:disable_pathspec_match+.
#
# :max_size ::
# An integer specifying the maximum byte size of a file before a it will
# be treated as binary. The default value is 512MB.
#
# :context_lines ::
# The number of unchanged lines that define the boundary of a hunk (and
# to display before and after the actual changes). The default is 3.
#
# :interhunk_lines ::
# The maximum number of unchanged lines between hunk boundaries before the hunks
# will be merged into a one. The default is 0.
#
# :reverse ::
# If true, the sides of the diff will be reversed.
#
# :force_text ::
# If true, all files will be treated as text, disabling binary attributes & detection.
#
# :ignore_whitespace ::
# If true, all whitespace will be ignored.
#
# :ignore_whitespace_change ::
# If true, changes in amount of whitespace will be ignored.
#
# :ignore_whitespace_eol ::
# If true, whitespace at end of line will be ignored.
#
# :ignore_submodules ::
# if true, submodules will be excluded from the diff completely.
#
# :patience ::
# If true, the "patience diff" algorithm will be used (currenlty unimplemented).
#
# :include_ignored ::
# If true, ignored files will be included in the diff.
#
# :include_untracked ::
# If true, untracked files will be included in the diff.
#
# :include_unmodified ::
# If true, unmodified files will be included in the diff.
#
# :recurse_untracked_dirs ::
# Even if +:include_untracked+ is true, untracked directories will only be
# marked with a single entry in the diff. If this flag is set to true,
# all files under ignored directories will be included in the diff, too.
#
# :disable_pathspec_match ::
# If true, the given +:paths+ will be applied as exact matches, instead of
# as fnmatch patterns.
#
# :deltas_are_icase ::
# If true, filename comparisons will be made with case-insensitivity.
#
# :show_untracked_content ::
# if true, untracked content will be contained in the the diff patch text.
#
# :skip_binary_check ::
# If true, diff deltas will be generated without spending time on binary
# detection. This is useful to improve performance in cases where the actual
# file content difference is not needed.
#
# :include_typechange ::
# If true, type changes for files will not be interpreted as deletion of
# the "old file" and addition of the "new file", but will generate
# typechange records.
#
# :include_typechange_trees ::
# Even if +:include_typechange+ is true, blob -> tree changes will still
# usually be handled as a deletion of the blob. If this flag is set to true,
# blob -> tree changes will be marked as typechanges.
#
# :ignore_filemode ::
# If true, file mode changes will be ignored.
#
# :recurse_ignored_dirs ::
# Even if +:include_ignored+ is true, ignored directories will only be
# marked with a single entry in the diff. If this flag is set to true,
# all files under ignored directories will be included in the diff, too.
def diff(*args)
options = args.last.is_a?(Hash) ? args.pop : {}
other = args.shift
case other
when nil
diff_index_to_workdir options
when ::Rugged::Commit
diff_tree_to_index other.tree, options
when ::Rugged::Tree
diff_tree_to_index other, options
else
raise TypeError, "A Rugged::Commit or Rugged::Tree instance is required"
end
end
def to_s
s = "#<Rugged::Index\n"
self.each do |entry|
s << " [#{entry[:stage]}] '#{entry[:path]}'\n"
end
s + '>'
end
end
end
|
