~bzr-pqm/bzr/bzr.dev : revision 520

15

# along with this program; if not, write to the Free Software

16

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

17

18

from sets import Set, ImmutableSet

19

18

20

from trace import mutter

19

21

from errors import BzrError

20

22

21

23

22

def internal_diff(old_label, oldlines, new_label, newlines, to_file):

24

25

def _diff_one(oldlines, newlines, to_file, **kw):

23

26

import difflib

24

27

25

28

# FIXME: difflib is wrong if there is no trailing newline.

47

50

newlines[-1] += '\n'

48

51

nonl = True

49

52

50

ud = difflib.unified_diff(oldlines, newlines,

51

fromfile=old_label, tofile=new_label)

53

ud = difflib.unified_diff(oldlines, newlines, **kw)

52

54

53

55

# work-around for difflib being too smart for its own good

54

56

# if /dev/null is "1,0", patch won't recognize it as /dev/null

65

67

print >>to_file

66

68

67

69

68

69

70

def external_diff(old_label, oldlines, new_label, newlines, to_file):

71

"""Display a diff by calling out to the external diff program."""

72

import sys

73

74

if to_file != sys.stdout:

75

raise NotImplementedError("sorry, can't send external diff other than to stdout yet",

76

to_file)

77

78

from tempfile import NamedTemporaryFile

79

from os import system

80

81

oldtmpf = NamedTemporaryFile()

82

newtmpf = NamedTemporaryFile()

83

84

try:

85

# TODO: perhaps a special case for comparing to or from the empty

86

# sequence; can just use /dev/null on Unix

87

88

# TODO: if either of the files being compared already exists as a

89

# regular named file (e.g. in the working directory) then we can

90

# compare directly to that, rather than copying it.

91

92

oldtmpf.writelines(oldlines)

93

newtmpf.writelines(newlines)

94

95

oldtmpf.flush()

96

newtmpf.flush()

97

98

system('diff -u --label %s %s --label %s %s' % (old_label, oldtmpf.name, new_label, newtmpf.name))

99

finally:

100

oldtmpf.close() # and delete

101

newtmpf.close()

102

103

104

105

def diff_file(old_label, oldlines, new_label, newlines, to_file):

106

if False:

107

differ = external_diff

108

else:

109

differ = internal_diff

110

111

differ(old_label, oldlines, new_label, newlines, to_file)

112

113

114

115

70

def show_diff(b, revision, specific_files):

116

71

import sys

117

72

122

77

123

78

new_tree = b.working_tree()

124

79

125

show_diff_trees(old_tree, new_tree, sys.stdout, specific_files)

126

127

128

129

def show_diff_trees(old_tree, new_tree, to_file, specific_files=None):

130

"""Show in text form the changes from one tree to another.

131

132

to_files

133

If set, include only changes to these files.

134

"""

135

136

80

# TODO: Options to control putting on a prefix or suffix, perhaps as a format string

137

81

old_label = ''

138

82

new_label = ''

151

95

for path, file_id, kind in delta.removed:

152

96

print '*** removed %s %r' % (kind, path)

153

97

if kind == 'file':

154

diff_file(old_label + path,

155

old_tree.get_file(file_id).readlines(),

156

DEVNULL,

157

[],

158

to_file)

98

_diff_one(old_tree.get_file(file_id).readlines(),

99

[],

100

sys.stdout,

101

fromfile=old_label + path,

102

tofile=DEVNULL)

159

103

160

104

for path, file_id, kind in delta.added:

161

105

print '*** added %s %r' % (kind, path)

162

106

if kind == 'file':

163

diff_file(DEVNULL,

164

[],

165

new_label + path,

166

new_tree.get_file(file_id).readlines(),

167

to_file)

107

_diff_one([],

108

new_tree.get_file(file_id).readlines(),

109

sys.stdout,

110

fromfile=DEVNULL,

111

tofile=new_label + path)

168

112

169

113

for old_path, new_path, file_id, kind, text_modified in delta.renamed:

170

114

print '*** renamed %s %r => %r' % (kind, old_path, new_path)

171

115

if text_modified:

172

diff_file(old_label + old_path,

173

old_tree.get_file(file_id).readlines(),

174

new_label + new_path,

175

new_tree.get_file(file_id).readlines(),

176

to_file)

116

_diff_one(old_tree.get_file(file_id).readlines(),

117

new_tree.get_file(file_id).readlines(),

118

sys.stdout,

119

fromfile=old_label + old_path,

120

tofile=new_label + new_path)

177

121

178

122

for path, file_id, kind in delta.modified:

179

123

print '*** modified %s %r' % (kind, path)

180

124

if kind == 'file':

181

diff_file(old_label + path,

182

old_tree.get_file(file_id).readlines(),

183

new_label + path,

184

new_tree.get_file(file_id).readlines(),

185

to_file)

186

187

188

189

class TreeDelta(object):

125

_diff_one(old_tree.get_file(file_id).readlines(),

126

new_tree.get_file(file_id).readlines(),

127

sys.stdout,

128

fromfile=old_label + path,

129

tofile=new_label + path)

130

131

132

133

class TreeDelta:

190

134

"""Describes changes from one tree to another.

191

135

192

136

Contains four lists:

216

160

self.modified = []

217

161

self.unchanged = []

218

162

219

220

def touches_file_id(self, file_id):

221

"""Return True if file_id is modified by this delta."""

222

for l in self.added, self.removed, self.modified:

223

for v in l:

224

if v[1] == file_id:

225

return True

226

for v in self.renamed:

227

if v[2] == file_id:

228

return True

229

return False

230

231

232

163

def show(self, to_file, show_ids=False, show_unchanged=False):

233

164

def show_list(files):

234

165

for path, fid, kind in files:

337

268

elif want_unchanged:

338

269

delta.unchanged.append((new_path, file_id, kind))

339

270

else:

340

kind = old_inv.get_file_kind(file_id)

341

271

old_path = old_inv.id2path(file_id)

342

272

if specific_files:

343

273

if not is_inside_any(specific_files, old_path):