D7570: match: resolve filesets against the passed `cwd`, not the current one

Closed by commit rHG28ea223a65c5: match: resolve filesets against the passed `cwd`, not the current one (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7570

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz updated this revision to Diff 19072. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7570?vs=18895&id=19072 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7570/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz updated this revision to Diff 18895. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7570?vs=18707&id=18895 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7570/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 added a comment. In D7570#112809 , @martinvonz wrote: > In D7570#112576 , @mharbison72 wrote: > >> It looks like the two `if cwd is None` lines are still reverted to `if not cwd` by

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz added a comment. In D7570#112576 , @mharbison72 wrote: > In D7570#112518 , @martinvonz wrote: > >> In D7570#112516 , @mharbison72 wrote:

D7570: match: resolve filesets against the passed `cwd`, not the current one

yuja added a comment. > In D7570#112206 , @yuja wrote: > Good catch. I don't see the meaning of b'' in this context defined anywhere. But since `subinclude:` uses it to define the matcher, I'm assuming that's all of the adjustment we need?

Re: D7570: match: resolve filesets against the passed `cwd`, not the current one

> In D7570#112206 , @yuja wrote: > Good catch. I don't see the meaning of b'' in this context defined > anywhere. But since `subinclude:` uses it to define the matcher, I'm > assuming that's all of the adjustment we need? It's basically the valu

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 added a comment. In D7570#112518 , @martinvonz wrote: > In D7570#112516 , @mharbison72 wrote: > >> In D7570#112436 , @martinvonz wrote:

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz updated this revision to Diff 18707. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7570?vs=18696&id=18707 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7570/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz added a comment. In D7570#112516 , @mharbison72 wrote: > In D7570#112436 , @martinvonz wrote: > >> In D7570#112206 , @yuja wrote: >> >

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 added a comment. In D7570#112436 , @martinvonz wrote: > In D7570#112206 , @yuja wrote: > >> I'm okay with this, but I would add "# TODO:" comment to subrepo handling >> so future re

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz added a comment. In D7570#112206 , @yuja wrote: >> > In D7570#111892 , @durin42 wrote: >> > >> >> I'm happy with this, but didn't spend time figuring out if all concerns have be

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz updated this revision to Diff 18696. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7570?vs=18664&id=18696 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7570/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 added a comment. In D7570#112206 , @yuja wrote: >> @yuja, what do you think? > > I'm okay with this, but I would add "# TODO:" comment to subrepo handling > so future readers can see the problem. And one more nit: since `cwd=

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 updated this revision to Diff 18664. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7570?vs=18596&id=18664 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7570/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7570 AFFECTED F

D7570: match: resolve filesets against the passed `cwd`, not the current one

yuja added a comment. > > In D7570#111892 , @durin42 wrote: > > > >> I'm happy with this, but didn't spend time figuring out if all concerns have been addressed (I'm mostly doing a fast triage path). > > > > I *think* they're addr

Re: D7570: match: resolve filesets against the passed `cwd`, not the current one

> > In D7570#111892 , @durin42 > wrote: > > > >> I'm happy with this, but didn't spend time figuring out if all concerns > have been addressed (I'm mostly doing a fast triage path). > > > > I *think* they're addressed, but we there's no rush

D7570: match: resolve filesets against the passed `cwd`, not the current one

hooper added inline comments. INLINE COMMENTS > martinvonz wrote in test-fix.t:1336-1342 > > `.::` doesn't include fixing wdir() > > Yes, that's how revsets work (as you noted) > > > `.` isn't updated unless `-w` is specified > > Yes, because otherwise the working directory would appear to und

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz added a comment. In D7570#111903 , @martinvonz wrote: > In D7570#111892 , @durin42 wrote: > >> I'm happy with this, but didn't spend time figuring out if all concerns have been addre

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz added a comment. In D7570#111892 , @durin42 wrote: > I'm happy with this, but didn't spend time figuring out if all concerns have been addressed (I'm mostly doing a fast triage path). I *think* they're addressed, but we there's

D7570: match: resolve filesets against the passed `cwd`, not the current one

This revision is now accepted and ready to land. durin42 added a comment. durin42 accepted this revision. I'm happy with this, but didn't spend time figuring out if all concerns have been addressed (I'm mostly doing a fast triage path). REPOSITORY rHG Mercurial BRANCH default CHANGES SI

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 added a comment. In D7570#111783 , @martinvonz wrote: > In D7570#111295 , @yuja wrote: > >>> if listsubrepos: >>> for subpath in ctx.substate: >>> >>> - sm = ctx.sub(sub

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz added a comment. In D7570#111295 , @yuja wrote: >> if listsubrepos: >> for subpath in ctx.substate: >> >> - sm = ctx.sub(subpath).matchfileset(pat, badfn=badfn) >> >> +sm = ctx.sub(subpath).matchf

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz updated this revision to Diff 18596. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7570?vs=18508&id=18596 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7570/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7570: match: resolve filesets against the passed `cwd`, not the current one

martinvonz added inline comments. martinvonz added a subscriber: hooper. INLINE COMMENTS > mharbison72 wrote in test-fix.t:1336-1342 > I found a couple of things surprising here: > > 1. `.::` doesn't include fixing wdir() > 2. `.` isn't updated unless `-w` is specified > 3. `-w` doesn't alter `w

D7570: match: resolve filesets against the passed `cwd`, not the current one

yuja added a comment. > if listsubrepos: > for subpath in ctx.substate: > > - sm = ctx.sub(subpath).matchfileset(pat, badfn=badfn) > > +sm = ctx.sub(subpath).matchfileset( > +pat, badfn=badfn, cwd=cwd > +)

Re: D7570: match: resolve filesets against the passed `cwd`, not the current one

> if listsubrepos: > for subpath in ctx.substate: > -sm = ctx.sub(subpath).matchfileset(pat, badfn=badfn) > +sm = ctx.sub(subpath).matchfileset( > +pat, badfn=badfn, cwd=cwd > +) Might

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 added a comment. mharbison72 added a subscriber: martinvonz. CC: @martinvonz INLINE COMMENTS > test-fix.t:1336-1342 >$ hg fix -r '.::' >$ hg cat -r . ../quux >quux >$ hg cat -r tip ../quux > - quux > + fs: $TESTTMP/subprocesscwd >$ cat ../quux >quux I fo

D7570: match: resolve filesets against the passed `cwd`, not the current one

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This allows filesets to be resolved relative to `repo.root`, the same as other patterns are since f02d3c0eed18