Re: [PATCH V2] hgwebdir: add support for explicit index files

2017-03-17 Thread Yuya Nishihara
On Tue, 14 Mar 2017 23:26:40 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1488770552 18000 > # Sun Mar 05 22:22:32 2017 -0500 > # Node ID d24cb60edbc782ea1ee4f5625accc83f9ec3e3ca > # Parent 1c48a8278b2f015fca607dfc652823560a5ac580 > hgwebdir: add support

mercurial@31474: 2 new changesets (2 on stable)

2017-03-17 Thread Mercurial Commits
2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ffed3bf5cd4c changeset: 31473:ffed3bf5cd4c branch: stable parent: 31277:86cd1f2cfff5 user:Gregory Szorc date:Thu Mar 16 12:23:56 2017 -0700 summary: exchange: reject new compress

Re: [PATCH] subrepo: move prompts out of the if (issue5505)

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 13:18:35 -0700, Simon Farnsworth wrote: > On 17/03/2017 13:10, Simon Farnsworth wrote: > > > diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t > > --- a/tests/test-subrepo.t > > +++ b/tests/test-subrepo.t > > @@ -349,7 +349,7 @@ > > local removed, remote changed, keep c

Re: [PATCH 1 of 4 V2] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 20:17:48 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489464645 25200 > # Mon Mar 13 21:10:45 2017 -0700 > # Node ID 19a0f5164fcd28240327beffc3c90cdddfb17123 > # Parent 96929bd6e58d29bc3d44e1db7c1283f224bd1dc1 > # Available At https://bitbucket.or

Re: [PATCH] tests: allow ModuleNotFoundError in addition to ImportError

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 10:06:00 -0700, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1489769929 25200 > # Fri Mar 17 09:58:49 2017 -0700 > # Node ID 0308a2a076f5e9591c3f4b6da8f42a96eb6ec2d4 > # Parent d1ce2124ec83d3eef61aa0e6b7e

Re: [PATCH config easy] ui: move configlist parser to config.py

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 09:34:09 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489767596 25200 > # Fri Mar 17 09:19:56 2017 -0700 > # Node ID 012156d455f06480e3825edb450fcb37b63e9a1c > # Parent 96929bd6e58d29bc3d44e1db7c1283f224bd1dc1 > # Available At https://bitbucket.or

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Mar 17, 2017 at 7:01 PM, Yuya Nishihara wrote: > On Fri, 17 Mar 2017 11:42:03 -0700, Martin von Zweigbergk via Mercurial-devel > wrote: >> On Fri, Mar 17, 2017 at 11:22 AM, Rishabh Madan >> wrote: >> >> > The replace() function for py3 wasn't working when `value` was being >> > typecaste

[PATCH 1 of 4 V2] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489464645 25200 # Mon Mar 13 21:10:45 2017 -0700 # Node ID 19a0f5164fcd28240327beffc3c90cdddfb17123 # Parent 96929bd6e58d29bc3d44e1db7c1283f224bd1dc1 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 3 of 4 V2] histedit: use safecleanupnode in _aborthistedit (issue5500)

2017-03-17 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489468938 25200 # Mon Mar 13 22:22:18 2017 -0700 # Node ID 4b3b1a9932d9af65893d293a92684649f0d25772 # Parent e9c84e5081e18d67e061bae2a77e7465d8a6f685 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 2 of 4 V2] histedit: use safecleanupnode in _finishhistedit

2017-03-17 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489468746 25200 # Mon Mar 13 22:19:06 2017 -0700 # Node ID e9c84e5081e18d67e061bae2a77e7465d8a6f685 # Parent 19a0f5164fcd28240327beffc3c90cdddfb17123 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 4 of 4 V2] histedit: inline cleanupnode

2017-03-17 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489469407 25200 # Mon Mar 13 22:30:07 2017 -0700 # Node ID 059f7bf163769c1483f8f1dacf2de70d4808a0ae # Parent 4b3b1a9932d9af65893d293a92684649f0d25772 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

mercurial@31472: 18 new changesets

