Mercurial > public > mercurial-scm > hg

comparison mercurial/mdiff.py @ 15437:8f08b635cdce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: always use / in paths in diff Subrepo diffs would sometimes use backslash on windows.
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 07 Nov 2011 02:49:00 +0100
parents 16dc9a32ca04
children f520c9616db5
comparison
equal deleted inserted replaced
15436:18f1bb70462e 15437:8f08b635cdce
97 return '\n' 97 return '\n'
98 98
99 if not a and not b: 99 if not a and not b:
100 return "" 100 return ""
101 epoch = util.datestr((0, 0)) 101 epoch = util.datestr((0, 0))
102
103 fn1 = util.pconvert(fn1)
104 fn2 = util.pconvert(fn2)
102 105
103 if not opts.text and (util.binary(a) or util.binary(b)): 106 if not opts.text and (util.binary(a) or util.binary(b)):
104 if a and b and len(a) == len(b) and a == b: 107 if a and b and len(a) == len(b) and a == b:
105 return "" 108 return ""
106 l = ['Binary file %s has changed\n' % fn1] 109 l = ['Binary file %s has changed\n' % fn1]