FilesExpand file tree

 master

/

diff-no-index.c

Copy path

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

277 lines (238 loc) · 6.3 KB

 master

/

diff-no-index.c

Copy path

Top

File metadata and controls

• Code
• Blame

277 lines (238 loc) · 6.3 KB

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

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

207

208

209

210

211

212

213

214

215

216

217

218

219

220

221

222

223

224

225

226

227

228

229

230

231

232

233

234

235

236

237

238

239

240

241

242

243

244

245

246

247

248

249

250

251

252

253

254

255

256

257

258

259

260

261

262

263

264

265

266

267

268

269

270

271

272

273

274

275

276

277

/*

* "diff --no-index" support

* Copyright (c) 2007 by Johannes Schindelin

* Copyright (c) 2008 by Junio C Hamano

*/

#include "cache.h"

#include "color.h"

#include "commit.h"

#include "blob.h"

#include "tag.h"

#include "diff.h"

#include "diffcore.h"

#include "revision.h"

#include "log-tree.h"

#include "builtin.h"

#include "string-list.h"

static int read_directory(const char *path, struct string_list *list)

{

DIR *dir;

struct dirent *e;

if (!(dir = opendir(path)))

return error("Could not open directory %s", path);

while ((e = readdir(dir)))

if (strcmp(".", e->d_name) && strcmp("..", e->d_name))

string_list_insert(list, e->d_name);

closedir(dir);

return 0;

}

/*

* This should be "(standard input)" or something, but it will

* probably expose many more breakages in the way no-index code

* is bolted onto the diff callchain.

*/

static const char file_from_standard_input[] = "-";

static int get_mode(const char *path, int *mode)

{

struct stat st;

if (!path || !strcmp(path, "/dev/null"))

*mode = 0;

#ifdef _WIN32

else if (!strcasecmp(path, "nul"))

*mode = 0;

#endif

else if (path == file_from_standard_input)

*mode = create_ce_mode(0666);

else if (lstat(path, &st))

return error("Could not access '%s'", path);

else

*mode = st.st_mode;

return 0;

}

static int populate_from_stdin(struct diff_filespec *s)

{

struct strbuf buf = STRBUF_INIT;

size_t size = 0;

if (strbuf_read(&buf, 0, 0) < 0)

return error("error while reading from stdin %s",

strerror(errno));

s->should_munmap = 0;

s->data = strbuf_detach(&buf, &size);

s->size = size;

s->should_free = 1;

s->is_stdin = 1;

return 0;

}

static struct diff_filespec *noindex_filespec(const char *name, int mode)

{

struct diff_filespec *s;

if (!name)

name = "/dev/null";

s = alloc_filespec(name);

fill_filespec(s, null_sha1, 0, mode);

if (name == file_from_standard_input)

populate_from_stdin(s);

return s;

}

static int queue_diff(struct diff_options *o,

const char *name1, const char *name2)

{

int mode1 = 0, mode2 = 0;

if (get_mode(name1, &mode1) || get_mode(name2, &mode2))

return -1;

if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))

return error("file/directory conflict: %s, %s", name1, name2);

