Submitter | phabricator |
---|---|
Date | Nov. 8, 2019, 4:25 p.m. |
Message ID | <differential-rev-PHID-DREV-zmyhq43y2tlatbgwtjft-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/42942/ |
State | Superseded |
Headers | show |
Comments
indygreg added inline comments. INLINE COMMENTS > repoview.py:64 > + pinned.update(rev(t[0]) for t in tags.values()) > + pinned.discard(None) > return pinned Why was `pinned.discard(None)` added? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7337/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7337 To: marmoute, #hg-reviewers Cc: indygreg, mercurial-devel
This revision is now accepted and ready to land. indygreg added inline comments. indygreg accepted this revision. INLINE COMMENTS > indygreg wrote in repoview.py:64 > Why was `pinned.discard(None)` added? Nevermind. This `get_rev()` can return `None`. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7337/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7337 To: marmoute, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel
marmoute added inline comments. marmoute marked 2 inline comments as done. INLINE COMMENTS > indygreg wrote in repoview.py:64 > Nevermind. This `get_rev()` can return `None`. Yeah, it is simpler to filter out None at the end than to do a lookup before adding to the set. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7337/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7337 To: marmoute, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel
Patch
diff --git a/mercurial/repoview.py b/mercurial/repoview.py --- a/mercurial/repoview.py +++ b/mercurial/repoview.py @@ -59,8 +59,9 @@ tags = {} tagsmod.readlocaltags(repo.ui, repo, tags, {}) if tags: - rev, nodemap = cl.rev, cl.nodemap - pinned.update(rev(t[0]) for t in tags.values() if t[0] in nodemap) + rev = cl.index.get_rev + pinned.update(rev(t[0]) for t in tags.values()) + pinned.discard(None) return pinned