mercurial@37063: 8 new changesets

8 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/861e9d37e56e changeset: 37056:861e9d37e56e user:Gregory Szorc date:Wed Mar 14 14:01:16 2018 -0700 summary: wireproto: buffer output frames when in half duplex mode

[PATCH 7 of 7] templater: factor out unwrapastype() from evalastype()

# HG changeset patch # User Yuya Nishihara # Date 1521805435 -32400 # Fri Mar 23 20:43:55 2018 +0900 # Node ID bcfa34ae805b92d3c9d32c8bed19c6432ba44120 # Parent b5bdcfbf663e1fa1d7c2004a0ef6b3172cc8eff9 templater: factor out unwrapastype() from evalastype() So ParseError of

[PATCH 2 of 7] templateutil: reimplement stringify() using flatten()

# HG changeset patch # User Yuya Nishihara # Date 1521284660 -32400 # Sat Mar 17 20:04:20 2018 +0900 # Node ID 60e473afb171c9c2fae598bdacd6880c1ac41ebf # Parent e9ae0d2c60b7a4c623f4065559f155733a290096 templateutil: reimplement stringify() using flatten() diff --git

[PATCH 6 of 7] templater: extract unwrapinteger() function from evalinteger()

# HG changeset patch # User Yuya Nishihara # Date 1521804852 -32400 # Fri Mar 23 20:34:12 2018 +0900 # Node ID b5bdcfbf663e1fa1d7c2004a0ef6b3172cc8eff9 # Parent 974b91e77122678881e9618d1682cfe0cf02d367 templater: extract unwrapinteger() function from evalinteger() diff --git

[PATCH 4 of 7] templater: drop bool support from evalastype()

# HG changeset patch # User Yuya Nishihara # Date 1521804235 -32400 # Fri Mar 23 20:23:55 2018 +0900 # Node ID 8b71d63fb9cc8c635fab41b872b8db6d5279a58a # Parent 63e4b6939689ee90bb27cd6522903bf44c349952 templater: drop bool support from evalastype() Future patches will split

[PATCH 1 of 7] templateutil: move flatten() from templater

# HG changeset patch # User Yuya Nishihara # Date 1521284454 -32400 # Sat Mar 17 20:00:54 2018 +0900 # Node ID e9ae0d2c60b7a4c623f4065559f155733a290096 # Parent 65d54e54ddbe7617f5434d9bf0add18318b4fa3d templateutil: move flatten() from templater It's the same kind of utility

[PATCH 3 of 7] templater: do not use stringify() to concatenate flattened template output

# HG changeset patch # User Yuya Nishihara # Date 1521285186 -32400 # Sat Mar 17 20:13:06 2018 +0900 # Node ID 63e4b6939689ee90bb27cd6522903bf44c349952 # Parent 60e473afb171c9c2fae598bdacd6880c1ac41ebf templater: do not use stringify() to concatenate flattened template output

[PATCH 5 of 7] templater: extract type conversion from evalfuncarg()

# HG changeset patch # User Yuya Nishihara # Date 1521806601 -32400 # Fri Mar 23 21:03:21 2018 +0900 # Node ID 974b91e77122678881e9618d1682cfe0cf02d367 # Parent 8b71d63fb9cc8c635fab41b872b8db6d5279a58a templater: extract type conversion from evalfuncarg() Needed by the

Re: [PATCH] test-pathconflicts-merge: stop requiring symlink support

On Sat, 24 Mar 2018 22:16:57 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1521943858 14400 > # Sat Mar 24 22:10:58 2018 -0400 > # Node ID a8a0cafcef7950055e6b321a315e6f53e506fcd6 > # Parent

D2394: histedit: make histedit's commands accept revsets (issue5746)

yuja added inline comments. INLINE COMMENTS > histedit.py:437 > +rulehash = _ctx.hex() > +rev = node.bin(rulehash) > +except error.RepoLookupError: This could be `rev = scmutil.revsingle(...).node()`. > histedit.py:438 > +rev =

D2872: wireproto: define human output side channel frame

yuja added inline comments. INLINE COMMENTS > wireprotoframing.py:318 > +# Formatting string must be UTF-8. > +formatting = formatting.decode(r'utf-8', r'replace').encode(r'utf-8') > + It's probably better to require everything in ASCII if `formatting` is supposed to be fed to

D2871: wireproto: service multiple command requests per HTTP request

yuja added inline comments. INLINE COMMENTS > wireprotoserver.py:557 > elif action == 'noop': > pass > else: Nit: `return False` instead of returning None? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2871 To: indygreg, #hg-reviewers,

[PATCH 5 of 7] procutil: bulk-replace util.std* to point to new module

