mercurial/templater.py | 2 1 + 1 - 0 !
setup.py | 8 0 + 8 - 0 !
2 files changed, 1 insertion(+), 9 deletions(-)

---

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

---

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 !
setup.py | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

---

setup.py | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

 disabled hginstallscripts @libdir@ replacement in setup.py.

contrib/hg-ssh | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix python interpreter for hg-ssh
 hg-ssh is installed by dh_install instead of setup.py, so it's
 interpreter is not fixed automatically for us.  System-wide commands
 should use /usr/bin/python as the Debian Python Policy recommends.
Bug-Debian: http://bugs.debian.org/654925
Bug-Ubuntu: https://bugs.launchpad.net/bugs/912625

mercurial/context.py | 2 1 + 1 - 0 !
mercurial/copies.py | 4 3 + 1 - 0 !
2 files changed, 4 insertions(+), 2 deletions(-)

 copies: re-include root directory in directory rename detection (issue3511)
Bug: http://bugs.debian.org/698634
Bug-mercurial: http://bz.selenic.com/show_bug.cgi?id=3511

contrib/mergetools.hgrc | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 mergetools.hgrc: set vimdiff to check=changed
Bug: http://bugs.debian.org/701168

contrib/mergetools.hgrc | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 mergetools: vimdiff issue a warning explaining how to abort

contrib/mergetools.hgrc | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 mergetools: refine vimdiff warning message
 We explicitly redraw before echoing the message so that it simply
 displays at the bottom of the window. Also simplifies the message
 printing by using 'echomsg' (which uses 'echohl' internally) and adds
 the names of the software involved for improved Googleability.
Bug: http://bugs.debian.org/701168

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/scmutil.py | 9 6 + 3 - 0 !
tests/test-commit.t | 18 17 + 1 - 0 !
2 files changed, 23 insertions(+), 4 deletions(-)

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

mercurial/scmutil.py | 7 7 + 0 - 0 !
tests/test-commit.t | 36 36 + 0 - 0 !
2 files changed, 43 insertions(+)

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

mercurial/sshrepo.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 | 41 16 + 25 - 0 !
mercurial/parsers.c | 34 14 + 20 - 0 !
2 files changed, 30 insertions(+), 45 deletions(-)

---

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 | 29 29 + 0 - 0 !
2 files changed, 34 insertions(+)

---

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

---

hgext/convert/git.py | 55 30 + 25 - 0 !
1 file changed, 30 insertions(+), 25 deletions(-)

---

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

---

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

---