/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

• browse files at revision 1092.2.20
• compare with another revision
• download diff
• download tarball
• view history from revision 1092.2.20

• reverse the comparison (1092.2.20 to 1036)
• stop comparing with revision 1036

Show diffs side-by-side

added

removed

bzrlib/diff.py

1

 

#! /usr/bin/env python

2

1

# -*- coding: UTF-8 -*-

3

2

 

4

3

# This program is free software; you can redistribute it and/or modify

45

44

    ud = difflib.unified_diff(oldlines, newlines,

46

45

                              fromfile=old_label, tofile=new_label)

47

46

 

 

47

    ud = list(ud)

48

48

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

49

49

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

50

50

    if not oldlines:

51

 

        ud = list(ud)

52

51

        ud[2] = ud[2].replace('-1,0', '-0,0')

53

52

    elif not newlines:

54

 

        ud = list(ud)

55

53

        ud[2] = ud[2].replace('+1,0', '+0,0')

 

54

    # work around for difflib emitting random spaces after the label

 

55

    ud[0] = ud[0][:-2] + '\n'

 

56

    ud[1] = ud[1][:-2] + '\n'

56

57

 

57

58

    for line in ud:

58

59

        to_file.write(line)

61

62

    print >>to_file

62

63

 

63

64

 

64

 

 

65

 

 

66

65

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

67

66

                  diff_opts):

68

67

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

140

139

    finally:

141

140

        oldtmpf.close()                 # and delete

142

141

        newtmpf.close()

143

 

    

144

 

 

145

 

 

146

 

def show_diff(b, revision, specific_files, external_diff_options=None):

 

142

 

 

143

def show_diff(b, revision, specific_files, external_diff_options=None,

 

144

              revision2=None, output=None):

147

145

    """Shortcut for showing the diff to the working tree.

148

146

 

149

147

    b

155

153

    The more general form is show_diff_trees(), where the caller

156

154

    supplies any two trees.

157

155

    """

158

 

    import sys

 

156

    if output is None:

 

157

        import sys

 

158

        output = sys.stdout

159

159

 

160

 

    if revision == None:

 

160

    if revision is None:

161

161

        old_tree = b.basis_tree()

162

162

    else:

163

 

        old_tree = b.revision_tree(b.lookup_revision(revision))

164

 

        

165

 

    new_tree = b.working_tree()

166

 

 

167

 

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

 

163

        old_tree = b.revision_tree(revision.in_history(b).rev_id)

 

164

 

 

165

    if revision2 is None:

 

166

        new_tree = b.working_tree()

 

167

    else:

 

168

        new_tree = b.revision_tree(revision2.in_history(b).rev_id)

 

169

 

 

170

    show_diff_trees(old_tree, new_tree, output, specific_files,

168

171

                    external_diff_options)

169

172

 

170

173

 

205

208

                          specific_files=specific_files)

206

209

 

207

210

    for path, file_id, kind in delta.removed:

208

 

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

 

211

        print >>to_file, '=== removed %s %r' % (kind, path)

209

212

        if kind == 'file':

210

213

            diff_file(old_label + path,

211

214

                      old_tree.get_file(file_id).readlines(),

212

215

                      DEVNULL, 

213

216

                      [],

214

217

                      to_file)

215

 

 

216

218

    for path, file_id, kind in delta.added:

217

 

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

 

219

        print >>to_file, '=== added %s %r' % (kind, path)

218

220

        if kind == 'file':

219

221

            diff_file(DEVNULL,

220

222

                      [],

221

223

                      new_label + path,

222

224

                      new_tree.get_file(file_id).readlines(),

223

225

                      to_file)

224

 

 

225

226

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

226

 

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

227

 

        if text_modified:

 

227

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

 

228

        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,

 

229

                                    new_label, new_path, new_tree,

 

230

                                    text_modified, kind, to_file, diff_file)

 

231

    for path, file_id, kind in delta.modified:

 

232

        print >>to_file, '=== modified %s %r' % (kind, path)

 

233

        _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,

 

234

                                    new_label, path, new_tree,

 

235

                                    True, kind, to_file, diff_file)

 

236

    

 

237

 

 

238

def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,

 

239

                                new_label, new_path, new_tree, text_modified,

 

240

                                kind, to_file, diff_file):

 

241

    if text_modified:

 

242

        if kind == 'file':

228

243

            diff_file(old_label + old_path,

229

244

                      old_tree.get_file(file_id).readlines(),

230

245

                      new_label + new_path,

231

246

                      new_tree.get_file(file_id).readlines(),

232

247

                      to_file)

233

 

 

234

 

    for path, file_id, kind in delta.modified:

235

 

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

236

 

        if kind == 'file':

237

 

            diff_file(old_label + path,

238

 

                      old_tree.get_file(file_id).readlines(),

239

 

                      new_label + path,

240

 

                      new_tree.get_file(file_id).readlines(),

241

 

                      to_file)

242

 

 

243

 

 

244

 

 

245

 

 

246

 

 

 

248

        elif kind == 'symlink':

 

249

            _diff_symlink(old_tree, new_tree, file_id, to_file)

 

250

            

 

251

def _diff_symlink(old_tree, new_tree, file_id, to_file):

 

252

    t1 = old_tree.get_symlink_target(file_id)

 

253

    t2 = new_tree.get_symlink_target(file_id)

 

254

    print >>to_file, '=== target changed %r => %r' % (t1, t2)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0