Sol Jerome <sol.jerome@gmail.com> [Tue, 17 Aug 2010 17:38:19 -0500] rev 12051
util: avoid using hashlib on Python < 2.5 (issue2278)
The following patch allows the use of python2.4 with a standalone
hashlib rather than assuming that python2.5 is in use when hashlib is
imported successfully.
Matt Mackall <mpm@selenic.com> [Mon, 16 Aug 2010 12:55:42 -0500] rev 12050
templates: add filenolink to raw style (issue2332)
Martin Geisler <mg@aragost.com> [Fri, 13 Aug 2010 10:53:10 +0200] rev 12049
url: limit expansion to safe auth keys (Issue2328)
Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the
prefix and password keys may contain $-signs. So this only add the
username to the list of keys that are expanded.
This also updates the documentation to match.
Martin Geisler <mg@aragost.com> [Fri, 13 Aug 2010 10:10:11 +0200] rev 12048
url: expand vars in all [auth] settings (issue2328)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:55:07 +0200] rev 12047
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:38:43 +0200] rev 12046
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:38:43 +0200] rev 12045
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 16:55:54 -0500] rev 12044
bundlerepo: remove duplication of bundle decompressors
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 16:53:06 -0500] rev 12043
bundle: introduce bundle class
Matt Mackall <mpm@selenic.com> [Wed, 25 Aug 2010 15:33:06 -0500] rev 12042
bundle: unify/refactor unbundle/readbundle