if (S_ISDIR(mode1) || S_ISDIR(mode2)) {

struct strbuf buffer1 = STRBUF_INIT;

struct strbuf buffer2 = STRBUF_INIT;

struct string_list p1 = STRING_LIST_INIT_DUP;

struct string_list p2 = STRING_LIST_INIT_DUP;

int i1, i2, ret = 0;

size_t len1 = 0, len2 = 0;

if (name1 && read_directory(name1, &p1))

return -1;

if (name2 && read_directory(name2, &p2)) {

string_list_clear(&p1, 0);

return -1;

}

if (name1) {

strbuf_addstr(&buffer1, name1);

if (buffer1.len && buffer1.buf[buffer1.len - 1] != '/')

strbuf_addch(&buffer1, '/');

len1 = buffer1.len;

}

if (name2) {

strbuf_addstr(&buffer2, name2);

if (buffer2.len && buffer2.buf[buffer2.len - 1] != '/')

strbuf_addch(&buffer2, '/');

len2 = buffer2.len;

}

for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {

const char *n1, *n2;

int comp;

strbuf_setlen(&buffer1, len1);

strbuf_setlen(&buffer2, len2);

if (i1 == p1.nr)

comp = 1;

else if (i2 == p2.nr)

comp = -1;

else

comp = strcmp(p1.items[i1].string, p2.items[i2].string);

if (comp > 0)

n1 = NULL;

else {

strbuf_addstr(&buffer1, p1.items[i1++].string);

n1 = buffer1.buf;

}

if (comp < 0)

n2 = NULL;

else {

strbuf_addstr(&buffer2, p2.items[i2++].string);

n2 = buffer2.buf;

}

ret = queue_diff(o, n1, n2);

}

string_list_clear(&p1, 0);

string_list_clear(&p2, 0);

strbuf_release(&buffer1);

strbuf_release(&buffer2);

return ret;

} else {

struct diff_filespec *d1, *d2;

if (DIFF_OPT_TST(o, REVERSE_DIFF)) {

unsigned tmp;

const char *tmp_c;

tmp = mode1; mode1 = mode2; mode2 = tmp;

tmp_c = name1; name1 = name2; name2 = tmp_c;

}

d1 = noindex_filespec(name1, mode1);

d2 = noindex_filespec(name2, mode2);

diff_queue(&diff_queued_diff, d1, d2);

return 0;

}

}

void diff_no_index(struct rev_info *revs,

int argc, const char **argv,

int nongit, const char *prefix)

{

int i, prefixlen;

int no_index = 0;

unsigned options = 0;

const char *paths[2];

/* Were we asked to do --no-index explicitly? */

for (i = 1; i < argc; i++) {

if (!strcmp(argv[i], "--")) {

i++;

break;

}

if (!strcmp(argv[i], "--no-index"))

no_index = 1;

if (argv[i][0] != '-')

break;

}

if (!no_index && !nongit) {

/*

* Inside a git repository, without --no-index. Only

* when a path outside the repository is given,

* e.g. "git diff /var/tmp/[12]", or "git diff

* Makefile /var/tmp/Makefile", allow it to be used as

* a colourful "diff" replacement.

*/

if ((argc != i + 2) ||

(path_inside_repo(prefix, argv[i]) &&

path_inside_repo(prefix, argv[i+1])))

return;

}

if (argc != i + 2)

usagef("git diff %s <path> <path>",

no_index ? "--no-index" : "[--no-index]");

diff_setup(&revs->diffopt);

for (i = 1; i < argc - 2; ) {

int j;

if (!strcmp(argv[i], "--no-index"))

i++;

else if (!strcmp(argv[i], "-q")) {

options |= DIFF_SILENT_ON_REMOVED;

i++;

}

else if (!strcmp(argv[i], "--"))

i++;

else {

j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);

if (!j)

die("invalid diff option/value: %s", argv[i]);

i += j;

}

}

prefixlen = prefix ? strlen(prefix) : 0;

for (i = 0; i < 2; i++) {

const char *p = argv[argc - 2 + i];

if (!strcmp(p, "-"))

/*

* stdin should be spelled as "-"; if you have

* path that is "-", spell it as "./-".

*/

p = file_from_standard_input;

else if (prefixlen)

p = xstrdup(prefix_filename(prefix, prefixlen, p));

paths[i] = p;

}

revs->diffopt.skip_stat_unmatch = 1;

if (!revs->diffopt.output_format)

revs->diffopt.output_format = DIFF_FORMAT_PATCH;

DIFF_OPT_SET(&revs->diffopt, NO_INDEX);

revs->max_count = -2;

diff_setup_done(&revs->diffopt);

setup_diff_pager(&revs->diffopt);

DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);

if (queue_diff(&revs->diffopt, paths[0], paths[1]))

exit(1);

diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");

diffcore_std(&revs->diffopt);

diff_flush(&revs->diffopt);

/*

* The return code for --no-index imitates diff(1):

* 0 = no changes, 1 = changes, else error

*/

exit(diff_result_code(&revs->diffopt, 0));

}