##// END OF EJS Templates
cmdutil: changed _makegraphlogrevset to _makelogrevset...
Lucas Moscovicz -
r21108:e5ad36a8 default
parent child Browse files
Show More
@@ -1457,7 +1457,7 b' def walkchangerevs(repo, match, opts, pr'
1457
1457
1458 return iterate()
1458 return iterate()
1459
1459
1460 def _makegraphfilematcher(repo, pats, followfirst):
1460 def _makelogfilematcher(repo, pats, followfirst):
1461 # When displaying a revision with --patch --follow FILE, we have
1461 # When displaying a revision with --patch --follow FILE, we have
1462 # to know which file of the revision must be diffed. With
1462 # to know which file of the revision must be diffed. With
1463 # --follow, we want the names of the ancestors of FILE in the
1463 # --follow, we want the names of the ancestors of FILE in the
@@ -1485,7 +1485,7 b' def _makegraphfilematcher(repo, pats, fo'
1485
1485
1486 return filematcher
1486 return filematcher
1487
1487
1488 def _makegraphlogrevset(repo, pats, opts, revs):
1488 def _makelogrevset(repo, pats, opts, revs):
1489 """Return (expr, filematcher) where expr is a revset string built
1489 """Return (expr, filematcher) where expr is a revset string built
1490 from log options and file patterns or None. If --stat or --patch
1490 from log options and file patterns or None. If --stat or --patch
1491 are not passed filematcher is None. Otherwise it is a callable
1491 are not passed filematcher is None. Otherwise it is a callable
@@ -1596,7 +1596,7 b' def _makegraphlogrevset(repo, pats, opts'
1596 filematcher = None
1596 filematcher = None
1597 if opts.get('patch') or opts.get('stat'):
1597 if opts.get('patch') or opts.get('stat'):
1598 if follow:
1598 if follow:
1599 filematcher = _makegraphfilematcher(repo, pats, followfirst)
1599 filematcher = _makelogfilematcher(repo, pats, followfirst)
1600 else:
1600 else:
1601 filematcher = lambda rev: match
1601 filematcher = lambda rev: match
1602
1602
@@ -1639,7 +1639,7 b' def getgraphlogrevs(repo, pats, opts):'
1639 possiblyunsorted = False # whether revs might need sorting
1639 possiblyunsorted = False # whether revs might need sorting
1640 if opts.get('rev'):
1640 if opts.get('rev'):
1641 revs = scmutil.revrange(repo, opts['rev'])
1641 revs = scmutil.revrange(repo, opts['rev'])
1642 # Don't sort here because _makegraphlogrevset might depend on the
1642 # Don't sort here because _makelogrevset might depend on the
1643 # order of revs
1643 # order of revs
1644 possiblyunsorted = True
1644 possiblyunsorted = True
1645 else:
1645 else:
@@ -1650,7 +1650,7 b' def getgraphlogrevs(repo, pats, opts):'
1650 revs.reverse()
1650 revs.reverse()
1651 if not revs:
1651 if not revs:
1652 return revset.baseset(), None, None
1652 return revset.baseset(), None, None
1653 expr, filematcher = _makegraphlogrevset(repo, pats, opts, revs)
1653 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
1654 if possiblyunsorted:
1654 if possiblyunsorted:
1655 revs.sort(reverse=True)
1655 revs.sort(reverse=True)
1656 if expr:
1656 if expr:
General Comments 0
You need to be logged in to leave comments. Login now