Commits

Peter Arrenbrecht committed 39f1abc Merge

merge with blacktrash

  • Participants
  • Parent commits ebb9fb5, b76969f

Comments (0)

Files changed (1)

crecord/crecord_core.py

                         patch.internalpatch(ui, repo, fp, strip=1, files=pfiles,
                                             eolmode=None)
                         scmutil.updatedir(ui, repo, pfiles)
-                    except ImportError:
+                    except ImportError: # pre 3438417a6657
                         try:
-                            patch.internalpatch(fp, ui, 1, repo.root, files=pfiles,
-                                                eolmode=None)
-                        except TypeError:  # backwards compatilibity with hg 1.1
-                            patch.internalpatch(fp, ui, 1, repo.root, files=pfiles)
+                            patch.internalpatch(ui, repo, fp, 1, eolmode=None)
+                        except (TypeError, AttributeError): # pre 17cea10c343e
+                            try:
+                                patch.internalpatch(ui, repo, fp, 1, repo.root,
+                                                    eolmode=None)
+                            except (TypeError, AttributeError): # pre 00a881581400
+                                try:
+                                    patch.internalpatch(fp, ui, 1, repo.root,
+                                                        files=pfiles, eolmode=None)
+                                except TypeError: # backwards compatible with hg 1.1
+                                    patch.internalpatch(fp, ui, 1,
+                                                        repo.root, files=pfiles)
                         try:
                             cmdutil.updatedir(ui, repo, pfiles)
                         except AttributeError:
-                            patch.updatedir(ui, repo, pfiles)
+                            try:
+                                patch.updatedir(ui, repo, pfiles)
+                            except AttributeError:
+                                # from 00a881581400 onwards
+                                pass
                 except patch.PatchError, err:
                     s = str(err)
                     if s: