[Python-apps-commits] r11636 - in packages/mercurial/branches/wheezy/debian/patches (2 files)

[vicho at users.alioth.debian.org]

    Date: Sunday, December 21, 2014 @ 18:35:04
  Author: vicho
Revision: 11636

Fix test-commit.t tests in backported patches

In mercurial 2.2.2, memfilectx() doesn't receive the repo as first parameter so drop it.

Modified:
  packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_Windows_shortname_aliases.patch
  packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_codepoints_ignored_on_OS_X.patch

Modified: packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_Windows_shortname_aliases.patch
===================================================================
--- packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_Windows_shortname_aliases.patch	2014-12-21 13:20:20 UTC (rev 11635)
+++ packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_Windows_shortname_aliases.patch	2014-12-21 18:35:04 UTC (rev 11636)
@@ -21,7 +21,7 @@
 +  > u = ui.ui()
 +  > r = hg.repository(u, '.')
 +  > def filectxfn(repo, memctx, path):
-+  >     return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned')
++  >     return context.memfilectx(path, '[hooks]\nupdate = echo owned')
 +  > c = context.memctx(r, [r['tip'].node(), node.nullid],
 +  >                    'evil', [notrc], filectxfn, 0)
 +  > r.commitctx(c)
@@ -39,7 +39,7 @@
 +  > u = ui.ui()
 +  > r = hg.repository(u, '.')
 +  > def filectxfn(repo, memctx, path):
-+  >     return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned')
++  >     return context.memfilectx(path, '[hooks]\nupdate = echo owned')
 +  > c = context.memctx(r, [r['tip'].node(), node.nullid],
 +  >                    'evil', [notrc], filectxfn, 0)
 +  > r.commitctx(c)

Modified: packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_codepoints_ignored_on_OS_X.patch
===================================================================
--- packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_codepoints_ignored_on_OS_X.patch	2014-12-21 13:20:20 UTC (rev 11635)
+++ packages/mercurial/branches/wheezy/debian/patches/from_upstream__pathauditor_check_for_codepoints_ignored_on_OS_X.patch	2014-12-21 18:35:04 UTC (rev 11636)
@@ -22,7 +22,7 @@
 +  > u = ui.ui()
 +  > r = hg.repository(u, '.')
 +  > def filectxfn(repo, memctx, path):
-+  >     return context.memfilectx(repo, path, '[hooks]\nupdate = echo owned')
++  >     return context.memfilectx(path, '[hooks]\nupdate = echo owned')
 +  > c = context.memctx(r, [r['tip'].node(), node.nullid],
 +  >                    'evil', [notrc], filectxfn, 0)
 +  > r.commitctx(c)