Mercurial > hg
view tests/test-demandimport @ 7104:9514cbb6e4f6
bdiff: normalize the diff (issue1295)
When the common part of a diff can be moved forward, move it forward.
Otherwise we don't get deterministic results (it would depends on the way we
split for the recursion).
That way we get identical hunks when doing the same change, it helps to solve
issue1295 (inconsistent diffs on different side during a merge).
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 14 Oct 2008 20:13:53 +0200 |
parents | 3a4310e8fe72 |
children | 9626819b2e3d |
line wrap: on
line source
#!/usr/bin/env python from mercurial import demandimport demandimport.enable() import re rsub = re.sub def f(obj): l = repr(obj) l = rsub("0x[0-9a-fA-F]+", "0x?", l) l = rsub("from '.*'", "from '?'", l) return l import os print "os =", f(os) print "os.system =", f(os.system) print "os =", f(os) import mercurial.version print "mercurial.version =", f(mercurial.version) print "mercurial.version.get_version =", f(mercurial.version.get_version) print "mercurial.version =", f(mercurial.version) print "mercurial =", f(mercurial) from mercurial import util print "util =", f(util) print "util.system =", f(util.system) print "util =", f(util) print "util.system =", f(util.system) import re as fred print "fred =", f(fred) import sys as re print "re =", f(re) print "fred =", f(fred) print "fred.sub =", f(fred.sub) print "fred =", f(fred) print "re =", f(re) print "re.stdout =", f(re.stdout) print "re =", f(re)