2017-03-17 Thread Mercurial Commits
18 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/7b5fb4b0c0e8 changeset: 31455:7b5fb4b0c0e8 user:Jun Wu date:Thu Mar 16 14:15:20 2017 -0700 summary: commit: get rid of ui.backupconfig https://www.mercurial-scm.org/repo/hg/rev/2545ee88a57e changeset:

Re: [PATCH 1 of 2 STABLE] exchange: reject new compression engines for v1 bundles (issue5506)

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 20:26:39 +0900, FUJIWARA Katsunori wrote: > At Thu, 16 Mar 2017 12:33:33 -0700, > Gregory Szorc wrote: > > > > # HG changeset patch > > # User Gregory Szorc > > # Date 1489692236 25200 > > # Thu Mar 16 12:23:56 2017 -0700 > > # Branch stable > > # Node ID 8fed20619acd7a43

Re: [PATCH 6 of 8] mq: get rid of ui.backupconfig

2017-03-17 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-03-18 11:34:21 +0900: > On Thu, 16 Mar 2017 14:57:01 -0700, Jun Wu wrote: > > # HG changeset patch > > # User Jun Wu > > # Date 1489700358 25200 > > # Thu Mar 16 14:39:18 2017 -0700 > > # Node ID 8b086a28d1b605d6c0726d77c21f8d13188691fa > > # Par

Re: [PATCH 1 of 4] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-03-18 11:48:30 +0900: > (+CC Pierre-Yves) I guess he may be busy with other stuffs. > I meant they both could be iterators/generators now, but 'sucs' wouldn't > be by design. I'm saying that because it seems not common to take a nested > iterator as

Re: [PATCH 1 of 4] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 19:25:18 -0700, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-03-18 11:13:36 +0900: > > On Fri, 17 Mar 2017 08:37:14 -0700, Jun Wu wrote: > > > Excerpts from Yuya Nishihara's message of 2017-03-17 22:32:45 +0900: > > > > On Mon, 13 Mar 2017 22:36:16 -0700, Jun W

Re: [PATCH 6 of 8] mq: get rid of ui.backupconfig

2017-03-17 Thread Yuya Nishihara
On Thu, 16 Mar 2017 14:57:01 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489700358 25200 > # Thu Mar 16 14:39:18 2017 -0700 > # Node ID 8b086a28d1b605d6c0726d77c21f8d13188691fa > # Parent 93772a7ad2c443b7c92d0d23e85405f5b0d1a800 > # Available At https://bitbucket.or

Re: [PATCH 1 of 4] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-03-18 11:13:36 +0900: > On Fri, 17 Mar 2017 08:37:14 -0700, Jun Wu wrote: > > Excerpts from Yuya Nishihara's message of 2017-03-17 22:32:45 +0900: > > > On Mon, 13 Mar 2017 22:36:16 -0700, Jun Wu wrote: > > > > # HG changeset patch > > > > # User Jun W

Re: [PATCH 1 of 4] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 08:37:14 -0700, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-03-17 22:32:45 +0900: > > On Mon, 13 Mar 2017 22:36:16 -0700, Jun Wu wrote: > > > # HG changeset patch > > > # User Jun Wu > > > # Date 1489464645 25200 > > > # Mon Mar 13 21:10:45 2017 -0700 >

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 11:42:03 -0700, Martin von Zweigbergk via Mercurial-devel wrote: > On Fri, Mar 17, 2017 at 11:22 AM, Rishabh Madan > wrote: > > > The replace() function for py3 wasn't working when `value` was being > > typecasted as str. When I used pycompat.bytestr the error was resolved. >

Re: [PATCH] subrepo: move prompts out of the if (issue5505)

2017-03-17 Thread Simon Farnsworth
On 17/03/2017 17:28, FUJIWARA Katsunori wrote: At Fri, 17 Mar 2017 13:10:57 -0700, Simon Farnsworth wrote: # HG changeset patch # User Simon Farnsworth # Date 1489781443 25200 # Fri Mar 17 13:10:43 2017 -0700 # Node ID 0ccc212fc0224209864e8c902920a91acd1bc414 # Parent a5bad127128d8f60060

Re: [PATCH] subrepo: move prompts out of the if (issue5505)

