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

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Mon Dec 16 18:21:16 EST 2019


martinvonz added a comment.


  In D7570#112576 <https://phab.mercurial-scm.org/D7570#112576>, @mharbison72 wrote:
  
  > In D7570#112518 <https://phab.mercurial-scm.org/D7570#112518>, @martinvonz wrote:
  >
  >> In D7570#112516 <https://phab.mercurial-scm.org/D7570#112516>, @mharbison72 wrote:
  >>
  >>> In D7570#112436 <https://phab.mercurial-scm.org/D7570#112436>, @martinvonz wrote:
  >>>
  >>>> In D7570#112206 <https://phab.mercurial-scm.org/D7570#112206>, @yuja wrote:
  >>>>
  >>>>> 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=b''` is
  >>>>> a valid path, we have to test `cwd is None` explicitly.
  >>>>
  >>>> @yuja, maybe I've addressed both comments with the two new patches I added to the stack?
  >>>
  >>> This latest diff reverted the `cwd is None` changes.  IIUC, the TODO shouldn't be needed anymore.
  >>
  >> Oops, I apparently removed only my TODO in match.py, not in subrepo.py. Done now. Thanks.
  >
  > It looks like the two `if cwd is None` lines are still reverted to `if not cwd` by comparing diff 3 to 5.
  
  Oh, because you fixed that and then I overwrote your changes? Because I don't remember changing it. Anyway, should be fine now that `cwd` is an absolute path, right?

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7570/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7570

To: mharbison72, #hg-reviewers, durin42
Cc: durin42, hooper, yuja, martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list