D451: revset: remove order information from tree

quark updated this revision to Diff 1099. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1098=1099 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D451: revset: remove order information from tree

yuja added a comment. Clever. I haven't looked this carefully, but the general direction seems fine. > @yuja Let me know if this can simplify `matchtree`, `buildtree` implementation. Actually `matchtree` can ignore extra elements in a node tuple, so the existence of `order` flag

D451: revset: remove order information from tree

quark added inline comments. INLINE COMMENTS > revset.py:58-61 > +# TODO migrate existing functions to accept "order", and maybe wrap > +# registered functions automatically if they do not accept "order". > +m = methods[x[0]] > +return m(repo, subset, *x[1:], order=order) TODO

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. This one looks good to me, thanks. I leave it to Sean since he said he's queued the previous series. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D447 To:

D358: copytrace: move fb extension to core under flag experimental.fastcopytrace

pulkit added a comment. Any updates on this? The function `_fastmergecopies()` is simply a port of `_domergecopies()` from fbhgext/copytrace.py. https://phab.mercurial-scm.org/diffusion/FBHGX/browse/default/hgext3rd/copytrace.py;75cfcc6fc62a4f172857beebda6c0e43f318ea87$290 REPOSITORY rHG

D219: morestatus: move fb extension to core by plugging to `hg status --verbose`

pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in test-bisect.t:190 > What does None mean here? Oh, _conflictsmsg() is returning None which is getting printed. I will send a follow-up for this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D219

D451: [RFC] revset: remove order information from tree

quark updated this revision to Diff 1097. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1096=1097 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D451: [RFC] revset: remove order information from tree

quark updated this revision to Diff 1096. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1095=1096 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D451: [RFC] revset: remove order information from tree

quark added inline comments. INLINE COMMENTS > test-revset.t:2893 > , > -> > +> >0 This is caused by `fullreposet` having a default order. If we remove that, it would be optimized to `` here. REPOSITORY rHG Mercurial REVISION DETAIL

D451: [RFC] revset: remove order information from tree

quark updated this revision to Diff 1095. quark edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1094=1095 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py

D451: [RFC] revset: remove order information from tree

quark updated this revision to Diff 1094. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1093=1094 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D451: [RFC] revset: remove order information from tree

quark updated this revision to Diff 1093. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1092=1093 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D451: [RFC] revset: remove order information from tree

quark updated this revision to Diff 1092. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1091=1092 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D451: [RFC] revset: remove order information from tree

quark added a subscriber: yuja. quark added a comment. @yuja Let me know if this can simplify `matchtree`, `buildtree` implementation. INLINE COMMENTS > test-revset.t:2502 > >$ try -p optimized '(reverse(contains("a")) + 2) & 0:2' >* optimized: The new code is less efficient

D451: [RFC] revset: remove order information from tree

quark updated this revision to Diff 1091. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D451?vs=1090=1091 REVISION DETAIL https://phab.mercurial-scm.org/D451 AFFECTED FILES mercurial/revset.py mercurial/revsetlang.py tests/test-revset.t CHANGE

D378: contrib: make simplemerge script pass context-like objects

phillco added a subscriber: martinvonz. phillco added inline comments. INLINE COMMENTS > simplemerge:44-63 > +class filebackedctx(object): > +"""simplemerge requires context-like objects""" > +def __init__(self, path): > +self._path = path > + > +def decodeddata(self): > +

D374: simplemerge: use contexts to read file data from, if passed

phillco added inline comments. INLINE COMMENTS > martinvonz wrote in simplemerge.py:430 > What is this "post-filter data"? I didn't know hg had this feature. Something > like git' clean/smudge filters? Yeah, exactly. I didn't know about it either.

D372: simplemerge: add optional context parameters to simplemerge

phillco added inline comments. INLINE COMMENTS > martinvonz wrote in simplemerge.py:412 > Seems unfortunate to have both files and contexts. This is what you mentioned > today you will replace by use of "arbitraryfilectx"? They get taken out in https://phab.mercurial-scm.org/D381; they have to

D441: revset: optimize "draft() & ::x" pattern

