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

I agree with pretty much all of that. Short standardized names that represent universal concepts in the codebase (like p1) are very useful. To steal Siracusa's description of Perl, it is a bit like Huffman coding: make the common case easy and short, and the more unusual case longer and more de

[PATCH evolve-ext] tests: add glob for Windows

# HG changeset patch # User Matt Harbison # Date 1489720627 14400 # Thu Mar 16 23:17:07 2017 -0400 # Node ID ab5c2bef148bfb60e1956a55de4b7ba00ebe1817 # Parent 6a3248558b6929378450b572bb27406afe703ffd tests: add glob for Windows diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t --- a/

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

Fix a cat typing. Excerpts from Jun Wu's message of 2017-03-16 20:12:28 -0700: > Just to add some notes on variable names. There are some very common short > names. Like "p1" representing "parent1". And "p1" should be preferred. An > incomplete list is at [1]. It's okay to use "fname" hetlridvnvrt

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

Just to add some notes on variable names. There are some very common short names. Like "p1" representing "parent1". And "p1" should be preferred. An incomplete list is at [1]. It's okay to use "fname" hetlridvnvrtrtf "filename". FWIW, Ruby community standard prefers longer names while Golang expli

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

Thanks a lot for the points re: variable names! I'm actually really happy to hear that -- these names were taken from elsewhere in the codebase, and they were very confusing. I have forgotten/had to relearn the difference between fcd/fca/fco/etc several times. Glad to hear that slightly longer/

Re: [PATCH 1 of 4 V3] filemerge: add `summarize()`

Two things are new here since last time -- detecting absentfilectxs and the 'else' case that runs when the origfile is missing. Let me know if the assumption there holds. The "look at the origfile" behavior (the "if" branch) came from the original code that launches the merge tool. On 3/16/1

[PATCH 2 of 4 V3] merge: add summarizeconflicts()

# HG changeset patch # User Phil Cohen # Date 1489716532 25200 # Thu Mar 16 19:08:52 2017 -0700 # Node ID 864def5028681cdffeaf5b440ff4753e1389f453 # Parent ad81d182e88ffd3da20364f18204facf6e7750a3 merge: add summarizeconflicts() calls `filemerge.summarize()` but only requires a workingctx a

[PATCH 3 of 4 V3] commands: add --tool=internal:dumpjson to resolve

# HG changeset patch # User Phil Cohen # Date 1489716587 25200 # Thu Mar 16 19:09:47 2017 -0700 # Node ID 36d378ac43dbbf559655c70b7cad873768a0e794 # Parent 864def5028681cdffeaf5b440ff4753e1389f453 commands: add --tool=internal:dumpjson to resolve diff --git a/mercurial/commands.py b/mercuri

[PATCH 1 of 4 V3] filemerge: add `summarize()`

# HG changeset patch # User Phil Cohen # Date 1489716177 25200 # Thu Mar 16 19:02:57 2017 -0700 # Node ID ad81d182e88ffd3da20364f18204facf6e7750a3 # Parent 568d80b24b3a3e4e6874ac0d95ddee056fef14e4 filemerge: add `summarize()` returns a dictionary of each version of a conflict, given the con

[PATCH 4 of 4 V3] filemerge: add test cases for corner cases using internal:dumpjson

# HG changeset patch # User Phil Cohen # Date 1489716623 25200 # Thu Mar 16 19:10:23 2017 -0700 # Node ID 62ab2ddcf1683c3bf2e4dbb21dbe11d065bff93b # Parent 36d378ac43dbbf559655c70b7cad873768a0e794 filemerge: add test cases for corner cases using internal:dumpjson diff --git a/mercurial/file

[PATCH evolve-ext] checks: correct the shebang line filtering for python files

# HG changeset patch # User Matt Harbison # Date 1489713417 14400 # Thu Mar 16 21:16:57 2017 -0400 # Node ID 6a3248558b6929378450b572bb27406afe703ffd # Parent e9d5f54765a27e09d35f48dda23db7e6f5b8320a checks: correct the shebang line filtering for python files As it is, the only related file

Re: [PATCH 1 of 8] commit: get rid of ui.backupconfig

Thanks! Excerpts from Martin von Zweigbergk's message of 2017-03-16 17:19:15 -0700: > On Thu, Mar 16, 2017 at 2:56 PM, Jun Wu wrote: > > # HG changeset patch > > # User Jun Wu > > # Date 1489698920 25200 > > # Thu Mar 16 14:15:20 2017 -0700 > > # Node ID def9b72933ce717a48e3cc8fa4934bd3459b

