Commits

Christian Ebert committed ba733cc

internalpatch compatibility merge upstream, remove

Comments (0)

Files changed (2)

internalpatch-compat.diff

-# HG changeset patch
-# User Christian Ebert <blacktrash@gmx.net>
-# Date 1305667757 -7200
-# Node ID bf04eabc9a1e2e0b0598bf9154d3147638b19235
-# Parent 5618ae4accb4f7ad9d311ae444b3f796f0f69741
-date:        Sun May 08 17:48:31 2011 +0200
-Stay compatible with 00a881581400 and 17cea10c343e
-
-changeset:   14260:00a881581400
-user:        Patrick Mezard <pmezard@gmail.com>
-summary:     patch: make patch()/internalpatch() always update the dirstate
-
-changeset:   14370:17cea10c343e
-tag:         tip
-user:        Patrick Mezard <pmezard@gmail.com>
-date:        Wed May 18 23:48:17 2011 +0200
-files:       hgext/record.py mercurial/patch.py tests/test-mq-missingfiles.t
-description:
-patch: add a workingbackend dirstate layer on top of fsbackend
-
-_updatedir() is no longer used by internalpatch()
-
-The change in test-mq-missingfiles.t comes from workingbackend not considering
-the missing 'b' file as changed, thus not calling addremove() on it.
-
-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,26 @@
-                     ui.debug(fp.getvalue())
-                     pfiles = {}
-                     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:
-internalpatch-compat.diff
 # Placed by Bitbucket