<div dir="ltr"><br><br><div class="gmail_quote">On Thu, Mar 19, 2015 at 9:19 AM Martin von Zweigbergk <<a href="mailto:martinvonz@google.com">martinvonz@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Martin von Zweigbergk <<a href="mailto:martinvonz@google.com" target="_blank">martinvonz@google.com</a>><br>
# Date 1426740265 25200<br>
# Wed Mar 18 21:44:25 2015 -0700<br>
# Node ID ef0698d6c3bb363ec4d7face69409f<u></u>6555d0e7c2<br>
# Parent 5cb459dc32d209653a3e5d77749cf9<u></u>89ab9a51e4<br>
log: prefer 'wctx' over 'pctx' for working context<br>
<br>
diff -r 5cb459dc32d2 -r ef0698d6c3bb hgext/largefiles/overrides.py<br>
--- a/hgext/largefiles/overrides.<u></u>py Tue Oct 28 22:32:18 2014 -0700<br>
+++ b/hgext/largefiles/overrides.<u></u>py Wed Mar 18 21:44:25 2015 -0700<br>
@@ -376,8 +376,8 @@<br>
# The magic matchandpats override should be used for case (1) but not for<br>
# case (2).<br>
def overridemakelogfilematcher(<u></u>repo, pats, opts):<br>
- pctx = repo[None]<br>
- match, pats = oldmatchandpats(pctx, pats, opts)<br>
+ wctx = repo[None]<br>
+ match, pats = oldmatchandpats(wctx, pats, opts)<br>
return lambda rev: match<br>
<br>
oldmatchandpats = installmatchandpatsfn(<u></u>overridematchandpats)<br>
diff -r 5cb459dc32d2 -r ef0698d6c3bb mercurial/cmdutil.py<br>
--- a/mercurial/cmdutil.py Tue Oct 28 22:32:18 2014 -0700<br>
+++ b/mercurial/cmdutil.py Wed Mar 18 21:44:25 2015 -0700<br>
@@ -1924,12 +1924,12 @@<br>
# _matchfiles() revset but walkchangerevs() builds its matcher with<br>
# scmutil.match(). The difference is input pats are globbed on<br>
# platforms without shell expansion (windows).<br>
- pctx = repo[None]<br>
- match, pats = scmutil.matchandpats(pctx, pats, opts)<br>
+ wctx = repo[None]<br>
+ match, pats = scmutil.matchandpats(wctx, pats, opts)<br>
slowpath = match.anypats() or (match.files() and opts.get('removed'))<br>
if not slowpath:<br>
for f in match.files():<br>
- if follow and f not in pctx:<br>
+ if follow and f not in wctx:<br></blockquote><div><br></div><div>Hmm... perhaps this was meant to be repo['.']? The error message soon after says "cannot follow file not in parent revision". Durham, you touched this code a while back (July 2014), do you have any idea?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
# If the file exists, it may be a directory, so let it<br>
# take the slow path.<br>
if os.path.exists(repo.wjoin(f)):<br>
</blockquote></div></div>