Re: [PATCH 1 of 8] commit: get rid of ui.backupconfig

On Thu, Mar 16, 2017 at 2:56 PM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489698920 25200 > # Thu Mar 16 14:15:20 2017 -0700 > # Node ID def9b72933ce717a48e3cc8fa4934bd3459b9479 > # Parent 5c9cda37d7f6b181ab604c8d5a7592b5553f886b > # Available At https://bitbucket.org/

Re: [PATCH 7 of 8] rebase: get rid of ui.backupconfig

Excerpts from Martin von Zweigbergk's message of 2017-03-16 17:14:33 -0700: > On Thu, Mar 16, 2017 at 2:57 PM, Jun Wu wrote: > > # HG changeset patch > > # User Jun Wu > > # Date 1489700434 25200 > > # Thu Mar 16 14:40:34 2017 -0700 > > # Node ID 8f87b407da24ee802e271f517dbc96ad32f21779 > >

Re: [PATCH 7 of 8] rebase: get rid of ui.backupconfig

On Thu, Mar 16, 2017 at 2:57 PM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1489700434 25200 > # Thu Mar 16 14:40:34 2017 -0700 > # Node ID 8f87b407da24ee802e271f517dbc96ad32f21779 > # Parent 8b086a28d1b605d6c0726d77c21f8d13188691fa > # Available At https://bitbucket.org/

Re: [PATCH 1 of 2 py3 V2] dirstate: use next(iter) instead of iter.next

On Fri, Mar 17, 2017 at 3:17 AM, Martin von Zweigbergk < martinv...@google.com> wrote: > On Thu, Mar 16, 2017 at 2:24 PM, Pulkit Goyal <7895pul...@gmail.com> > wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1489634873 -19800 > > # Thu Mar 16 08:57:53

Re: hg-git and round-tripping (and file copies?)

