mercurial/templater.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 support installation of templates in fhs.

mercurial/help.py | 6 4 + 2 - 0 !
1 file changed, 4 insertions(+), 2 deletions(-)

 support installation of help topics in fhs.

hgeditor | 2 1 + 1 - 0 !
i18n/da.po | 7 4 + 3 - 0 !
i18n/de.po | 11 6 + 5 - 0 !
i18n/el.po | 4 2 + 2 - 0 !
i18n/fr.po | 4 2 + 2 - 0 !
i18n/it.po | 6 3 + 3 - 0 !
i18n/ja.po | 13 7 + 6 - 0 !
i18n/pt_BR.po | 14 8 + 6 - 0 !
i18n/ro.po | 7 4 + 3 - 0 !
i18n/ru.po | 14 8 + 6 - 0 !
i18n/sv.po | 9 5 + 4 - 0 !
i18n/zh_CN.po | 4 2 + 2 - 0 !
i18n/zh_TW.po | 6 3 + 3 - 0 !
mercurial/commands.py | 4 2 + 2 - 0 !
mercurial/help/config.txt | 3 2 + 1 - 0 !
mercurial/help/environment.txt | 2 1 + 1 - 0 !
mercurial/ui.py | 2 1 + 1 - 0 !
17 files changed, 61 insertions(+), 51 deletions(-)

---

hgext/hgk.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

hgext/bugzilla.py | 3 2 + 1 - 0 !
hgext/convert/bzr.py | 3 2 + 1 - 0 !
hgext/convert/common.py | 5 3 + 2 - 0 !
hgext/convert/cvs.py | 2 1 + 1 - 0 !
hgext/convert/darcs.py | 5 3 + 2 - 0 !
hgext/convert/git.py | 2 1 + 1 - 0 !
hgext/convert/gnuarch.py | 3 2 + 1 - 0 !
hgext/convert/monotone.py | 2 1 + 1 - 0 !
hgext/convert/subversion.py | 12 9 + 3 - 0 !
mercurial/hgweb/server.py | 6 4 + 2 - 0 !
10 files changed, 28 insertions(+), 15 deletions(-)

---

hgext/zeroconf/__init__.py | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

---

mercurial/i18n.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 look for *.mo files in /usr/share/locale (fhs compliant)

setup.py | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 disabled hginstallscripts @libdir@ replacement in setup.py.

tests/run-tests.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 don't rm /usr/bin/python when running the testsuite
 mercurial tries to delete /usr/bin/python when running the testsuite
 with "make tests TESTFLAGS=--with-hg=/usr/bin/hg".  If you're doing
 it as a user, the testsuite fails because it can't remove it.
 .
 This fixes it at least in Debian.  I'm unsure about other systems.
Bug: http://bz.selenic.com/show_bug.cgi?id=4045

tests/test-shelve.t | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 make test-shelve.t more lenient
 When running on a slower system (eg. MIPS buildd), the age of the shelf can be
 10 seconds or more, resulting in the output alignment changing and thus a test
 failure. This patch makes the spacing be matched more leniently.
Bug: http://bz.selenic.com/show_bug.cgi?id=4124

tests/test-patchbomb.t | 39 28 + 11 - 0 !
1 file changed, 28 insertions(+), 11 deletions(-)

 test-patchbomb.t: work around python change d579866d6419 (issue4188)

Python 2.7.7 and later (as well as some ubuntu/debian packages of
2.7.6) include a fix that makes the email module more pedantically
correct for MIME boundaries, but this breaks our tests. We work around
this by filtering the output of any 'hg email' invocations in the test
that produce MIME messages.

