equal
deleted
inserted
replaced
554 |
554 |
555 if el == lout: # perfect match (fast) |
555 if el == lout: # perfect match (fast) |
556 postout.append(" " + lout) |
556 postout.append(" " + lout) |
557 elif (el and |
557 elif (el and |
558 (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or |
558 (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or |
559 el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)) or |
559 el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout) |
560 el.endswith(" (esc)\n") and el.decode('string-escape') == l): |
560 or el.endswith(" (esc)\n") and |
|
561 el.decode('string-escape') == l)): |
561 postout.append(" " + el) # fallback regex/glob/esc match |
562 postout.append(" " + el) # fallback regex/glob/esc match |
562 else: |
563 else: |
563 if needescape(lout): |
564 if needescape(lout): |
564 lout = stringescape(lout.rstrip('\n')) + " (esc)\n" |
565 lout = stringescape(lout.rstrip('\n')) + " (esc)\n" |
565 postout.append(" " + lout) # let diff deal with it |
566 postout.append(" " + lout) # let diff deal with it |