Mike Hommey wrote: > If your goal trying to round-trip between mercurial and git is to > provide developers with the possibility to use mercurial or git as they > like, and somehow make it work with developers pushing on both ends, you > should instead use a single source of truth (mercurial or gi

Re: hg-git and round-tripping (and file copies?)

On Thu, Mar 16, 2017 at 01:38:18PM -0700, Gregory Szorc wrote: > On Thu, Mar 16, 2017 at 1:05 PM, Danek Duvall > wrote: > > > In trying to convert > > > > https://hg.java.net/hg/solaris-userland~gate > > > > to a git repo and back, I'm seeing issues at changeset 34, where the hash > > changes

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

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 16e1d9557dcebfe827060a4d31781cb7498c2c45 > # Parent e082ef765e4112ef69d334

mercurial@31454: 27 new changesets

27 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/9b361478b03a changeset: 31428:9b361478b03a user:Pierre-Yves David date:Fri Aug 05 14:19:31 2016 +0200 summary: localrepo: use self.wvfs.islink directly https://www.mercurial-scm.org/repo/hg/rev/247136

[PATCH 7 of 8] rebase: get rid of ui.backupconfig

# HG changeset patch # User Jun Wu # Date 1489700434 25200 # Thu Mar 16 14:40:34 2017 -0700 # Node ID 8f87b407da24ee802e271f517dbc96ad32f21779 # Parent 8b086a28d1b605d6c0726d77c21f8d13188691fa # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 3 of 8] import: get rid of ui.backupconfig

# HG changeset patch # User Jun Wu # Date 1489699429 25200 # Thu Mar 16 14:23:49 2017 -0700 # Node ID 01931210cd8d62aa56447843c096ea57bdf03889 # Parent 7b575fd8a7a1e9a96cd79352351d87ac69479270 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 8 of 8] shelve: get rid of ui.backupconfig

# HG changeset patch # User Jun Wu # Date 1489699661 25200 # Thu Mar 16 14:27:41 2017 -0700 # Node ID 4f98fa7baebed161fe94c98661a8c404dd82a87d # Parent 8f87b407da24ee802e271f517dbc96ad32f21779 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 5 of 8] histedit: get rid of ui.backupconfig

# HG changeset patch # User Jun Wu # Date 1489700195 25200 # Thu Mar 16 14:36:35 2017 -0700 # Node ID 93772a7ad2c443b7c92d0d23e85405f5b0d1a800 # Parent 4ff0515eaa03cf3fdd2b19a3444eb9c2cebdbcea # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

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

# 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.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 2 of 8] clone: get rid of ui.backupconfig

# HG changeset patch # User Jun Wu # Date 1489699130 25200 # Thu Mar 16 14:18:50 2017 -0700 # Node ID 7b575fd8a7a1e9a96cd79352351d87ac69479270 # Parent def9b72933ce717a48e3cc8fa4934bd3459b9479 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 4 of 8] record: get rid of ui.backupconfig

# HG changeset patch # User Jun Wu # Date 1489700075 25200 # Thu Mar 16 14:34:35 2017 -0700 # Node ID 4ff0515eaa03cf3fdd2b19a3444eb9c2cebdbcea # Parent 01931210cd8d62aa56447843c096ea57bdf03889 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 1 of 8] commit: get rid of ui.backupconfig

# HG changeset patch # User Jun Wu # Date 1489698920 25200 # Thu Mar 16 14:15:20 2017 -0700 # Node ID def9b72933ce717a48e3cc8fa4934bd3459b9479 # Parent 5c9cda37d7f6b181ab604c8d5a7592b5553f886b # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

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

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1489639281 -19800 # Thu Mar 16 10:11:21 2017 +0530 # Node ID 16e1d9557dcebfe827060a4d31781cb7498c2c45 # Parent e082ef765e4112ef69d3345369b142c87f1da3f4 revlog: explicitly evaluate list to return On python 3, map returns a

Re: [PATCH 1 of 2 py3 V2] dirstate: use next(iter) instead of iter.next

On Thu, Mar 16, 2017 at 2:24 PM, Pulkit Goyal <7895pul...@gmail.com> wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1489634873 -19800 > # Thu Mar 16 08:57:53 2017 +0530 > # Node ID c894bad6625973565b21f556896527141f123dd5 > # Parent a5bad127128d8f60060be53

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

# 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 commands: make sure using byteschr rather than ascii values 'MAR!?IC'

[PATCH 1 of 2 py3 V2] dirstate: use next(iter) instead of iter.next

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1489634873 -19800 # Thu Mar 16 08:57:53 2017 +0530 # Node ID c894bad6625973565b21f556896527141f123dd5 # Parent a5bad127128d8f60060be53d161acfa7a32a17d5 dirstate: use next(iter) instead of iter.next In Python 3 world, iter

Re: hg-git and round-tripping (and file copies?)

Gregory Szorc wrote: > It is effectively impossible to round-trip between Git and Mercurial when > file copies are involved. This is because Mercurial's filelog hashes > include copy metadata and the parent nodes. Git's blob hashes, by contrast, > are effectively content only. When you convert fro

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

On Thu, Mar 16, 2017 at 1:47 PM, Martin von Zweigbergk wrote: > On Thu, Mar 16, 2017 at 8:31 AM, Yuya Nishihara wrote: >> # HG changeset patch >> # User Yuya Nishihara >> # Date 1488980906 -32400 >> # Wed Mar 08 22:48:26 2017 +0900 >> # Node ID aae1bd4b8a03ffe6cb47c23da55b2f70ff5607ef >> #

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

On Thu, Mar 16, 2017 at 8:31 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1488980906 -32400 > # Wed Mar 08 22:48:26 2017 +0900 > # Node ID aae1bd4b8a03ffe6cb47c23da55b2f70ff5607ef > # Parent f39291c08d86082579b891e844cbd56752b44a59 > pycompat: add bytest

Re: hg-git and round-tripping (and file copies?)

On Thu, Mar 16, 2017 at 1:05 PM, Danek Duvall wrote: > In trying to convert > > https://hg.java.net/hg/solaris-userland~gate > > to a git repo and back, I'm seeing issues at changeset 34, where the hash > changes for reasons I can't see. If I do a diff of the debug log, I see > it's due to t

hg-git and round-tripping (and file copies?)

In trying to convert https://hg.java.net/hg/solaris-userland~gate to a git repo and back, I'm seeing issues at changeset 34, where the hash changes for reasons I can't see. If I do a diff of the debug log, I see it's due to the manifest: $ diff -u =(hg log -R userland-more --debug -r 34

[PATCH 2 of 2 STABLE] exchange: use v2 bundles for modern compression engines (issue5506)

# HG changeset patch # User Gregory Szorc # Date 1489692795 25200 # Thu Mar 16 12:33:15 2017 -0700 # Branch stable # Node ID 35019434aad6952ee9b3b41ee78a5a3efea9a0ab # Parent 8fed20619acd7a4346408e5819a1c91c52a39ed2 exchange: use v2 bundles for modern compression engines (issue5506) Previou

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

# HG changeset patch # User Gregory Szorc # Date 1489692236 25200 # Thu Mar 16 12:23:56 2017 -0700 # Branch stable # Node ID 8fed20619acd7a4346408e5819a1c91c52a39ed2 # Parent 86cd1f2cfff5d5f5ebda227b147ad71a59058323 exchange: reject new compression engines for v1 bundles (issue5506) Version

[Bug 5506] New: bundle -t zstd fails on long-lived repository

https://bz.mercurial-scm.org/show_bug.cgi?id=5506 Bug ID: 5506 Summary: bundle -t zstd fails on long-lived repository Product: Mercurial Version: 4.1.1 Hardware: All OS: All Status: UNCONFIRMED Severity: b

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

# 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 cleanup # Available At https://www.mercurial-scm.org/repo/users/marmoute/mer

Re: [PATCH] util: explicitly tests for None

That one is a V2, but I failed to invoque `hg email` correctly :-( On 03/16/2017 11:16 AM, 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 a5bad12712

[PATCH] wfile: fix deprecation warning version

# 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 fix-depr # Available At https://www.mercurial-scm.org/repo/users/marmoute/me

mercurial@31427: 4 new changesets

4 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/4acc49335a6e changeset: 31424:4acc49335a6e user:Martin von Zweigbergk date:Wed Mar 15 09:30:50 2017 -0700 summary: py3: optimize py3 compat.bytechr using Struct.pack https://www.mercurial-scm.org/repo/

[PATCH] util: explicitly tests for None

# 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 mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

Re: Dropping support for Python 2.6 on Windows

On 16/03/2017 10:14, Augie Fackler wrote: On Thu, Mar 16, 2017 at 09:54:27AM -0700, Gregory Szorc wrote: There is a brewing discussion about the future of Python 2.6 in Mercurial. I'd like to start with what I think will be an easy proposal: officially dropping support for 2.6 on Windows. I'm

Re: [PATCH 3 of 7] parsers: avoid PyList_Append when parsing obs markers

> On Mar 16, 2017, at 10:43, Gregory Szorc wrote: > > Last time we had the Rust discussion, we couldn't ship Rust due to distro > packaging support. Has that changed? My gut feeling with my maintainer hat on is that any rust speedups would need to be opt-in, much like today's C speedups. My u

Re: [PATCH 3 of 7] parsers: avoid PyList_Append when parsing obs markers

On Thu, Mar 16, 2017 at 10:12 AM, Augie Fackler wrote: > > > On Mar 16, 2017, at 10:09, Gregory Szorc > wrote: > > > >> On Thu, Mar 16, 2017 at 9:50 AM, Augie Fackler wrote: > >> On Mon, Mar 13, 2017 at 10:24:21PM -0700, Gregory Szorc wrote: > >> > On Mon, Mar 13, 2017 at 10:15 PM, Gregory Szor

Re: [PATCH] branchmap: handle nullrev in setcachedata

On Wed, Mar 15, 2017 at 03:51:27PM -0700, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1489618137 25200 > # Wed Mar 15 15:48:57 2017 -0700 > # Node ID 6257ea07d629e83e85f68d0c83202b4111f6d4fd > # Parent e83302d437485620c9bc25921f724af34cd5dd55 > branchmap: handle

Re: [PATCH 3 of 3] py3: call codecs.escape_encode() directly

On Thu, Mar 16, 2017 at 12:09:50AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1489588119 -32400 > # Wed Mar 15 23:28:39 2017 +0900 > # Node ID fb6b172146566c203a18113536002a6f4b296879 > # Parent 8b8d561c82ee5c11827674dfff2866067d034eea > py3: call co

Re: [PATCH 7 of 7] py3: prove hg tip works

On Mon, Mar 13, 2017 at 11:59:08AM -0700, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1489422293 25200 > # Mon Mar 13 09:24:53 2017 -0700 > # Node ID f414ec9383e4c4dde3cbede18ef6afd71a78b474 > # Parent 2657aad32bdde8ab6225d988a0a5cd979f6834d1 > py3: prove hg

Re: Dropping support for Python 2.6 on Windows

On 3/16/17 09:54, Gregory Szorc wrote: There is a brewing discussion about the future of Python 2.6 in Mercurial. I'd like to start with what I think will be an easy proposal: officially dropping support for 2.6 on Windows. Sounds reasonable to me. First, I think dropping 2.6 on Windows doe

Re: [PATCH v2] exewrapper: prefer HackableMercurial python if availbale

On Mon, Mar 13, 2017 at 01:06:41PM -0700, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi > # Date 1489434253 25200 > # Mon Mar 13 12:44:13 2017 -0700 > # Node ID 83925d3a3306e7023b4b43757812285b40fcd90b > # Parent 7548522742b5f4f9f5c0881ae4a2783ecda2f969 > exewrappe

Re: Dropping support for Python 2.6 on Windows

On Thu, Mar 16, 2017 at 09:54:27AM -0700, Gregory Szorc wrote: > There is a brewing discussion about the future of Python 2.6 in Mercurial. > I'd like to start with what I think will be an easy proposal: officially > dropping support for 2.6 on Windows. I'm in favor of this. Perhaps also sound the

Re: [PATCH 3 of 7] parsers: avoid PyList_Append when parsing obs markers

> On Mar 16, 2017, at 10:09, Gregory Szorc wrote: > >> On Thu, Mar 16, 2017 at 9:50 AM, Augie Fackler wrote: >> On Mon, Mar 13, 2017 at 10:24:21PM -0700, Gregory Szorc wrote: >> > On Mon, Mar 13, 2017 at 10:15 PM, Gregory Szorc >> > wrote: >> > Assuming there is some truth to the numbers, holy

Re: [PATCH 3 of 7] parsers: avoid PyList_Append when parsing obs markers

On Thu, Mar 16, 2017 at 9:50 AM, Augie Fackler wrote: > On Mon, Mar 13, 2017 at 10:24:21PM -0700, Gregory Szorc wrote: > > On Mon, Mar 13, 2017 at 10:15 PM, Gregory Szorc > > > wrote: > > Assuming there is some truth to the numbers, holy cow the overhead of > > PyObject creation is crazy. I sudd

Re: [PATCH] import-checkers: split tests of the tool from running it on the source

On Tue, Mar 14, 2017 at 11:16:36PM -0700, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1489558028 25200 > # Tue Mar 14 23:07:08 2017 -0700 > # Node ID 6e53450f1d41962edb5df6c2ff35d79adc04c775 > # Parent ed23f929af38e3249a4c0b258939e89782b20795 > # EXP-T

Re: [PATCH 2 of 8] util: explicitly tests for None

On Thu, Mar 16, 2017 at 04:28:06AM -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 6d73a06abb85612fca7231fb71f245f82f7d6863 > # Parent 6c6d8c0cc67de1ecd744a30889419510aa2064d2 > # EXP-T

Re: [PATCH 4 of 4] py3: use bytestr wrapper in revsetlang.tokenize()

On Fri, Mar 17, 2017 at 12:31:13AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1489667781 -32400 > # Thu Mar 16 21:36:21 2017 +0900 > # Node ID d21fd508342b1d43ebefaac65f1d6e2e5ca60704 > # Parent 649866574c86bae35ab8143c50af72bee7fef810 > py3: use byt

Re: [PATCH 2 of 2] localrepo: deprecated '_link'

On Wed, Mar 15, 2017 at 08:25:16AM -0700, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1470399345 -7200 > # Fri Aug 05 14:15:45 2016 +0200 > # Node ID c94039261ff0af3bcc5f7ff060d43eaf36a135f8 > # Parent 91ac4c04240637400bb3f172fc80ff011acfcfb7 > # EXP-T

Re: [PATCH V2] py3: use iter() instead of iterkeys()

On Thu, Mar 16, 2017 at 09:44:54AM +0530, Pulkit Goyal wrote: > On Thu, Mar 16, 2017 at 4:58 AM, Rishabh Madan > wrote: > > > # HG changeset patch > > # User Rishabh Madan > > # Date 1489620203 -19800 > > # Thu Mar 16 04:53:23 2017 +0530 > > # Node ID aab99adf3fd2f100f134ef7378faf4367550a4eb

Dropping support for Python 2.6 on Windows

There is a brewing discussion about the future of Python 2.6 in Mercurial. I'd like to start with what I think will be an easy proposal: officially dropping support for 2.6 on Windows. First, I think dropping 2.6 on Windows doesn't really buy us anything significant. 2.6 and 2.7 build with the sam

Re: [PATCH 5 of 7] [RFC] parsers: create a dedicated type for an obs marker

On Thu, Mar 16, 2017 at 09:17:05AM -0700, Gregory Szorc wrote: > On Thu, Mar 16, 2017 at 7:34 AM, Yuya Nishihara wrote: > > > On Mon, 13 Mar 2017 22:15:47 -0700, Gregory Szorc wrote: > > > # HG changeset patch > > > # User Gregory Szorc > > > # Date 1489467734 25200 > > > # Mon Mar 13 22:02:

Re: [PATCH 3 of 7] parsers: avoid PyList_Append when parsing obs markers

On Mon, Mar 13, 2017 at 10:24:21PM -0700, Gregory Szorc wrote: > On Mon, Mar 13, 2017 at 10:15 PM, Gregory Szorc > wrote: > Assuming there is some truth to the numbers, holy cow the overhead of > PyObject creation is crazy. I suddenly feel like auditing the C code for > everywhere we're instantiat

Re: [PATCH 1 of 8] rebase: explicitly tests for None

On Thu, Mar 16, 2017 at 09:35:12AM -0700, Gregory Szorc wrote: > On Thu, Mar 16, 2017 at 4:28 AM, Pierre-Yves David < > pierre-yves.da...@ens-lyon.org> wrote: > > > # HG changeset patch > > # User Pierre-Yves David > > # Date 1489615423 25200 > > # Wed Mar 15 15:03:43 2017 -0700 > > # Node ID

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

> On Mar 15, 2017, at 21:12, Jun Wu wrote: > > Another thing that git does (reasonably, I think) is to set default > environment variable. Say if we decide to go with shell=False, set LESS=FRX > so people using pager.pager=less will have a better experience. We should add that environment varia

[Bug 5505] New: UnboundLocalError: local variable 'prompts' referenced before assignment

https://bz.mercurial-scm.org/show_bug.cgi?id=5505 Bug ID: 5505 Summary: UnboundLocalError: local variable 'prompts' referenced before assignment Product: Mercurial Version: 4.1.1 Hardware: PC OS: Windows

Re: [PATCH 1 of 8] rebase: explicitly tests for None

On Thu, Mar 16, 2017 at 4:28 AM, Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1489615423 25200 > # Wed Mar 15 15:03:43 2017 -0700 > # Node ID 6c6d8c0cc67de1ecd744a30889419510aa2064d2 > # Parent 361bccce566afe250c8d258f

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

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 the "calloc" perf issue > mentioned > > by Yuya. I think it's safe to

Re: [PATCH 5 of 7] [RFC] parsers: create a dedicated type for an obs marker

On Thu, Mar 16, 2017 at 7:34 AM, Yuya Nishihara wrote: > On Mon, 13 Mar 2017 22:15:47 -0700, Gregory Szorc wrote: > > # HG changeset patch > > # User Gregory Szorc > > # Date 1489467734 25200 > > # Mon Mar 13 22:02:14 2017 -0700 > > # Node ID b4159d4c3683f03b6962991f318b080d849d6ba3 > > # P

[PATCH 3 of 4] py3: use bytestr wrapper in revsetlang.formatspec()

# HG changeset patch # User Yuya Nishihara # Date 1489667605 -32400 # Thu Mar 16 21:33:25 2017 +0900 # Node ID 649866574c86bae35ab8143c50af72bee7fef810 # Parent aae1bd4b8a03ffe6cb47c23da55b2f70ff5607ef py3: use bytestr wrapper in revsetlang.formatspec() This backs out 1c48a8278b2f and wraps

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

# HG changeset patch # User Yuya Nishihara # Date 1488980906 -32400 # Wed Mar 08 22:48:26 2017 +0900 # Node ID aae1bd4b8a03ffe6cb47c23da55b2f70ff5607ef # Parent f39291c08d86082579b891e844cbd56752b44a59 pycompat: add bytestr wrapper which mostly acts as a Python 2 str This allows us to handl

[PATCH 4 of 4] py3: use bytestr wrapper in revsetlang.tokenize()

# HG changeset patch # User Yuya Nishihara # Date 1489667781 -32400 # Thu Mar 16 21:36:21 2017 +0900 # Node ID d21fd508342b1d43ebefaac65f1d6e2e5ca60704 # Parent 649866574c86bae35ab8143c50af72bee7fef810 py3: use bytestr wrapper in revsetlang.tokenize() This backs out 77270ec0cdd9 and wraps p

[PATCH 1 of 4] tests: allow running doctests selectively on Python 3

# HG changeset patch # User Yuya Nishihara # Date 1488978812 -32400 # Wed Mar 08 22:13:32 2017 +0900 # Node ID f39291c08d86082579b891e844cbd56752b44a59 # Parent 63a39d64788872a5742f8e3143b7ddd603e3af13 tests: allow running doctests selectively on Python 3 Currently most doctests fail on Pyt

Re: [PATCH 1 of 3 py3] error: convert the error into strings to pass into ui.warn()

On Thu, 16 Mar 2017 13:23:23 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1489638672 -19800 > # Thu Mar 16 10:01:12 2017 +0530 > # Node ID 47dae3bbf8560824743293870aab601da2d1ed6c > # Parent 63aeb39b5802644ae99eaa5cf0666f3bf5cc4e90 >

Re: [PATCH 2 of 3 py3] commands: convert opts back to bytes for status

On Thu, 16 Mar 2017 13:23:24 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1489639200 -19800 > # Thu Mar 16 10:10:00 2017 +0530 > # Node ID de18c43f8ce17d52542e6df233e809b6a6ee0a07 > # Parent 47dae3bbf8560824743293870aab601da2d1ed6c >

Re: [PATCH 3 of 3 py3] context: explicitly evaluate list returned by map

On Thu, 16 Mar 2017 13:23:25 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1489639281 -19800 > # Thu Mar 16 10:11:21 2017 +0530 > # Node ID 8d85d7ca9fd3eea90a2f09c7d471fc3f3c78d430 > # Parent de18c43f8ce17d52542e6df233e809b6a6ee0a07 >

Re: [PATCH 5 of 7] [RFC] parsers: create a dedicated type for an obs marker

On Mon, 13 Mar 2017 22:15:47 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1489467734 25200 > # Mon Mar 13 22:02:14 2017 -0700 > # Node ID b4159d4c3683f03b6962991f318b080d849d6ba3 > # Parent d600bd4edd62b3ee74730f1282e53b9d596bbaec > [RFC] parsers: create

Re: [PATCH 4 of 7] parsers: handle refcounting of "parents" consistently

On Mon, 13 Mar 2017 22:15:46 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1489452553 25200 > # Mon Mar 13 17:49:13 2017 -0700 > # Node ID d600bd4edd62b3ee74730f1282e53b9d596bbaec > # Parent 6d3b13f243bea2c9200eecb827d7ec0ea771fc54 > parsers: handle refco

Re: [PATCH 3 of 7] parsers: avoid PyList_Append when parsing obs markers

On Mon, 13 Mar 2017 22:15:45 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1489454332 25200 > # Mon Mar 13 18:18:52 2017 -0700 > # Node ID 6d3b13f243bea2c9200eecb827d7ec0ea771fc54 > # Parent 3b997adb7efece7395fb585a70b2d70522626648 > parsers: avoid PyList

mercurial@31423: 5 new changesets

5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/1fc3d1f02865 changeset: 31419:1fc3d1f02865 user:Pulkit Goyal <7895pul...@gmail.com> date:Thu Mar 16 06:32:33 2017 +0530 summary: scmutil: make function name bytes in class filecache https://www.mercuria

Re: [PATCH 1 of 2 V2] py3: optimize py3 compat.bytechr using Struct.pack

On Wed, 15 Mar 2017 10:33:11 -0700, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1489595450 25200 > # Wed Mar 15 09:30:50 2017 -0700 > # Node ID db74b2599efc1997b0e7e6bb7b699717029c11d8 > # Parent e83302d437485620c9bc25921f7

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

On Mar 16, 2017 00:18, "Pulkit Goyal" <7895pul...@gmail.com> wrote: On Thu, Mar 16, 2017 at 10:14 AM, Martin von Zweigbergk < martinv...@google.com> wrote: > On Wed, Mar 15, 2017 at 9:13 PM, Pulkit Goyal <7895pul...@gmail.com> > wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul..

[PATCH 3 of 8] mq: explicitly tests for None

# HG changeset patch # User Pierre-Yves David # Date 1489615554 25200 # Wed Mar 15 15:05:54 2017 -0700 # Node ID 27d5ab143c3344006509c5a3b29e2cb66445aa04 # Parent 6d73a06abb85612fca7231fb71f245f82f7d6863 # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

[PATCH 6 of 8] hgweb: explicitly tests for None

# HG changeset patch # User Pierre-Yves David # Date 1489615864 25200 # Wed Mar 15 15:11:04 2017 -0700 # Node ID 28093cead8791382a984b4c80dcedbe529ea7c41 # Parent 1596b4613bec63db08c0d4d10e3f26f5635ce21b # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

[PATCH 2 of 8] util: explicitly tests for None

# HG changeset patch # User Pierre-Yves David # Date 1489615634 25200 # Wed Mar 15 15:07:14 2017 -0700 # Node ID 6d73a06abb85612fca7231fb71f245f82f7d6863 # Parent 6c6d8c0cc67de1ecd744a30889419510aa2064d2 # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

[PATCH 7 of 8] filemerge: explicitly tests for None

# HG changeset patch # User Pierre-Yves David # Date 1489615912 25200 # Wed Mar 15 15:11:52 2017 -0700 # Node ID 414372f08c44186c8dad9dea46d617ab61412503 # Parent 28093cead8791382a984b4c80dcedbe529ea7c41 # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

[PATCH 4 of 8] match: explicitly tests for None

# HG changeset patch # User Pierre-Yves David # Date 1489615725 25200 # Wed Mar 15 15:08:45 2017 -0700 # Node ID 83112ff862072df863540c8c9356f64eb26faa41 # Parent 27d5ab143c3344006509c5a3b29e2cb66445aa04 # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

[PATCH 8 of 8] context: explicitly tests for None

# HG changeset patch # User Pierre-Yves David # Date 1489617204 25200 # Wed Mar 15 15:33:24 2017 -0700 # Node ID d912b21f4721d399fd327b6bb7179de7e2a614b6 # Parent 414372f08c44186c8dad9dea46d617ab61412503 # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

[PATCH 5 of 8] hgweb: explicitly tests for None in webutil

# HG changeset patch # User Pierre-Yves David # Date 1489615809 25200 # Wed Mar 15 15:10:09 2017 -0700 # Node ID 1596b4613bec63db08c0d4d10e3f26f5635ce21b # Parent 83112ff862072df863540c8c9356f64eb26faa41 # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

[PATCH 1 of 8] rebase: explicitly tests for None

# HG changeset patch # User Pierre-Yves David # Date 1489615423 25200 # Wed Mar 15 15:03:43 2017 -0700 # Node ID 6c6d8c0cc67de1ecd744a30889419510aa2064d2 # Parent 361bccce566afe250c8d258f770a908713b2d13f # EXP-Topic mutable-default # Available At https://www.mercurial-scm.org/repo/users/marm

Re: [PATCH 7 of 7] test: add a basic 'test-check-pylint.t'

On 03/15/2017 10:13 AM, Kevin Bullock wrote: On Mar 15, 2017, at 11:35, Gregory Szorc wrote: On Mar 15, 2017, at 07:56, Kevin Bullock wrote: On Mar 15, 2017, at 02:01, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1482964970 -3600 # Wed Dec 28 23:4

[PATCH 3 of 3 py3] context: explicitly evaluate list returned by map

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1489639281 -19800 # Thu Mar 16 10:11:21 2017 +0530 # Node ID 8d85d7ca9fd3eea90a2f09c7d471fc3f3c78d430 # Parent de18c43f8ce17d52542e6df233e809b6a6ee0a07 context: explicitly evaluate list returned by map On python 3, map re

[PATCH 2 of 3 py3] commands: convert opts back to bytes for status

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1489639200 -19800 # Thu Mar 16 10:10:00 2017 +0530 # Node ID de18c43f8ce17d52542e6df233e809b6a6ee0a07 # Parent 47dae3bbf8560824743293870aab601da2d1ed6c commands: convert opts back to bytes for status diff -r 47dae3bbf856

[PATCH 1 of 3 py3] error: convert the error into strings to pass into ui.warn()

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1489638672 -19800 # Thu Mar 16 10:01:12 2017 +0530 # Node ID 47dae3bbf8560824743293870aab601da2d1ed6c # Parent 63aeb39b5802644ae99eaa5cf0666f3bf5cc4e90 error: convert the error into strings to pass into ui.warn() diff -r

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

On Thu, Mar 16, 2017 at 10:14 AM, Martin von Zweigbergk < martinv...@google.com> wrote: > On Wed, Mar 15, 2017 at 9:13 PM, Pulkit Goyal <7895pul...@gmail.com> > wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1489635793 -19800 > > # Thu Mar 16 09:13:1