# HG changeset patch # User Pierre-Yves David # Date 1508000766 -7200 # Node ID 472a67075756441379ded0c0046bb87bdb880bc6 # Parent 9a223c3adb9df9936bd4882ed879ab2c163cee02# Parent 1893bde71ebcf79ccbbc2e567ffe0a0e6df370ed branching: merge with stable diff -r 9a223c3adb9d -r 472a67075756 CHANGELOG --- a/CHANGELOG Sat Oct 14 18:56:42 2017 +0200 +++ b/CHANGELOG Sat Oct 14 19:06:06 2017 +0200 @@ -8,6 +8,15 @@ * topic: fix handling of bookmarks and phases while changing topics. +6.7.2 -- in progress +---------------- + + * pager: pager support to `obslog` and `evolve --list` + +topic(0.3.2) + + * pager: pager support to `topics` and `stack` + 6.7.1 -- 2017-10-10 ------------------- diff -r 9a223c3adb9d -r 472a67075756 README diff -r 9a223c3adb9d -r 472a67075756 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Sat Oct 14 18:56:42 2017 +0200 +++ b/hgext3rd/evolve/__init__.py Sat Oct 14 19:06:06 2017 +0200 @@ -1523,6 +1523,7 @@ troublecategories = ['phasedivergent', 'contentdivergent', 'orphan'] specifiedcategories = [t for t in troublecategories if opts[t]] if listopt: + compat.startpager(ui, 'evolve') listtroubles(ui, repo, specifiedcategories, **opts) return diff -r 9a223c3adb9d -r 472a67075756 hgext3rd/evolve/compat.py --- a/hgext3rd/evolve/compat.py Sat Oct 14 18:56:42 2017 +0200 +++ b/hgext3rd/evolve/compat.py Sat Oct 14 19:06:06 2017 +0200 @@ -172,3 +172,8 @@ if not util.safehasattr(obsolete, '_computephasedivergentset'): obsolete._computephasedivergentset = obsolete.cachefor('phasedivergent')(obsolete._computebumpedset) + +def startpager(ui, cmd): + """function to start a pager in case ui.pager() exists""" + if util.safehasattr(ui, 'pager'): + ui.pager(cmd) diff -r 9a223c3adb9d -r 472a67075756 hgext3rd/evolve/obshistory.py --- a/hgext3rd/evolve/obshistory.py Sat Oct 14 18:56:42 2017 +0200 +++ b/hgext3rd/evolve/obshistory.py Sat Oct 14 19:06:06 2017 +0200 @@ -66,6 +66,7 @@ Returns 0 on success. """ + compat.startpager(ui, 'obslog') revs = list(revs) + opts['rev'] if not revs: revs = ['.'] diff -r 9a223c3adb9d -r 472a67075756 hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Sat Oct 14 18:56:42 2017 +0200 +++ b/hgext3rd/topic/__init__.py Sat Oct 14 19:06:06 2017 +0200 @@ -462,6 +462,8 @@ # Have some restrictions on the topic name just like bookmark name scmutil.checknewlabel(repo, topic, 'topic') + compat.startpager(ui, 'topics') + if list: if clear or rev: raise error.Abort(_("cannot use --clear or --rev with --list")) @@ -541,6 +543,7 @@ topic = repo.currenttopic if topic is None: branch = repo[None].branch() + compat.startpager(ui, 'stack') return stack.showstack(ui, repo, branch=branch, topic=topic, opts=opts) @command('debugcb|debugconvertbookmark', [ diff -r 9a223c3adb9d -r 472a67075756 hgext3rd/topic/compat.py --- a/hgext3rd/topic/compat.py Sat Oct 14 18:56:42 2017 +0200 +++ b/hgext3rd/topic/compat.py Sat Oct 14 19:06:06 2017 +0200 @@ -22,3 +22,10 @@ getmarkers = obsolete.getmarkers if successorssets is None: successorssets = obsolete.successorssets + +def startpager(ui, cmd): + """function to start a pager in case ui.pager() exists""" + try: + ui.pager(cmd) + except AttributeError: + pass