1. Christian Ebert
  2. crecord-crew

Commits

Christian Ebert  committed 7aac3af

Compatibility with 00a881581400

  • Participants
  • Parent commits 216677f
  • Branches default

Comments (0)

Files changed (2)

File internalpatch-compat.diff

View file
  • Ignore whitespace
+# HG changeset patch
+# User Christian Ebert <blacktrash@gmx.net>
+# Date 1305667757 -7200
+# Node ID bf04eabc9a1e2e0b0598bf9154d3147638b19235
+# Parent  5618ae4accb4f7ad9d311ae444b3f796f0f69741
+Stay compatible from 00a881581400 onwards
+
+changeset:   14260:00a881581400
+user:        Patrick Mezard <pmezard@gmail.com>
+date:        Sun May 08 17:48:31 2011 +0200
+summary:     patch: make patch()/internalpatch() always update the dirstate
+
+diff --git a/crecord/crecord_core.py b/crecord/crecord_core.py
+--- a/crecord/crecord_core.py
++++ b/crecord/crecord_core.py
+@@ -122,14 +122,22 @@
+                     ui.debug(fp.getvalue())
+                     pfiles = {}
+                     try:
+-                        patch.internalpatch(fp, ui, 1, repo.root, files=pfiles,
++                        patch.internalpatch(ui, repo, fp, 1, repo.root,
+                                             eolmode=None)
+-                    except TypeError:  # backwards compatilibity with hg 1.1
+-                        patch.internalpatch(fp, ui, 1, repo.root, files=pfiles)
++                    except TypeError:  # before 00a881581400
++                        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)
+                     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:

File series

View file
  • Ignore whitespace
+internalpatch-compat.diff
 # Placed by Bitbucket