← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to diff.h

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-04-22 13:31:05 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20070422133105-tkmhz328g2p0epz1
Tags: 1:1.5.1.2-1
* new upstream point release.
* debian/changelog.upstream: upstream changes taken from mailing list
  announcement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.h
29
29
#define DIFF_FORMAT_NUMSTAT     0x0004
30
30
#define DIFF_FORMAT_SUMMARY     0x0008
31
31
#define DIFF_FORMAT_PATCH       0x0010
 
32
#define DIFF_FORMAT_SHORTSTAT   0x0020
32
33
 
33
34
/* These override all above */
34
35
#define DIFF_FORMAT_NAME        0x0100
55
56
                 silent_on_remove:1,
56
57
                 find_copies_harder:1,
57
58
                 color_diff:1,
58
 
                 color_diff_words:1;
 
59
                 color_diff_words:1,
 
60
                 has_changes:1,
 
61
                 quiet:1,
 
62
                 exit_with_status:1;
59
63
        int context;
60
64
        int break_opt;
61
65
        int detect_rename;
74
78
        int stat_width;
75
79
        int stat_name_width;
76
80
 
 
81
        /* this is set by diffcore for DIFF_FORMAT_PATCH */
 
82
        int found_changes;
 
83
 
77
84
        int nr_paths;
78
85
        const char **paths;
79
86
        int *pathlens;
143
150
                        const char *base, const char *path);
144
151
 
145
152
extern void diff_unmerge(struct diff_options *,
146
 
                         const char *path);
 
153
                         const char *path,
 
154
                         unsigned mode,
 
155
                         const unsigned char *sha1);
147
156
 
148
157
extern int diff_scoreopt_parse(const char *opt);
149
158
 
164
173
 
165
174
extern void diffcore_std(struct diff_options *);
166
175
 
167
 
extern void diffcore_std_no_resolve(struct diff_options *);
168
 
 
169
176
#define COMMON_DIFF_OPTIONS_HELP \
170
177
"\ncommon diff options:\n" \
171
178
"  -z            output diff-raw with lines terminated with NUL.\n" \
216
223
extern const char *diff_unique_abbrev(const unsigned char *, int);
217
224
 
218
225
extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
 
226
extern int setup_diff_no_index(struct rev_info *revs,
 
227
                int argc, const char ** argv, int nongit, const char *prefix);
 
228
extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
219
229
 
220
230
extern int run_diff_index(struct rev_info *revs, int cached);
221
231
 
 
232
extern int do_diff_cache(const unsigned char *, struct diff_options *);
222
233
extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
223
234
 
224
235
#endif /* DIFF_H */