2017-03-17 Thread FUJIWARA Katsunori
At Fri, 17 Mar 2017 13:10:57 -0700, Simon Farnsworth wrote: > > # HG changeset patch > # User Simon Farnsworth > # Date 1489781443 25200 > # Fri Mar 17 13:10:43 2017 -0700 > # Node ID 0ccc212fc0224209864e8c902920a91acd1bc414 > # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 > subrepo: mov

Re: [PATCH] subrepo: move prompts out of the if (issue5505)

2017-03-17 Thread Simon Farnsworth
On 17/03/2017 13:10, Simon Farnsworth wrote: diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -349,7 +349,7 @@ local removed, remote changed, keep changed $ hg merge 6 - remote [merge rev] changed subrepository s which local

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Mar 17, 2017 at 1:12 PM, Martin von Zweigbergk < martinv...@google.com> wrote: > > > On Fri, Mar 17, 2017 at 1:09 PM, Rishabh Madan > wrote: > >> >> Oh, so bytestr.replace() does return a bytestr. I guess I just >>> misunderstood Yuya then. Yuya, can you confirm? >> >> >> I was talking ab

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Mar 17, 2017 at 1:09 PM, Rishabh Madan wrote: > > Oh, so bytestr.replace() does return a bytestr. I guess I just >> misunderstood Yuya then. Yuya, can you confirm? > > > I was talking about value. I tried isinstance(value.replace('\n', '\\n'), > pycompat.bytestr) and it returns false. The

[PATCH] subrepo: move prompts out of the if (issue5505)

2017-03-17 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1489781443 25200 # Fri Mar 17 13:10:43 2017 -0700 # Node ID 0ccc212fc0224209864e8c902920a91acd1bc414 # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 subrepo: move prompts out of the if (issue5505) Prompts weren't available in the else cl

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Rishabh Madan
> Oh, so bytestr.replace() does return a bytestr. I guess I just > misunderstood Yuya then. Yuya, can you confirm? I was talking about value. I tried isinstance(value.replace('\n', '\\n'), pycompat.bytestr) and it returns false. The type of value.replace('\n', '\\n') returns ``. ᐧ On Sat, Mar 18

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Mar 17, 2017 at 12:55 PM, Rishabh Madan wrote: > Do you know how that works? Since it's not pycompat.bytestr, I don't >> understand what makes it work. So if you add something like this at the end >> of the "if fm.isplain():" block: >> if pycompat.ispy3: >>prin

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Rishabh Madan
> > Do you know how that works? Since it's not pycompat.bytestr, I don't > understand what makes it work. So if you add something like this at the end > of the "if fm.isplain():" block: > if pycompat.ispy3: >print 'value is bytestr', isinstance(value, > pycompat.bytestr)

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Mar 17, 2017 at 11:22 AM, Rishabh Madan wrote: > The replace() function for py3 wasn't working when `value` was being > typecasted as str. When I used pycompat.bytestr the error was resolved. > So I guess it is preserved by such methods. > Do you know how that works? Since it's not pycom

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Rishabh Madan
The replace() function for py3 wasn't working when `value` was being typecasted as str. When I used pycompat.bytestr the error was resolved. So I guess it is preserved by such methods. ᐧ On Fri, Mar 17, 2017 at 10:45 PM, Martin von Zweigbergk < martinv...@google.com> wrote: > > > On Fri, Mar 17,

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Mar 17, 2017 at 6:49 AM, Rishabh Madan wrote: > Sorry. I didn't know that changing the changeset message for V2 forwards > it as a different stream. > ᐧ > > On Fri, Mar 17, 2017 at 7:14 PM, Rishabh Madan > wrote: > >> # HG changeset patch >> # User Rishabh Madan >> # Date 1489758142 -19

[PATCH] tests: allow ModuleNotFoundError in addition to ImportError

2017-03-17 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1489769929 25200 # Fri Mar 17 09:58:49 2017 -0700 # Node ID 0308a2a076f5e9591c3f4b6da8f42a96eb6ec2d4 # Parent d1ce2124ec83d3eef61aa0e6b7ef89c738a5d8fe tests: allow ModuleNotFoundError in addition to ImportError My environment (Python

[PATCH config easy] ui: move configlist parser to config.py