quark added inline comments. INLINE COMMENTS > yuja wrote in revsetlang.py:492 > I'll rebase my patches then. I'm sure that isn't trivial because I introduced > the order flag. Maybe `order` could be removed from AST since they can be inferred during tree traversal? I have a draft

D376: filemerge: extract `_picklabels` as a helper function

phillco added inline comments. INLINE COMMENTS > martinvonz wrote in simplemerge.py:411-423 > def _picklabels(defaults, overrides): > if len(overrides) > 3: > raise error.Abort(_("can only specify three labels.")) > result = defaults[:] > for i, override in

D451: [RFC] revset: remove order information from tree

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Keeping `order` in tree makes AST operation harder. And there could be certain invalid cases, like: A(order=define) | B(order=define)

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

martinvonz added inline comments. INLINE COMMENTS > yuja wrote in templatekw.py:222 > > I'm not changing latesttagdistance (AFAIK), only the definition of > > latesttag. > > Try `ptags = reversed(...)` and run tests. The largest `pdist` should be > selected > so that `latesttagdistance`

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

martinvonz updated this revision to Diff 1089. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D447?vs=1088=1089 REVISION DETAIL https://phab.mercurial-scm.org/D447 AFFECTED FILES mercurial/templatekw.py tests/test-command-template.t CHANGE DETAILS

mercurial@33807: 5 new changesets

5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/707750e5310b changeset: 33803:707750e5310b user:Gregory Szorc date:Wed Aug 09 23:52:25 2017 -0700 summary: localrepo: use peer interfaces

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

martinvonz added inline comments. INLINE COMMENTS > martinvonz wrote in templatekw.py:222 > > This should be enabled only if ptags[0][2] != ptags[1][2]. > > Good point. Done. > > > The latesttagdistance is documented to return the longest path to the > > latest tag. > > I'm not changing

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

yuja added inline comments. INLINE COMMENTS > martinvonz wrote in templatekw.py:222 > > This should be enabled only if ptags[0][2] != ptags[1][2]. > > Good point. Done. > > > The latesttagdistance is documented to return the longest path to the > > latest tag. > > I'm not changing

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

martinvonz updated this revision to Diff 1088. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D447?vs=1080=1088 REVISION DETAIL https://phab.mercurial-scm.org/D447 AFFECTED FILES mercurial/templatekw.py tests/test-command-template.t CHANGE DETAILS

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

martinvonz added inline comments. INLINE COMMENTS > yuja wrote in templatekw.py:222 > This should be enabled only if `ptags[0][2] != ptags[1][2]`. > > The latesttagdistance is documented to return the longest path to the latest > tag. >

mercurial@33802: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/f257943e47ab changeset: 33800:f257943e47ab user:Gregory Szorc date:Sun Aug 13 10:58:48 2017 -0700 summary: repository: formalize peer interface with abstract base class

D447: templatekw: choose {latesttag} by len(changes), not date (issue5659)

yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > templatekw.py:222 > +# Don't call expensive key function if not necessary > +pdate, pdist, ptag = ptags[0] > except

[PATCH] copies: use intersectmatchers() in non-merge p1 optimization

# HG changeset patch # User Yuya Nishihara # Date 1503109413 -32400 # Sat Aug 19 11:23:33 2017 +0900 # Node ID 57b175605401373c0c37bd9937a209676a734947 # Parent 6f6c87888b228948e202bd5967dc306bed56af7d copies: use intersectmatchers() in non-merge p1 optimization This enables

D445: demandimport: move HGDEMANDIMPORT test to __init__.py

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8fb5212652ec: demandimport: move HGDEMANDIMPORT test to __init__.py (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D445?vs=1077=1086

D351: demandimport: disable if chg is being used

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3cfc9070245f: demandimport: disable if chg is being used (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D351?vs=1078=1087 REVISION DETAIL

D351: demandimport: disable if chg is being used

yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. Queued this, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D351 To: quark, #hg-reviewers, phillco, yuja Cc: phillco, sid0, yuja, mercurial-devel

mercurial@33799: 44 new changesets

44 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/5866ba5e9c48 changeset: 33756:5866ba5e9c48 parent: 33750:a0e28577f7d4 user:Yuya Nishihara date:Mon Jul 31 22:12:24 2017 +0900 summary: cext: move _dict_new_presized() to header