Show More
@@ -376,8 +376,8 b' def overridelog(orig, ui, repo, *pats, *' | |||
|
376 | 376 | # The magic matchandpats override should be used for case (1) but not for |
|
377 | 377 | # case (2). |
|
378 | 378 | def overridemakelogfilematcher(repo, pats, opts): |
|
379 |
|
|
|
380 |
match, pats = oldmatchandpats( |
|
|
379 | wctx = repo[None] | |
|
380 | match, pats = oldmatchandpats(wctx, pats, opts) | |
|
381 | 381 | return lambda rev: match |
|
382 | 382 | |
|
383 | 383 | oldmatchandpats = installmatchandpatsfn(overridematchandpats) |
@@ -1918,12 +1918,12 b' def _makelogrevset(repo, pats, opts, rev' | |||
|
1918 | 1918 | # _matchfiles() revset but walkchangerevs() builds its matcher with |
|
1919 | 1919 | # scmutil.match(). The difference is input pats are globbed on |
|
1920 | 1920 | # platforms without shell expansion (windows). |
|
1921 |
|
|
|
1922 |
match, pats = scmutil.matchandpats( |
|
|
1921 | wctx = repo[None] | |
|
1922 | match, pats = scmutil.matchandpats(wctx, pats, opts) | |
|
1923 | 1923 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1924 | 1924 | if not slowpath: |
|
1925 | 1925 | for f in match.files(): |
|
1926 |
if follow and f not in |
|
|
1926 | if follow and f not in wctx: | |
|
1927 | 1927 | # If the file exists, it may be a directory, so let it |
|
1928 | 1928 | # take the slow path. |
|
1929 | 1929 | if os.path.exists(repo.wjoin(f)): |
General Comments 0
You need to be logged in to leave comments.
Login now