Mercurial > evolve
changeset 3668:a6bac0492eff
branching: merge with stable
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 16 Apr 2018 12:46:23 -0700 |
| parents | a346b1641dfa (current diff) c912eaf29eec (diff) |
| children | 0407965ae79e |
| files | hgext3rd/evolve/compat.py |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/compat.py Mon Apr 16 20:18:10 2018 +0200 +++ b/hgext3rd/evolve/compat.py Mon Apr 16 12:46:23 2018 -0700 @@ -55,14 +55,16 @@ # Wrap obsolete.creatmarkers and make it accept but ignore "operation" argument # for hg < 4.3 -createmarkers = obsolete.createmarkers -originalcreatemarkers = createmarkers +originalcreatemarkers = obsolete.createmarkers while isinstance(originalcreatemarkers, functools.partial): originalcreatemarkers = originalcreatemarkers.func if originalcreatemarkers.__code__.co_argcount < 6: def createmarkers(repo, relations, flag=0, date=None, metadata=None, operation=None): return obsolete.createmarkers(repo, relations, flag, date, metadata) +else: + def createmarkers(*args, **kwargs): + return obsolete.createmarkers(*args, **kwargs) if not util.safehasattr(hg, '_copycache'): # exact copy of relevantmarkers as in Mercurial-176d1a0ce385
--- a/hgext3rd/topic/compat.py Mon Apr 16 20:18:10 2018 +0200 +++ b/hgext3rd/topic/compat.py Mon Apr 16 12:46:23 2018 -0700 @@ -31,14 +31,16 @@ # Wrap obsolete.creatmarkers and make it accept but ignore "operation" argument # for hg < 4.3 -createmarkers = obsolete.createmarkers -originalcreatemarkers = createmarkers +originalcreatemarkers = obsolete.createmarkers while isinstance(originalcreatemarkers, functools.partial): originalcreatemarkers = originalcreatemarkers.func if originalcreatemarkers.__code__.co_argcount < 6: def createmarkers(repo, relations, flag=0, date=None, metadata=None, operation=None): return obsolete.createmarkers(repo, relations, flag, date, metadata) +else: + def createmarkers(*args, **kwargs): + return obsolete.createmarkers(*args, **kwargs) def startpager(ui, cmd): """function to start a pager in case ui.pager() exists"""