martinvonz added a comment.
In https://phab.mercurial-scm.org/D2593#44291, @indygreg wrote:
> Not sure where to record this comment in this series. So I'll pick this
commit.
>
> I think we want an explicit version header in the state files so clients
know when they may be reading a f
martinvonz added inline comments.
INLINE COMMENTS
> state.py:117-120
> +@readoldstatefile('graftstate')
> +def oldgraftstate(fp):
> +nodes = fp.read().splitlines()
> +return {'nodes': nodes}
Shouldn't this code be in commands.py? I don't think we should centralize the
code for parsing a
martinvonz added a comment.
INLINE COMMENTS
> durin42 wrote in state.py:84
> Probably treat not-a-dict as corrupt and fall back to the other format?
How about not requiring it to be a dict? I imagine practically all callers will
want to pass a dict, but why does this class have to enforce it
martinvonz added inline comments.
INLINE COMMENTS
> state.py:104
> +should return a dict of data stored in state file."""
> +assert path not in oldstatefilefns
> +oldstatefilefns[path] = func
I think we're used ProgrammingError elsewhere for this kind of thing
REPOSITORY
martinvonz added a comment.
> This patch moves the file which is used to write state files easily in a
good way using the cbor format.
Is "moves the file" referring to "import from the evolve extension"? It would
also be good to be more concrete about what "easily in a good way" means. I
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
https://www.mercurial-scm.org/repo/hg
# 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 unwrapastype() ca
# 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 a/mercurial/templateutil
# 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 evalastype() int
# 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 as stringify().
# 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 a/mercurial/tem
# 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 subsequent patches.
# 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
diff --git a/m
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 704932ef8913f9a4d0aaeca0ef1bdb1bda0ad87e
> test-pathconflicts-me
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 = node.bi
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 `
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, durin42
# 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 utils.*.
diff --git a
# 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 re-exported by utils
# 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 a/mercurial/chgserver.
# 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 public interface f
# 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 a/contrib/dumprev
# 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 utils.*. It's merely
# 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 errors from the last time I to
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&id=7278
REVISIO
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&id=7279
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&id=72
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
https://phab.mercurial-scm.org/D2698?vs=6658
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
https://phab.mercurial-scm.org/D
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&id=72
This revision was automatically updated to reflect the committed changes.
indygreg marked an inline comment as done.
Closed by commit rHG0351fb0153ba: histedit: always define update results
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3d3cff1f6bde: histedit: make histedit's commands
accept revsets (issue5746) (authored by sangeet259, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org
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, rishabhmad
durin42 updated this revision to Diff 7271.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2939?vs=7270&id=7271
REVISION DETAIL
https://phab.mercurial-scm.org/D2939
AFFECTED FILES
hgext/fsmonitor/pywatchman/bser.c
CHANGE DETAILS
diff --git a/hgext/f
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
RE
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
https://phab.mercurial-scm.or
indygreg updated this revision to Diff 7269.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2694?vs=6970&id=7269
REVISION DETAIL
https://phab.mercurial-scm.org/D2694
AFFECTED FILES
hgext/histedit.py
hgext/rebase.py
mercurial/commands.py
mercuria
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 a61fff493d9888935a1ff5e48bb823499f47e832
> context: skip p
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, dur
# 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 (issue5776)
Prior to add
joerg.sonnenberger updated this revision to Diff 7268.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1944?vs=5011&id=7268
REVISION DETAIL
https://phab.mercurial-scm.org/D1944
AFFECTED FILES
mercurial/help/internals/wireprotocol.txt
mercurial/sshpee
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 also
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
https://phab.mercurial-
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
https://www.mercurial-scm.org/repo/hg/
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)
> +
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
https://www.mercurial-scm.org/repo/hg/rev/402
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 little-en
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,
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
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 db114320df7ee744047fe9a92a01afc40f9d0e87
> url: make logginghtt
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`).
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 3f765e4cbf4c1e53e0fd88992c079b321749d837
> rcutil: directly cal
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 f40b6e7fc011715b209774c0d1fbc5b8a6694401
> directaccess: do not
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 have
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
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&id=7267
REVISION DETAIL
https://phab.mercurial-scm.org/D2938
AFFECTED FILES
mercurial/commands.p
# 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 imported by utils.*
# 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 a/tests/test-bund
# 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 exists since Mercur
# 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 a/mercurial/util.py b/mercurial/u
# 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 POSIX platform,
# 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 never be hidden,
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 bool(opts.
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&id=7266
REVISION DETAIL
https://phab.mercurial-scm.org/D2938
AFFECTED FILES
mercurial/commands.p
64 matches
Mail list logo