mercurial/mdiff.py
branchstable
changeset 15509 3774e1453ef4
parent 15462 2b1ec74c961f
child 15513 646759147717
equal deleted inserted replaced
15508:00276525e2b7 15509:3774e1453ef4
    70         text = re.sub('[ \t\r]+', '', text)
    70         text = re.sub('[ \t\r]+', '', text)
    71     elif opts.ignorewsamount:
    71     elif opts.ignorewsamount:
    72         text = re.sub('[ \t\r]+', ' ', text)
    72         text = re.sub('[ \t\r]+', ' ', text)
    73         text = text.replace(' \n', '\n')
    73         text = text.replace(' \n', '\n')
    74     if blank and opts.ignoreblanklines:
    74     if blank and opts.ignoreblanklines:
    75         text = re.sub('\n+', '', text)
    75         text = re.sub('\n+', '\n', text).strip('\n')
    76     return text
    76     return text
    77 
    77 
    78 def diffline(revs, a, b, opts):
    78 def diffline(revs, a, b, opts):
    79     parts = ['diff']
    79     parts = ['diff']
    80     if opts.git:
    80     if opts.git: