Re: [PATCH 1 of 3] style: avoid an unnecessary line split

2016-11-25 Thread Sean Farley
Denis Laxalde writes: > # HG changeset patch > # User Denis Laxalde > # Date 1480061343 -3600 > # Fri Nov 25 09:09:03 2016 +0100 > # Node ID cde950264b07eb8626e0aa5aa2fbcd6b27f98c10 > # Parent 8836f13e3c5b8eae765372708b659c55a044cbb4 > #

Re: [PATCH] revlog: ensure that flags do not overflow 2 bytes

2016-11-25 Thread Jun Wu
Excerpts from Gregory Szorc's message of 2016-11-25 10:59:42 -0800: > I think having the check in offset_type() to catch all consumers is the > right place. (Another source of the flag is changegroup data via > revlog.addgroup() and cg.deltachunk().) > > To clarify, I'm suggesting that instead of

Re: [PATCH] revlog: ensure that flags do not overflow 2 bytes

2016-11-25 Thread Gregory Szorc
I think having the check in offset_type() to catch all consumers is the right place. (Another source of the flag is changegroup data via revlog.addgroup() and cg.deltachunk().) To clarify, I'm suggesting that instead of truncating "type" like this patch is doing, we should raise ValueError in

[PATCH 2 of 2] debugcommands: sort command order

2016-11-25 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1480096779 28800 # Fri Nov 25 09:59:39 2016 -0800 # Node ID 8c73c4648bec7c7cf6f1a2ba6b6adca99da55726 # Parent 7b8444ec642e29b1a8cb3e63909d5caf9e4166d7 debugcommands: sort command order The diff is a bit large but it

[PATCH 1 of 2] tests: add test that @commands in debugcommands.py are sorted

2016-11-25 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1480096505 28800 # Fri Nov 25 09:55:05 2016 -0800 # Node ID 7b8444ec642e29b1a8cb3e63909d5caf9e4166d7 # Parent 906a7d8e969552536fffe0df7a5e63bf5d79b34b tests: add test that @commands in debugcommands.py are sorted I

Re: [PATCH 3 of 3 V3] memctx: allow the memlightctx thats reusing the manifest node

2016-11-25 Thread Gregory Szorc
On Tue, Nov 22, 2016 at 2:18 PM, Jun Wu wrote: > Excerpts from Augie Fackler's message of 2016-11-21 18:26:16 -0500: > > Also, could histedit be updated to use this for 'mess' actions > > perhaps? Probably not easy, but if it is I'd love to see an in-tree > > client of this class.

Re: [PATCH] revlog: ensure that flags do not overflow 2 bytes

2016-11-25 Thread Gregory Szorc
On Fri, Nov 25, 2016 at 5:24 AM, Cotizo Sima wrote: > # HG changeset patch > # User Cotizo Sima > # Date 1480079985 28800 > # Fri Nov 25 05:19:45 2016 -0800 > # Node ID 4b311b730614941db6409f560ab9451bec74be75 > # Parent

Re: [PATCH] fsmonitor: be robust in the face of bad state

2016-11-25 Thread Martijn Pieters
On 25 November 2016 at 15:30, Simon Farnsworth wrote: > # HG changeset patch > # User Simon Farnsworth > # Date 1480087846 28800 > # Fri Nov 25 07:30:46 2016 -0800 > # Node ID 0ca34f1b83da754246ee33e01c4f7d6652061f5d > # Parent

Re: [PATCH] fsmonitor: be robust in the face of bad state

2016-11-25 Thread Mateusz Kwapich
The logic looks correct. It definitely makes the fsmonitor more robust. Excerpts from Simon Farnsworth's message of 2016-11-25 07:30:53 -0800: > # HG changeset patch > # User Simon Farnsworth > # Date 1480087846 28800 > # Fri Nov 25 07:30:46 2016 -0800 > # Node ID

[PATCH] fsmonitor: be robust in the face of bad state

2016-11-25 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1480087846 28800 # Fri Nov 25 07:30:46 2016 -0800 # Node ID 0ca34f1b83da754246ee33e01c4f7d6652061f5d # Parent a3163433647108b7bec8fc45896db1c20b18ab21 fsmonitor: be robust in the face of bad state fsmonitor could write

Re: [PATCH 7 of 7 v2] bdiff: give slight preference to removing trailing lines

