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

2017-08-17 Thread quark (Jun Wu)
quark updated this revision to Diff 1059. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D441?vs=1058&id=1059 REVISION DETAIL https://phab.mercurial-scm.org/D441 AFFECTED FILES mercurial/dagop.py mercurial/revset.py mercurial/revsetlang.py tests/

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

2017-08-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. I'll review in more detail later, but just a quick comment for now INLINE COMMENTS > revset.py:1554 > +def keepfunc(rev): > +return getphase(repo, rev) in selectedphases > + Isn't "getphase(repo,rev) >= keepphase" more natural? You'd then replace phas

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

2017-08-17 Thread quark (Jun Wu)
quark updated this revision to Diff 1058. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D441?vs=1057&id=1058 REVISION DETAIL https://phab.mercurial-scm.org/D441 AFFECTED FILES mercurial/dagop.py mercurial/revset.py mercurial/revsetlang.py tests/

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

2017-08-17 Thread quark (Jun Wu)
quark updated this revision to Diff 1057. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D441?vs=1056&id=1057 REVISION DETAIL https://phab.mercurial-scm.org/D441 AFFECTED FILES mercurial/dagop.py mercurial/revset.py mercurial/revsetlang.py tests/

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

2017-08-17 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The `draft() & ::x` type query could be common for selecting one or more draft feature branches being worked on. Before this patch, `::x` may travel though the

D440: exchange: don't attempt phase exchange if phase-heads was in bundle

2017-08-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The Mercurial core server doesn't yet include phase-heads parts in the bundle, but our Google-internal server wants to do that. Unfortunately, the usual excha

Re: Fwd: Dropping Support for Python 2.6