2017-03-17 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1489767596 25200 # Fri Mar 17 09:19:56 2017 -0700 # Node ID 012156d455f06480e3825edb450fcb37b63e9a1c # Parent 96929bd6e58d29bc3d44e1db7c1283f224bd1dc1 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

Re: [PATCH 01 of 10 RFC v2] ui: refactoring handling of trusted, user and overlay

2017-03-17 Thread Jun Wu
Another issue with the "compat" layer outside "ucfg" or "tcfg" is that it cannot handle the case where ucfg or tcfg have different ui.compat setting. I just discovered this when writing the immutable stuff. Hopefully I can send a V1 today. Excerpts from David Soria Parra's message of 2017-03-12 1

Re: [PATCH 1 of 4] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-03-17 22:32:45 +0900: > On Mon, 13 Mar 2017 22:36:16 -0700, Jun Wu wrote: > > # HG changeset patch > > # User Jun Wu > > # Date 1489464645 25200 > > # Mon Mar 13 21:10:45 2017 -0700 > > # Node ID b4cf155f7a41ebf314407000f6948716ae0a64e2 > > # Par

[PATCH 3 of 4] graphlog: pass function arguments without expansion

2017-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1489482973 -32400 # Tue Mar 14 18:16:13 2017 +0900 # Node ID 9a758c848fe08e97386fca95d2428aa003939b4d # Parent 49922515f01eae376dcc9af7b04d450d301e4782 graphlog: pass function arguments without expansion It's annoying on Python 3 because key

[PATCH 4 of 4] py3: convert log opts to bytes-key dict

2017-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1489483439 -32400 # Tue Mar 14 18:23:59 2017 +0900 # Node ID d32b1cfe597ebe2093c42b67e85143190eda0e8b # Parent 9a758c848fe08e97386fca95d2428aa003939b4d py3: convert log opts to bytes-key dict Now simple log command works. diff --git a/mercu

[PATCH 2 of 4] py3: call codecs.escape_decode() directly

2017-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1489762102 -32400 # Fri Mar 17 23:48:22 2017 +0900 # Node ID 49922515f01eae376dcc9af7b04d450d301e4782 # Parent fa032607ed52a0ba605bb4c496426ffb01b09c54 py3: call codecs.escape_decode() directly The same rule as 3b7a6941a6ef applies. diff --

[PATCH 1 of 4] util: wrap s.decode('string_escape') calls for future py3 compatibility

2017-03-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1489761766 -32400 # Fri Mar 17 23:42:46 2017 +0900 # Node ID fa032607ed52a0ba605bb4c496426ffb01b09c54 # Parent 96929bd6e58d29bc3d44e1db7c1283f224bd1dc1 util: wrap s.decode('string_escape') calls for future py3 compatibility diff --git a/merc

[Bug 5507] New: Merge fails with "assert sf not in data['diverge']"

2017-03-17 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5507 Bug ID: 5507 Summary: Merge fails with "assert sf not in data['diverge']" Product: Mercurial Version: 4.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severi

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 19:14:26 +0530, Rishabh Madan wrote: > # HG changeset patch > # User Rishabh Madan > # Date 1489758142 -19800 > # Fri Mar 17 19:12:22 2017 +0530 > # Node ID 3d6d9294e2247316541942c4bec5186cb5772cd6 > # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 > py3: change explicit

Re: [PATCH 2 of 2] pager: skip running the pager if it's set to 'cat'

2017-03-17 Thread Yuya Nishihara
On Wed, 15 Mar 2017 21:44:26 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1489624466 14400 > # Wed Mar 15 20:34:26 2017 -0400 > # Node ID bc0c38ec3f7be807607d4fdf871f344e7079d992 > # Parent 07d488f16da6e12b225d2827f1020f32c8050a7a > pager: skip running t

Re: [PATCH V2] merge: add `internal:dumpjson` tool to `resolve`, which outputs conflict state

2017-03-17 Thread Yuya Nishihara
On Tue, 7 Mar 2017 11:40:59 -0800, Phil Cohen wrote: > # HG changeset patch > # User Phil Cohen > # Date 1488915535 28800 > # Tue Mar 07 11:38:55 2017 -0800 > # Node ID bbce62e3790220f19e7b37160a2f8351b7461272 > # Parent 91e86a6c61c0c6a3b554eefeba906311aa29 > merge: add `internal:dumpjso

