##// END OF EJS Templates
log: extract common part from getgraphlogrevs() and getlogrevs()
Yuya Nishihara -
r24062:f576addb default
parent child Browse files
Show More
@@ -1822,6 +1822,19 b' def _makelogrevset(repo, pats, opts, rev'
1822 expr = None
1822 expr = None
1823 return expr, filematcher
1823 return expr, filematcher
1824
1824
1825 def _logrevs(repo, opts):
1826 # Default --rev value depends on --follow but --follow behaviour
1827 # depends on revisions resolved from --rev...
1828 follow = opts.get('follow') or opts.get('follow_first')
1829 if opts.get('rev'):
1830 revs = scmutil.revrange(repo, opts['rev'])
1831 elif follow:
1832 revs = repo.revs('reverse(:.)')
1833 else:
1834 revs = revset.spanset(repo)
1835 revs.reverse()
1836 return revs
1837
1825 def getgraphlogrevs(repo, pats, opts):
1838 def getgraphlogrevs(repo, pats, opts):
1826 """Return (revs, expr, filematcher) where revs is an iterable of
1839 """Return (revs, expr, filematcher) where revs is an iterable of
1827 revision numbers, expr is a revset string built from log options
1840 revision numbers, expr is a revset string built from log options
@@ -1831,17 +1844,7 b' def getgraphlogrevs(repo, pats, opts):'
1831 filtering the files to be detailed when displaying the revision.
1844 filtering the files to be detailed when displaying the revision.
1832 """
1845 """
1833 limit = loglimit(opts)
1846 limit = loglimit(opts)
1834 # Default --rev value depends on --follow but --follow behaviour
1847 revs = _logrevs(repo, opts)
1835 # depends on revisions resolved from --rev...
1836 follow = opts.get('follow') or opts.get('follow_first')
1837 if opts.get('rev'):
1838 revs = scmutil.revrange(repo, opts['rev'])
1839 else:
1840 if follow:
1841 revs = repo.revs('reverse(:.)')
1842 else:
1843 revs = revset.spanset(repo)
1844 revs.reverse()
1845 if not revs:
1848 if not revs:
1846 return revset.baseset(), None, None
1849 return revset.baseset(), None, None
1847 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
1850 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
@@ -1878,16 +1881,7 b' def getlogrevs(repo, pats, opts):'
1878 filtering the files to be detailed when displaying the revision.
1881 filtering the files to be detailed when displaying the revision.
1879 """
1882 """
1880 limit = loglimit(opts)
1883 limit = loglimit(opts)
1881 # Default --rev value depends on --follow but --follow behaviour
1884 revs = _logrevs(repo, opts)
1882 # depends on revisions resolved from --rev...
1883 follow = opts.get('follow') or opts.get('follow_first')
1884 if opts.get('rev'):
1885 revs = scmutil.revrange(repo, opts['rev'])
1886 elif follow:
1887 revs = repo.revs('reverse(:.)')
1888 else:
1889 revs = revset.spanset(repo)
1890 revs.reverse()
1891 if not revs:
1885 if not revs:
1892 return revset.baseset([]), None, None
1886 return revset.baseset([]), None, None
1893 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
1887 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
General Comments 0
You need to be logged in to leave comments. Login now