Mercurial > evolve
changeset 4388:20d1ceef2df2 stable
compat: pass contexts to _findlimit() (issue6066)
Now _findlimit() in copies module accept context instead of rev
number. See https://phab.mercurial-scm.org/D5595
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Thu, 31 Jan 2019 15:38:48 +0530 |
| parents | 61d83e0cfdf2 |
| children | 88887b2be07c 610999a1bae1 |
| files | hgext3rd/evolve/compat.py |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/compat.py Sun Feb 03 08:10:48 2019 +0100 +++ b/hgext3rd/evolve/compat.py Thu Jan 31 15:38:48 2019 +0530 @@ -261,7 +261,11 @@ if graft: tca = _c1.ancestor(_c2) - limit = copies._findlimit(repo, c1.rev(), c2.rev()) + # hg < 4.8 compat (dc50121126ae) + try: + limit = copies._findlimit(repo, c1, c2) + except (AttributeError, TypeError): + limit = copies._findlimit(repo, c1.rev(), c2.rev()) if limit is None: # no common ancestor, no copies return {}, {}, {}, {}, {}