Re: [PATCH py3] global: add __bool__ to every class defining __nonzero__

2017-03-17 Thread Yuya Nishihara
On Mon, 13 Mar 2017 12:40:49 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1489434014 25200 > # Mon Mar 13 12:40:14 2017 -0700 > # Node ID a00f6470c72774efa74b04ed46e5d0918224de0a > # Parent e6b177a3a7662366e8af0ba07ccbd9509a8cc647 > global: add __bool__

Re: [PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Rishabh Madan
Sorry. I didn't know that changing the changeset message for V2 forwards it as a different stream. ᐧ On Fri, Mar 17, 2017 at 7:14 PM, Rishabh Madan wrote: > # HG changeset patch > # User Rishabh Madan > # Date 1489758142 -19800 > # Fri Mar 17 19:12:22 2017 +0530 > # Node ID 3d6d9294e224731

[PATCH V2] py3: change explicit conversion from str to pycompat.bytestr

2017-03-17 Thread Rishabh Madan
# HG changeset patch # User Rishabh Madan # Date 1489758142 -19800 # Fri Mar 17 19:12:22 2017 +0530 # Node ID 3d6d9294e2247316541942c4bec5186cb5772cd6 # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 py3: change explicit conversion from str to pycompat.bytestr diff -r a5bad127128d -r 3d6d9

Re: [PATCH V3] config: honour the trusted flag in ui.configint

2017-03-17 Thread Yuya Nishihara
On Sun, 12 Mar 2017 11:43:36 -0700, Martijn Pieters wrote: > # HG changeset patch > # User Martijn Pieters > # Date 1489344211 25200 > # Sun Mar 12 11:43:31 2017 -0700 > # Node ID 35cda6af86792b3fa979c41709d3742f8443af31 > # Parent abf029200e198878a4576a87e095bd8d77d9cea9 > config: honour th

Re: [PATCH py3] global: add __bool__ to every class defining __nonzero__

2017-03-17 Thread Yuya Nishihara
On Mon, 13 Mar 2017 12:40:49 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1489434014 25200 > # Mon Mar 13 12:40:14 2017 -0700 > # Node ID a00f6470c72774efa74b04ed46e5d0918224de0a > # Parent e6b177a3a7662366e8af0ba07ccbd9509a8cc647 > global: add __bool__

Re: [PATCH] merge: also allow 'e' action with experimental.updatecheck=noconflict

2017-03-17 Thread Yuya Nishihara
On Mon, 13 Mar 2017 22:16:19 -0700, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1489467523 25200 > # Mon Mar 13 21:58:43 2017 -0700 > # Node ID bed0d8465c94c4f19f3bc32b8e427b2d23fa6cda > # Parent 3d3109339b57341b333c1112beb

Re: [PATCH 1 of 4] histedit: add a method to cleanup nodes safely

2017-03-17 Thread Yuya Nishihara
On Mon, 13 Mar 2017 22:36:16 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489464645 25200 > # Mon Mar 13 21:10:45 2017 -0700 > # Node ID b4cf155f7a41ebf314407000f6948716ae0a64e2 > # Parent 3d3109339b57341b333c1112beb41dd281fa944a > # Available At https://bitbucket.or

Re: [PATCH 01 of 11] bdiff: use Python memory allocator in fixws

2017-03-17 Thread Yuya Nishihara
On Thu, 16 Mar 2017 09:27:14 -0700, Gregory Szorc wrote: > On Wed, Mar 15, 2017 at 11:16 PM, Jun Wu wrote: > > > Excerpts from Jun Wu's message of 2017-03-15 23:15:13 -0700: > > > I think it makes sense to migrate Python modules to PyMem_*. > > > > > > However, I'm also a bit conservative about t

Re: [PATCH] osutil: fix potential wrong fd close

2017-03-17 Thread Yuya Nishihara
On Wed, 15 Mar 2017 20:56:56 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489635792 25200 > # Wed Mar 15 20:43:12 2017 -0700 > # Node ID ebcce969e076146ae9aa3690c35373123f5f508d > # Parent fb1b5cd17664218f73ed6ba604973b817932593e > # Available At https://bitbucket.or

Re: [PATCH] util: explicitly tests for None

2017-03-17 Thread Yuya Nishihara
On Thu, 16 Mar 2017 11:16:01 -0700, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1489615634 25200 > # Wed Mar 15 15:07:14 2017 -0700 > # Node ID 4f99a4fb0482a44178f96c29678ef4630056ff4e > # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 > # EXP-Topic m

Re: [PATCH 2 of 4] pycompat: add bytestr wrapper which mostly acts as a Python 2 str

2017-03-17 Thread Yuya Nishihara
On Thu, 16 Mar 2017 13:58:20 -0700, Martin von Zweigbergk wrote: > On Thu, Mar 16, 2017 at 1:47 PM, Martin von Zweigbergk > >> > >> bytechr = chr > >> +bytestr = str > > > > Could this even be 'identity' (which apparently doesn't exist, so > > would be 'lambda s: s' or something)? Will str

Re: [PATCH py3 V2] revlog: explicitly evaluate list to return

2017-03-17 Thread Yuya Nishihara
On Thu, 16 Mar 2017 15:34:11 -0700, Gregory Szorc wrote: > On Thu, Mar 16, 2017 at 2:51 PM, Pulkit Goyal <7895pul...@gmail.com> wrote: > > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1489639281 -19800 > > # Thu Mar 16 10:11:21 2017 +0530 > > # Node ID 16e1

Re: [PATCH] context: simplify call to icase matcher in 'match()'

2017-03-17 Thread Yuya Nishihara
On Thu, 16 Mar 2017 11:50:12 -0700, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1489617482 25200 > # Wed Mar 15 15:38:02 2017 -0700 > # Node ID d980847dfbb24f63306441d86a75741df851d3ee > # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 > # EXP-Topic c

Re: [PATCH 2 of 2 py3 V2] commands: make sure using byteschr rather than ascii values

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 02:54:50 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1489635793 -19800 > # Thu Mar 16 09:13:13 2017 +0530 > # Node ID ec82445ccda47996e58a0c33fbbe8dbd7be0d2aa > # Parent c894bad6625973565b21f556896527141f123dd5 >

Re: [PATCH] wfile: fix deprecation warning version

2017-03-17 Thread Yuya Nishihara
On Thu, 16 Mar 2017 11:24:31 -0700, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1489688275 25200 > # Thu Mar 16 11:17:55 2017 -0700 > # Node ID d26d5987f6ef6a8a260f2aef67838a66b9fe > # Parent b2fb0fd239b88f0f9ec70c43f30d2f1ef0cb1049 > # EXP-Topic f

Re: [PATCH] py3: change explicit conversion from str to bytes

2017-03-17 Thread Yuya Nishihara
On Fri, 17 Mar 2017 17:13:53 +0530, Rishabh Madan wrote: > # HG changeset patch > # User Rishabh Madan > # Date 1489746142 -19800 > # Fri Mar 17 15:52:22 2017 +0530 > # Node ID 2aac5780c5b3c30602ca128cfeb6e38a42f2c0fb > # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 > py3: change explicit

[PATCH] py3: change explicit conversion from str to bytes

2017-03-17 Thread Rishabh Madan
# HG changeset patch # User Rishabh Madan # Date 1489746142 -19800 # Fri Mar 17 15:52:22 2017 +0530 # Node ID 2aac5780c5b3c30602ca128cfeb6e38a42f2c0fb # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 py3: change explicit conversion from str to bytes diff -r a5bad127128d -r 2aac5780c5b3 mer

Re: [PATCH 1 of 2 STABLE] exchange: reject new compression engines for v1 bundles (issue5506)

2017-03-17 Thread FUJIWARA Katsunori
At Thu, 16 Mar 2017 12:33:33 -0700, Gregory Szorc wrote: > > # HG changeset patch > # User Gregory Szorc > # Date 1489692236 25200 > # Thu Mar 16 12:23:56 2017 -0700 > # Branch stable > # Node ID 8fed20619acd7a4346408e5819a1c91c52a39ed2 > # Parent 86cd1f2cfff5d5f5ebda227b147ad71a59058323 >