Commits

Anonymous committed 5a1ccc3

Updated to support the patch EOL options introduced in Mercurial revision ac92775b3b80.

This allows the histedit extension to be used in conjunction with the win32text extension.

  • Participants
  • Parent commits 114a7d6

Comments (0)

Files changed (1)

     try:
         files = {}
         try:
-            patch.patch(patchfile, ui, cwd=repo.root, files=files)
+            patch.patch(patchfile, ui, cwd=repo.root, files=files, eolmode=None)
             if not files:
                 ui.warn(_('%s: empty changeset')
                              % node.hex(ha))
     try:
         files = {}
         try:
-            patch.patch(patchfile, ui, cwd=repo.root, files=files)
+            patch.patch(patchfile, ui, cwd=repo.root, files=files, eolmode=None)
         finally:
             files = patch.updatedir(ui, repo, files)
             os.unlink(patchfile)
     try:
         files = {}
         try:
-            patch.patch(patchfile, ui, cwd=repo.root, files=files)
+            patch.patch(patchfile, ui, cwd=repo.root, files=files, eolmode=None)
             if not files:
                 ui.warn(_('%s: empty changeset')
                              % node.hex(ha))
     fp.close()
     files = {}
     try:
-        patch.patch(patchfile, ui, cwd=repo.root, files=files)
+        patch.patch(patchfile, ui, cwd=repo.root, files=files, eolmode=None)
     finally:
         files = patch.updatedir(ui, repo, files)
         os.unlink(patchfile)