D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread durin42 (Augie Fackler)
durin42 added inline comments. durin42 marked 4 inline comments as done. INLINE COMMENTS > martinvonz wrote in test-git-interop.t:5-11 > `$` prefix on these too since you're cleaning up anyway? My understanding is that the > will cause the lines to all happen in the same shell invocation, where

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > __init__.py:89-94 > +reqsf = os.path.join(storebasepath, b'requires') > +reqs = set() > +if os.path.exists(reqsf): > +with open(reqsf, 'rb') as f: > +reqs = {l.strip() for l in f} > +if b'git' in reqs: is thi

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > martinvonz wrote in __init__.py:89 > Why not use `.hg/requires`? Because I have the dumb. Will fix shortly. > pulkit wrote in dirstate.py:79 > looks like unrelated change which should be in separate patch? Sigh, you're right, and I'm being lazy.

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > dirstate.py:79 > def p1(self): > -return self.git.head.peel().id.raw > +try: > +return self.git.head.peel().id.raw looks like unrelated change which should be in separate patch? REPOSITORY rHG Mercurial CHANGES

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 20667. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8265?vs=20666&id=20667 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8265/new/ REVISION DETAIL https://phab.mercurial-scm.org/D82

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread durin42 (Augie Fackler)
durin42 marked an inline comment as done. durin42 updated this revision to Diff 20666. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8265?vs=20665&id=20666 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8265/new/ REVISION D

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > __init__.py:89 > def _makestore(orig, requirements, storebasepath, vfstype): > -# Check for presence of pygit2 only here. The assumption is that we'll > -# run this code iff we'll later need pygit2. > -if gitutil.get_pygit2() is Non

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread durin42 (Augie Fackler)
durin42 added inline comments. durin42 marked an inline comment as done. INLINE COMMENTS > mharbison72 wrote in __init__.py:104 > Shouldn't it be an error if `git` is in requirements, but `.git` doesn't > exist? Or is there something in the original function that will raise an > error in this

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 20665. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8265?vs=20664&id=20665 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8265/new/ REVISION DETAIL https://phab.mercurial-scm.org/D82

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-10 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 20664. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8265?vs=20614&id=20664 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8265/new/ REVISION DETAIL https://phab.mercurial-scm.org/D82

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-07 Thread mharbison72 (Matt Harbison)
mharbison72 added inline comments. INLINE COMMENTS > __init__.py:104 > +reqs = {l.strip() for l in f} > +if b'git' in reqs and os.path.exists(os.path.join(storebasepath, b'..', > b'.git')): > return gitstore(storebasepath, vfstype) Shouldn't it be an error if `git` is i

D8265: git: key off `git` in .hg/requirements rather than separate file

2020-03-07 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8265 AFFECTED FILES hgext/git/__init__.py CHANGE DETAILS diff --git a/hgext/git/__i