# HG changeset patch # User Yuya Nishihara # Date 1521871773 -32400 # Sat Mar 24 15:09:33 2018 +0900 # Node ID 45b434eaa0d479be8078bbe16533d2b0d94c7220 # Parent 8adca2640e0b1eb61be50146d429d4276b6f52bd procutil: bulk-replace util.std* to point to new module diff --git

[PATCH 2 of 7] util: mark filtertable as private constant

# HG changeset patch # User Yuya Nishihara # Date 1521869914 -32400 # Sat Mar 24 14:38:34 2018 +0900 # Node ID 4bd2d19ecff7aa5ce3ce695427a478b9d3be9ff1 # Parent 348e7462944f36f0fbea25bcf407c78d68aeaa1f util: mark filtertable as private constant Prepares for porting to

[PATCH 7 of 7] util: deprecate procutil proxy functions (API)

# HG changeset patch # User Yuya Nishihara # Date 1521870855 -32400 # Sat Mar 24 14:54:15 2018 +0900 # Node ID 65d54e54ddbe7617f5434d9bf0add18318b4fa3d # Parent b7feaf3298d4ba5682624cafa6b87b6b09f31c13 util: deprecate procutil proxy functions (API) Several functions are

[PATCH 1 of 7] util: mark platform-specific gethgcmd() as private

# HG changeset patch # User Yuya Nishihara # Date 1521878683 -32400 # Sat Mar 24 17:04:43 2018 +0900 # Node ID 348e7462944f36f0fbea25bcf407c78d68aeaa1f # Parent 704932ef8913f9a4d0aaeca0ef1bdb1bda0ad87e util: mark platform-specific gethgcmd() as private util.hgcmd() is the

[PATCH 6 of 7] procutil: bulk-replace function calls to point to new module

# HG changeset patch # User Yuya Nishihara # Date 1521871851 -32400 # Sat Mar 24 15:10:51 2018 +0900 # Node ID b7feaf3298d4ba5682624cafa6b87b6b09f31c13 # Parent 45b434eaa0d479be8078bbe16533d2b0d94c7220 procutil: bulk-replace function calls to point to new module diff --git

[PATCH 3 of 7] util: stop using readfile() in tempfilter()

# HG changeset patch # User Yuya Nishihara # Date 1521869554 -32400 # Sat Mar 24 14:32:34 2018 +0900 # Node ID dd177967cc70361c854ac5b59672c1c903a11c7c # Parent 4bd2d19ecff7aa5ce3ce695427a478b9d3be9ff1 util: stop using readfile() in tempfilter() To unblock code move to

[PATCH] test-pathconflicts-merge: stop requiring symlink support

# HG changeset patch # User Matt Harbison # Date 1521943858 14400 # Sat Mar 24 22:10:58 2018 -0400 # Node ID a8a0cafcef7950055e6b321a315e6f53e506fcd6 # Parent 704932ef8913f9a4d0aaeca0ef1bdb1bda0ad87e test-pathconflicts-merge: stop requiring symlink support The

D2701: merge: use constants for actions