2017-08-17 Thread Mathias De Maré
(Adding Mercurial-devel mailing list, as I'm not sure if anyone is actually using mercurial-infrastructure@) On 08-08-17 09:21, Mathias De Maré wrote: On 04-05-17 16:36, Anton Shestakov wrote: On Tue, 2 May 2017 20:30:07 +0200 Pierre-Yves David wrote: So, we are already operating a repos

D426: obsutil: correct deprecation warning message

2017-08-17 Thread ryanmce (Ryan McElroy)
ryanmce abandoned this revision. ryanmce added a comment. I don't pull from committed usually. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D426 To: ryanmce, #hg-reviewers Cc: lothiraldan, mercurial-devel ___ Mercuria

D379: simplemerge: use context paths for default labels instead of file paths

2017-08-17 Thread phillco (Phil Cohen)
phillco added a comment. Blocked on https://phab.mercurial-scm.org/D378. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D379 To: phillco, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-deve

D379: simplemerge: use context paths for default labels instead of file paths

2017-08-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1039. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D379?vs=860&id=1039 REVISION DETAIL https://phab.mercurial-scm.org/D379 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemer

D383: simplemerge: simplify code now that we always write to a context

2017-08-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1043. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D383?vs=864&id=1043 REVISION DETAIL https://phab.mercurial-scm.org/D383 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemer

D381: simplemerge: stop accepting, and passing, file parameters

2017-08-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1041. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D381?vs=862&id=1041 REVISION DETAIL https://phab.mercurial-scm.org/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py C

D382: simplemerge: make context parameters non-optional

2017-08-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1042. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D382?vs=863&id=1042 REVISION DETAIL https://phab.mercurial-scm.org/D382 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemer

D380: simplemerge: stop reading from, and writing to, files

2017-08-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1040. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D380?vs=861&id=1040 REVISION DETAIL https://phab.mercurial-scm.org/D380 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemer

D377: simplemerge: add `filtereddata=False` to simplemerge()

2017-08-17 Thread phillco (Phil Cohen)
phillco abandoned this revision. phillco added a comment. Abandoned in favor of https://phab.mercurial-scm.org/D434's approach. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D377 To: phillco, #hg-reviewers Cc: durin42, mercurial-devel ___

D434: context: add `decodeddata()` to basefilectx

2017-08-17 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will be used as an abstraction by simplemerge to get the data it used to read off the filesystem. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.

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

2017-08-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1038. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D378?vs=859&id=1038 REVISION DETAIL https://phab.mercurial-scm.org/D378 AFFECTED FILES contrib/simplemerge CHANGE DETAILS diff --git a/contrib/simplemerge b/co

D435: simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`

2017-08-17 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This eliminates the need for the `repo` object. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D435 AFFECTED FILES mercurial/simple

[Bug 5662] New: file copied onto existing file becomes just modified on commit

2017-08-17 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5662 Bug ID: 5662 Summary: file copied onto existing file becomes just modified on commit Product: Mercurial Version: 4.3-rc Hardware: PC OS: Linux St

D351: demandimport: disable if chg is being used

2017-08-17 Thread quark (Jun Wu)
quark added a comment. How about using `sys.argv[0]` to test if chg is being used? Instead of running `hg serve --cmdserver chgunix ...`, chg client executes `chgserve ...`. And the hg script could notice that by checking `sys.argv[0]` and does some special handling (expand it to `hg ser

D421: hg: move part of top-level logic to dispatch.run

2017-08-17 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > yuja wrote in hg:30 > This makes the import of `dispatch` non-lazy, right? I thought demandimport was per module, non-recursive. It's obviously recursive. Will change. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4

Re: [PATCH 4 of 8] template: add minimal obsfate template function

2017-08-17 Thread Boris Feld
On Wed, 2017-08-09 at 22:42 +0900, Yuya Nishihara wrote: > On Tue, 08 Aug 2017 18:48:08 +0200, Boris Feld wrote: > > On Wed, 2017-08-09 at 00:19 +0900, Yuya Nishihara wrote: > > > On Mon, 07 Aug 2017 16:56:23 +0200, Boris Feld wrote: > > > > +@templatekeyword("succsandmarkers") > > > > +def showsuc

D426: obsutil: correct deprecation warning message

2017-08-17 Thread lothiraldan (Boris Feld)
lothiraldan added a comment. Thx @ryanmce, the fix (https://phab.mercurial-scm.org/D413) should already been pushed to hg-commited, could you try pulling and see if you have it? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D426 To: ryanmce, #hg-reviewers Cc: l

D426: obsutil: correct deprecation warning message

2017-08-17 Thread ryanmce (Ryan McElroy)
ryanmce 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/D426 AFFECTED FILES mercurial/obsutil.py CHANGE DETAILS diff --git a/mercurial/obsut

D360: log: add a "graphwidth" template variable

2017-08-17 Thread hooper (Danny Hooper)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6f6c87888b22: log: add a "graphwidth" template variable (authored by hooper). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D360?vs=1009&id=1026#toc REPOSITORY rHG Mercurial CHANGES SINCE

D351: demandimport: disable if chg is being used

2017-08-17 Thread yuja (Yuya Nishihara)
yuja added a comment. Can you update the comment in chgserver.py in new series? It says "CHGINTERNALMARK is temporarily set by chg client to detect if chg will start another chg." REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D351 To: quark, #hg-reviewers, ph

D360: log: add a "graphwidth" template variable

2017-08-17 Thread yuja (Yuya Nishihara)
yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. Slightly adjusted the commit message for new version, and queued, thanks. INLINE COMMENTS > hooper wrote in cmdutil.py:2557 > There can be many of them. E.g. in the hg repo it looks like a cou

D352: chgserver: special handle __version__ in mtimehash (issue5653)

2017-08-17 Thread yuja (Yuya Nishihara)
yuja added a comment. I'll drop this per your comment on the issue5653. Thanks for investigating it further. https://bz.mercurial-scm.org/show_bug.cgi?id=5653#c4 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D352 To: quark, #hg-reviewers Cc: yuja, mercuria

D421: hg: move part of top-level logic to dispatch.run

2017-08-17 Thread yuja (Yuya Nishihara)
yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > hg:30 > try: > -if sys.version_info[0] < 3 or sys.version_info >= (3, 6): > -import hgdemandimport; hgdemandimport.enable() > +import mercurial.di

Re: [PATCH 1 of 2 STABLE V2] tests: test behavior of IOError during transactions (issue5658)

2017-08-17 Thread Yuya Nishihara
On Tue, 15 Aug 2017 13:55:01 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1502741560 25200 > # Mon Aug 14 13:12:40 2017 -0700 > # Branch stable > # Node ID 0d5b565629f0491a7673fcfdd9c02cbc1a4b > # Parent 7686cbb0ba4138c56d038d8d82ccc052bf9b60d7 > tes