mercurial/encoding.py | 22 22 + 0 - 0 !
1 file changed, 22 insertions(+)

 encoding: add hfsignoreclean to clean out hfs-ignored characters
 According to Apple Technote 1150 (unavailable from Apple as far as I
 can tell, but archived in several places online), HFS+ ignores sixteen
 specific unicode runes when doing path normalization. We need to
 handle those cases, so this function lets us efficiently strip the
 offending characters from a UTF-8 encoded string (which is the only
 way it seems to matter on OS X.)
 .
 This is a fix for CVE-2014-9390

mercurial/pathutil.py | 10 7 + 3 - 0 !
tests/test-commit.t | 17 17 + 0 - 0 !
2 files changed, 24 insertions(+), 3 deletions(-)

 pathauditor: check for codepoints ignored on os x
 This is a fix for CVE-2014-9390

mercurial/pathutil.py | 7 7 + 0 - 0 !
tests/test-commit.t | 36 35 + 1 - 0 !
2 files changed, 42 insertions(+), 1 deletion(-)

 pathauditor: check for windows shortname aliases
 This is a fix for CVE-2014-9390

mercurial/sshpeer.py | 7 6 + 1 - 0 !
1 file changed, 6 insertions(+), 1 deletion(-)

 sshpeer: more thorough shell quoting
 This fixes CVE-2014-9462

mercurial/mpatch.c | 2 1 + 1 - 0 !
tests/test-revlog.t | 15 15 + 0 - 0 !
2 files changed, 16 insertions(+), 1 deletion(-)

---

mercurial/mpatch.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

---

mercurial/subrepo.py | 5 5 + 0 - 0 !
tests/test-subrepo-git.t | 32 32 + 0 - 0 !
2 files changed, 37 insertions(+)

---

hgext/convert/git.py | 20 18 + 2 - 0 !
1 file changed, 18 insertions(+), 2 deletions(-)

---

hgext/convert/git.py | 57 30 + 27 - 0 !
tests/test-convert-git.t | 7 5 + 2 - 0 !
2 files changed, 35 insertions(+), 29 deletions(-)

---

hgext/convert/git.py | 36 0 + 36 - 0 !
1 file changed, 36 deletions(-)

---

hgext/convert/common.py | 3 3 + 0 - 0 !
hgext/convert/git.py | 20 4 + 16 - 0 !
2 files changed, 7 insertions(+), 16 deletions(-)

---

tests/test-convert-git.t | 17 17 + 0 - 0 !
1 file changed, 17 insertions(+)

---

hgext/convert/git.py | 4 4 + 0 - 0 !
tests/test-convert-git.t | 18 18 + 0 - 0 !
tests/test-convert.t | 2 1 + 1 - 0 !
3 files changed, 23 insertions(+), 1 deletion(-)

---

mercurial/cmdutil.py | 2 1 + 1 - 0 !
mercurial/dirstate.py | 2 1 + 1 - 0 !
mercurial/localrepo.py | 6 4 + 2 - 0 !
mercurial/pathutil.py | 16 11 + 5 - 0 !
mercurial/posix.py | 9 8 + 1 - 0 !
mercurial/scmutil.py | 13 10 + 3 - 0 !
mercurial/sshpeer.py | 7 3 + 4 - 0 !
mercurial/subrepo.py | 7 7 + 0 - 0 !
mercurial/util.py | 15 15 + 0 - 0 !
mercurial/windows.py | 11 9 + 2 - 0 !
tests/test-audit-path.t | 99 99 + 0 - 0 !
tests/test-clone.t | 63 63 + 0 - 0 !
tests/test-commandserver.py | 35 35 + 0 - 0 !
tests/test-commandserver.py.out | 24 24 + 0 - 0 !
tests/test-pull.t | 22 22 + 0 - 0 !
tests/test-push-r.t | 26 26 + 0 - 0 !
tests/test-subrepo-git.t | 31 31 + 0 - 0 !
tests/test-subrepo-svn.t | 40 40 + 0 - 0 !
tests/test-subrepo.t | 74 74 + 0 - 0 !
19 files changed, 483 insertions(+), 19 deletions(-)

---