This revision was automatically updated to reflect the committed changes. Closed by commit rHG43ffd9070da1: merge: use constants for actions (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2701?vs=6662=7278 REVISION

D2702: commands: use constants for merge things

This revision was automatically updated to reflect the committed changes. Closed by commit rHG704932ef8913: commands: use constants for merge things (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2702?vs=6971=7279

D2698: merge: use constants for merge state record types

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa532b2f54f95: merge: use constants for merge state record types (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2692: merge: return an attrs class from update() and applyupdates()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG71543b942eea: merge: return an attrs class from update() and applyupdates() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2700: merge: use constants for merge record state

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa5199c7aa42: merge: use constants for merge record state (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2700?vs=6660=7277

D2699: merge: use constants for merge driver state

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1b158ca37ea4: merge: use constants for merge driver state (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2699?vs=6659=7276

D2394: histedit: make histedit's commands accept revsets (issue5746)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3d3cff1f6bde: histedit: make histedits commands accept revsets (issue5746) (authored by sangeet259, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2394: histedit: make histedit's commands accept revsets (issue5746)

durin42 accepted this revision. durin42 added a comment. This revision is now accepted and ready to land. queued, many thanks REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2394 To: sangeet259, durin42, #hg-reviewers Cc: pulkit, tom.prince, krbullock,

D2939: fsmonitor: layer on another hack in bser.c for os.stat() compat (issue5811)

durin42 updated this revision to Diff 7271. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2939?vs=7270=7271 REVISION DETAIL https://phab.mercurial-scm.org/D2939 AFFECTED FILES hgext/fsmonitor/pywatchman/bser.c CHANGE DETAILS diff --git

D2939: fsmonitor: layer on another hack in bser.c for os.stat() compat (issue5811)

durin42 added a subscriber: indygreg. durin42 added a comment. @indygreg I think you saw this failure mode, I'd appreciate it if you could check if this fixes the watchman failures I introduced (I don't use watchman, and so I'm not quite sure how to reproduce.) REPOSITORY rHG Mercurial

D2939: fsmonitor: layer on another hack in bser.c for os.stat() compat (issue5811)

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's unclear to me how these `bserobj_tuple` objects are used, other than as stat objects. This should fix fsmonitor in the wake of

D2694: merge: deprecate accessing update results by index

indygreg updated this revision to Diff 7269. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2694?vs=6970=7269 REVISION DETAIL https://phab.mercurial-scm.org/D2694 AFFECTED FILES hgext/histedit.py hgext/rebase.py mercurial/commands.py

Re: [PATCH] context: skip path conflicts by default when clearing unknown file (issue5776)

On Sat, Mar 24, 2018 at 01:25:14PM -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1521869450 14400 > # Sat Mar 24 01:30:50 2018 -0400 > # Node ID 7624b67b6d7512f283e9e589f5c36fe3e7e4bb16 > # Parent

D2693: histedit: always define update results

indygreg marked an inline comment as done. indygreg added inline comments. INLINE COMMENTS > martinvonz wrote in histedit.py:492 > remove the "stats and" now? This is done in the next commit :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2693 To: indygreg,

[PATCH] context: skip path conflicts by default when clearing unknown file (issue5776)

# HG changeset patch # User Matt Harbison # Date 1521869450 14400 # Sat Mar 24 01:30:50 2018 -0400 # Node ID 7624b67b6d7512f283e9e589f5c36fe3e7e4bb16 # Parent a61fff493d9888935a1ff5e48bb823499f47e832 context: skip path conflicts by default when clearing unknown file

D1944: wireproto: provide accessors for client capabilities

joerg.sonnenberger updated this revision to Diff 7268. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1944?vs=5011=7268 REVISION DETAIL https://phab.mercurial-scm.org/D1944 AFFECTED FILES mercurial/help/internals/wireprotocol.txt

D2752: cbor: add a __init__.py to top level cbor module

martinvonz added a comment. In https://phab.mercurial-scm.org/D2752#45926, @pulkit wrote: > In https://phab.mercurial-scm.org/D2752#44289, @indygreg wrote: > > > I think you should send the relative import patches to upstream. Adding `from __future__ import absolute_import` would

D2750: thirdparty: start vendoring cbor python library

martinvonz added a comment. Seems like a good idea to me. I had missed this series, but I just started thinking about having a state file for undo state and was not looking forward to coming up with another on-disk format. REPOSITORY rHG Mercurial REVISION DETAIL

mercurial@37055: 4 new changesets

4 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/8c3c47362934 changeset: 37052:8c3c47362934 user:Gregory Szorc date:Wed Mar 14 15:25:06 2018 -0700 summary: wireproto: implement basic frame reading and processing

D2852: wireproto: implement basic frame reading and processing

yuja added inline comments. INLINE COMMENTS > util.py:2569 > +res = self.read(len(b)) > +if res is None: > +return None I think read() never returns None. > wireprotoserver.py:402 > +action, meta = reactor.onframerecv(frametype, frameflags, payload) > +

mercurial@37051: 2 new changesets

2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/37d7a1d18b97 changeset: 37050:37d7a1d18b97 user:Gregory Szorc date:Tue Mar 13 19:44:59 2018 -0700 summary: wireproto: define content negotiation for HTTPv2

D2851: wireproto: define and implement protocol for issuing requests

yuja added inline comments. INLINE COMMENTS > wireprotocol.txt:486 > ++---+ > +| Flags (4) | > ++===+===| Nit: The order of Type and Flags seems a bit confusing. I read it as `flags << 4 | type` since this is a

D2850: wireproto: define content negotiation for HTTPv2

yuja added a comment. We might have to handle multiple `Accept` headers correctly, if a proxy server MAY modify them. I don't know if that could happen, though. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2850 To: indygreg, #hg-reviewers, durin42 Cc: yuja,

D2938: grep: make grep search on working directory by default

av6 added inline comments. INLINE COMMENTS > commands.py:2485 > +fm.data(node=fm.hexfunc(scmutil.binnode(ctx))) > +if not bool(opts.get('all')) and not bool(opts.get('rev')): > +cols = [ This line looks identical to the one later on, with Pulkit's comment

Re: [PATCH] url: make logginghttphandler compatible with Python 2.7.6

On Sat, Mar 24, 2018 at 9:39 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1521864147 -32400 > # Sat Mar 24 13:02:27 2018 +0900 > # Node ID f40b6e7fc011715b209774c0d1fbc5b8a6694401 > # Parent

D2938: grep: make grep search on working directory by default

yuja added inline comments. INLINE COMMENTS > commands.py:2474 > +return util.binary(flog.read(ctx.filenode(fn))) > +except AttributeError: > +return util.binary(ctx.filectx(fn).data()) Better to test if ctx is a workingctx (i.e. `ctx.rev() is None`).

Re: [PATCH 1 of 5] rcutil: directly call win32.executablepath()

On Sat, Mar 24, 2018 at 3:23 PM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1521865850 -32400 > # Sat Mar 24 13:30:50 2018 +0900 > # Node ID 9bfb1ec8fb375630cfca0e42b17676e1892bd90a > # Parent

Re: [PATCH] directaccess: do not abort by 'ff...' hash

On Sat, Mar 24, 2018 at 3:18 PM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1521879572 -32400 > # Sat Mar 24 17:19:32 2018 +0900 > # Node ID 3f765e4cbf4c1e53e0fd88992c079b321749d837 > # Parent

D2057: rust implementation of hg status

kevincox added a comment. The latest changes are looking really good. I have a couple more comments but I didn't have time for a full review. I'll try to get more reviewed tomorrow. It seems that you still have a lot of stuff still in-flight so I'll try to slowly review the changes as I

D2938: grep: make grep search on working directory by default

yuja added a comment. Perhaps we can start with adding an experimental option to grep files including unchanged ones? IIUC, the new default behavior is something like `hg grep -r "wdir()" --all-files`, which is basically `s/ctx.files()/ctx/`. (needless to say `--all-files` is a bad

D2938: grep: make grep search on working directory by default

sangeet259 updated this revision to Diff 7267. sangeet259 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2938?vs=7266=7267 REVISION DETAIL https://phab.mercurial-scm.org/D2938 AFFECTED FILES mercurial/commands.py

[PATCH 5 of 5] util: make safehasattr() a pycompat function

# HG changeset patch # User Yuya Nishihara # Date 1521869072 -32400 # Sat Mar 24 14:24:32 2018 +0900 # Node ID 92e5b042b91626cb9016e841ba823515d56f787e # Parent 5814bdd0d29ae544f62ca6a02678137b7e9de397 util: make safehasattr() a pycompat function So safehasattr() can be

[PATCH 3 of 5] test-bundle2-exchange: use error.Abort instead of util.Abort

# HG changeset patch # User Yuya Nishihara # Date 1521868184 -32400 # Sat Mar 24 14:09:44 2018 +0900 # Node ID 9e694251731bf82895a6976ecba1afa3ece3fe2d # Parent f69531100039b5c81677be7c9f10c7598966a120 test-bundle2-exchange: use error.Abort instead of util.Abort diff --git

[PATCH 2 of 5] util: use error.Abort instead of local alias

# HG changeset patch # User Yuya Nishihara # Date 1521868130 -32400 # Sat Mar 24 14:08:50 2018 +0900 # Node ID f69531100039b5c81677be7c9f10c7598966a120 # Parent 9bfb1ec8fb375630cfca0e42b17676e1892bd90a util: use error.Abort instead of local alias diff --git

[PATCH 4 of 5] util: drop util.Abort in favor of error.Abort (API)

# HG changeset patch # User Yuya Nishihara # Date 1521868417 -32400 # Sat Mar 24 14:13:37 2018 +0900 # Node ID 5814bdd0d29ae544f62ca6a02678137b7e9de397 # Parent 9e694251731bf82895a6976ecba1afa3ece3fe2d util: drop util.Abort in favor of error.Abort (API) IIRC, error.Abort

[PATCH 1 of 5] rcutil: directly call win32.executablepath()

# HG changeset patch # User Yuya Nishihara # Date 1521865850 -32400 # Sat Mar 24 13:30:50 2018 +0900 # Node ID 9bfb1ec8fb375630cfca0e42b17676e1892bd90a # Parent 3f765e4cbf4c1e53e0fd88992c079b321749d837 rcutil: directly call win32.executablepath() Since it isn't supported on

[PATCH] directaccess: do not abort by 'ff...' hash

# HG changeset patch # User Yuya Nishihara # Date 1521879572 -32400 # Sat Mar 24 17:19:32 2018 +0900 # Node ID 3f765e4cbf4c1e53e0fd88992c079b321749d837 # Parent f40b6e7fc011715b209774c0d1fbc5b8a6694401 directaccess: do not abort by 'ff...' hash Since the 'ff...' hash should

D2938: grep: make grep search on working directory by default

pulkit added a comment. No need to add Edit1, Edit2 in commit message. If something changes from one version to another that deserves mention, include that in commit message as normal. INLINE COMMENTS > commands.py:2583 > +# when nothing is passed in -r or --all > +if not

D2938: grep: make grep search on working directory by default

sangeet259 updated this revision to Diff 7266. sangeet259 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2938?vs=7262=7266 REVISION DETAIL https://phab.mercurial-scm.org/D2938 AFFECTED FILES mercurial/commands.py