2016-11-25 Thread Jun Wu
Excerpts from Mads Kiilerich's message of 2016-11-25 15:58:28 +0100: > On 11/24/2016 06:52 PM, Jun Wu wrote: > > Excerpts from Augie Fackler's message of 2016-11-17 12:42:26 -0500: > >> My own cursory perfbdiff runs suggest this is a perf wash (using > >> `perfbdiff -m 3041e4d59df2` in the mozilla

Re: [PATCH 7 of 7 v2] bdiff: give slight preference to removing trailing lines

2016-11-25 Thread Mads Kiilerich
On 11/24/2016 06:52 PM, Jun Wu wrote: Excerpts from Augie Fackler's message of 2016-11-17 12:42:26 -0500: My own cursory perfbdiff runs suggest this is a perf wash (using `perfbdiff -m 3041e4d59df2` in the mozilla repo). Queued. Thanks! I'd mention this series changes the behavior of the diff

Re: [PATCH] test-rebase-base: add test cases about multiple branches with merges

2016-11-25 Thread Mateusz Kwapich
Please, forgive my email client (or my misuse of it). The proper contents of my last reply are following: LGTM Excerpts from Jun Wu's message of 2016-11-25 12:49:01 +: > # HG changeset patch > # User Jun Wu > # Date 1480077830 0 > # Fri Nov 25 12:43:50 2016 + > #

Re: [PATCH] test-rebase-base: add test cases about multiple branches with merges

2016-11-25 Thread Mateusz Kwapich
-- ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial@30449: new changeset

2016-11-25 Thread Mercurial Commits
New changeset in mercurial: http://selenic.com/repo/hg//rev/a31634336471 changeset: 30449:a31634336471 bookmark:@ tag: tip user:Jun Wu date:Wed Nov 09 16:01:34 2016 + summary: drawdag: update test repos by drawing the changelog DAG in ASCII --

Re: [PATCH 2 of 2 V2] rebase: calculate ancestors for --base separately (issue5420)

2016-11-25 Thread Jun Wu
I have added "pathological" cases I can think of in patchwork.mercurial-scm.org/patch/17754/ I believe the current "--base" implementation is bug-free regarding to merges, otherwise "-s" will have bugs, too. Excerpts from Pierre-Yves David's message of 2016-11-23 16:54:51 +0100: > > On

Re: [PATCH V2] evolve: improve error message if unstable changes are disallowed

2016-11-25 Thread Mateusz Kwapich
LGTM, I suppose that timeless may also want to review it before it's queued. Excerpts from Pulkit Goyal's message of 2016-11-24 23:13:48 +0530: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1479915042 -19800 > # Wed Nov 23 21:00:42 2016 +0530 > # Node ID

Re: [PATCH 3 of 3 V3] memctx: allow the memlightctx thats reusing the manifest node

2016-11-25 Thread Mateusz Kwapich
I like the relocate idea. It would be an useful abstractions - we have a lot of things that are rewriting one commit at a time. Excerpts from Jun Wu's message of 2016-11-22 22:18:59 +: > Excerpts from Augie Fackler's message of 2016-11-21 18:26:16 -0500: > > Also, could histedit be updated to

[PATCH 1 of 3] style: avoid an unnecessary line split

2016-11-25 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1480061343 -3600 # Fri Nov 25 09:09:03 2016 +0100 # Node ID cde950264b07eb8626e0aa5aa2fbcd6b27f98c10 # Parent 8836f13e3c5b8eae765372708b659c55a044cbb4 # EXP-Topic revert/interactive-remove style: avoid an unnecessary

[PATCH 2 of 3] revert: indicate the default choice when prompting to forget files

2016-11-25 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1480061371 -3600 # Fri Nov 25 09:09:31 2016 +0100 # Node ID 0df7774c49eda9f95f255066cfddae296c13a33a # Parent cde950264b07eb8626e0aa5aa2fbcd6b27f98c10 # EXP-Topic revert/interactive-remove revert: indicate the

[PATCH 3 of 3] revert: prompt before removing files in interactive mode

2016-11-25 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1480061430 -3600 # Fri Nov 25 09:10:30 2016 +0100 # Node ID ea1c62be7e0782d32ddbee782ace3efee7ccdfdd # Parent 0df7774c49eda9f95f255066cfddae296c13a33a # EXP-Topic revert/interactive-remove revert: prompt before