[PATCH 1 of 4] statprof: return state from stop()

# HG changeset patch # User Gregory Szorc # Date 1478316157 25200 # Fri Nov 04 20:22:37 2016 -0700 # Node ID cffcf1865da6bdeb0a59de9ac00c563bbadf1a9b # Parent d06c049695e6ad3219e7479c65ce98a2f123e878 statprof: return state from stop() I don't like global variables.

[PATCH 3 of 4] profiling: make statprof the default profiler (BC)

# HG changeset patch # User Gregory Szorc # Date 1478321065 25200 # Fri Nov 04 21:44:25 2016 -0700 # Node ID dfd8e1f11e33fc1ba6cba429818ad0ea6e84dadc # Parent 503459ea99f4b5fa4bd2827e36de2e1e8a7696f8 profiling: make statprof the default profiler (BC) The statprof

[PATCH 2 of 2] hghave: check darcs version more strictly

# HG changeset patch # User Yuya Nishihara # Date 1478319653 -32400 # Sat Nov 05 13:20:53 2016 +0900 # Node ID 5aa8ce5ded5e10b4830975a2735e0143750f2f7c # Parent 566a342697a2740f94fd85006f7dac0580bd473b hghave: check darcs version more strictly test-convert-darcs.t suddenly

[Bug 5415] New: Unexpected merge result ignored changes in p2 branch

https://bz.mercurial-scm.org/show_bug.cgi?id=5415 Bug ID: 5415 Summary: Unexpected merge result ignored changes in p2 branch Product: Mercurial Version: 4.0 Hardware: All OS: All Status: UNCONFIRMED

Re: [PATCH evolve-ext] fold: disallow multiple revisions without --exact

On Fri, Nov 4, 2016 at 4:58 PM, Martin von Zweigbergk via Mercurial-devel < mercurial-devel@mercurial-scm.org> wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1478303512 25200 > # Fri Nov 04 16:51:52 2016 -0700 > # Node ID

Re: [PATCH 7 of 7] py3: use encoding.environ in ui.py

On Thu, Nov 3, 2016 at 3:45 AM, Pulkit Goyal <7895pul...@gmail.com> wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1478122977 -19800 > # Thu Nov 03 03:12:57 2016 +0530 > # Node ID 9bdf6ee77b17dc2a1ce29fb347e90bd8dd17eaed > # Parent

Re: [PATCH 3 of 7] py3: make scmpoxis.systemrcpath() return bytes

> We can't assume external encoding is UTF-8. IIRC, Augie had some patches > to work around the sys.argv issue. Well this was the thread, the patch didn't went through https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-October/089207.html I think Augie was talking of this link maybe -

[Bug 5414] New: hgweb annotate spends a lot of time in _adjustlinkrev

https://bz.mercurial-scm.org/show_bug.cgi?id=5414 Bug ID: 5414 Summary: hgweb annotate spends a lot of time in _adjustlinkrev Product: Mercurial Version: default branch Hardware: All OS: All Status: UNCONFIRMED

Re: [PATCH 2 of 7] py3: make sure osutil.listdir() returns what it gets

On Fri, Nov 4, 2016 at 9:07 AM, Yuya Nishihara wrote: > On Thu, 03 Nov 2016 03:53:07 +0530, Pulkit Goyal wrote: >> # HG changeset patch >> # User Pulkit Goyal <7895pul...@gmail.com> >> # Date 1478118344 -19800 >> # Thu Nov 03 01:55:44 2016 +0530 >> # Node ID

Re: [PATCH 5 of 6 V5] manifest: get rid of manifest.readshallowfast

On Fri, Nov 4, 2016 at 4:06 PM, Durham Goode wrote: > > > On 11/4/16 3:43 PM, Martin von Zweigbergk wrote: >> >> On Wed, Nov 2, 2016 at 6:30 PM, Durham Goode wrote: >>> >>> # HG changeset patch >>> # User Durham Goode >>> # Date 1478131847 25200 >>>

Re: [PATCH 4 of 6 V5] manifest: add shallow option to treemanifestctx.readdelta and readfast

On Wed, Nov 2, 2016 at 6:29 PM, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1478131847 25200 > # Wed Nov 02 17:10:47 2016 -0700 > # Branch stable > # Node ID 488f0af8cb92461a67b47bfe259e3378bb00769c > # Parent

Re: [PATCH 5 of 6 V5] manifest: get rid of manifest.readshallowfast

On Wed, Nov 2, 2016 at 6:30 PM, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1478131847 25200 > # Wed Nov 02 17:10:47 2016 -0700 > # Branch stable > # Node ID 42cbc5a35d816cf9e5c0ab31791ab90df8004dab > # Parent

[PATCH] treemanifest: fix a "treeinmem" case

# HG changeset patch # User Martin von Zweigbergk # Date 1478292555 25200 # Fri Nov 04 13:49:15 2016 -0700 # Node ID b69b0c25c1acacee1512009188953eedc3425b49 # Parent 14c1b24e087e0e725e3572e0dd746b560660f423 treemanifest: fix a "treeinmem" case f2c5b9d48b29

Re: [PATCH 1 of 5 STABLE] tests: invoke printenv.py via sh -c for test portability

timeless wrote: > I'm sure this is already in, but wouldn't it be better to use a > $PYTHON than `sh -c`? FUJIWARA Katsunori wrote: > I don't have strong opinion for using "sh -c". > > But, if we use $PYTHON instead of `sh -c` (= backing d19787db6fe0 > out), we should change many "sh -c

Re: [PATCH 3 of 4] tests: merge 'test-push-validation.t' into 'test-push.t'

Pierre-Yves David wrote: > tests: merge 'test-push-validation.t' into 'test-push.t' > > That test file is very small and is merge with the new 'test-push.t'. No logic > is changed but repository name are update to avoid collision. > > We don't register this as a copy because is actually a "ypoc"

Re: Topics [was: news from the topic experiment]

Sean Farley wrote: > For what it's worth, I've started to work on another repo implementing > what Erik suggested. It removes 'stacks' (since that's obviously out of > scope) and implements a topic-like branch workflow. So far, it's been a > good experiment and requires very little change. I'll

to abort / to continue (UX)

timeless wrote: > technically this isn't wonderful, if you use bookmarks, `hg up -C .` > isn't equivalent to `hg up -C {currentbookmark}`, and if you're using > hg-git or something that puts significant weight on your active > bookmark, this can lead you into some very unfortunate weeds. Martin

[Bug 5413] New: nested labels get incorrectly colored

https://bz.mercurial-scm.org/show_bug.cgi?id=5413 Bug ID: 5413 Summary: nested labels get incorrectly colored Product: Mercurial Version: 4.0-rc Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

Re: [PATCH 2 of 2 python-hglib] util: drop mutable default from popen()

On Wed, 2016-10-19 at 00:12 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1476803147 -32400 > #  Wed Oct 19 00:05:47 2016 +0900 > # Node ID 50ce9593ec69508946fc2f9fc88d79a6b9bcfc33 > # Parent  1ec4c46d309dcaef7a9bab6415cacbc5caf72dfe >

Re: [PATCH python-hglib v3] Allow hglib user to get call backs for prompts, output and errors

On Fri, 2016-10-28 at 22:24 +0900, Yuya Nishihara wrote: > On Fri, 28 Oct 2016 11:35:27 +0100, Barry A. Scott wrote: > > > > # HG changeset patch > > # User Barry A. Scott > > # Date 1477650800 -3600 > > #  Fri Oct 28 11:33:20 2016 +0100 > > # Node ID

Re: [PATCH 1 of 5 STABLE] tests: invoke printenv.py via sh -c for test portability

At Fri, 4 Nov 2016 10:27:59 -0400, timeless wrote: > > I'm sure this is already in, but wouldn't it be better to use a > $PYTHON than `sh -c`? I don't have strong opinion for using "sh -c". But, if we use $PYTHON instead of `sh -c` (= backing d19787db6fe0 out), we should change many "sh -c

Re: [PATCH 1 of 3 evolve-ext] evolve: suggest "hg update -C .", including '.', to abort evolve

On Fri, Nov 4, 2016, 07:30 timeless wrote: > technically this isn't wonderful, if you use bookmarks, `hg up -C .` > isn't equivalent to `hg up -C {currentbookmark}`, and if you're using > hg-git or something that puts significant weight on your active > bookmark, this can

Re: [PATCH v5] copy: distinguish "file exists" cases and add a hint (BC)

Kevin Bullock wrote: > I'm not totally clear on what our approach to translations during a freeze is > either. I'm going by the freeze rules on the wiki, and the fact that > translation always happens on stable anyway, both of which lead me to believe > it should be okay? We should probably

Re: [PATCH 1 of 5 STABLE] tests: invoke printenv.py via sh -c for test portability

I'm sure this is already in, but wouldn't it be better to use a $PYTHON than `sh -c`? On Fri, Oct 28, 2016 at 2:16 PM, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1477676685 -32400 > # Sat Oct 29

Re: Pre-commit hook ignoring rc

Thanks to Murphy's law, after spending the afternoon trying to figure out what was wrong, I found the problem about 5 minutes after posting this email. User error:-) On Nov 4, 2016 4:30 AM, "Pierre-Yves David" wrote: > > > On 11/03/2016 07:45 PM, Peter Kronenberg

Re: Pre-commit hook ignoring rc

On 11/03/2016 07:45 PM, Peter Kronenberg wrote: I've got a pre-commit hook written in Python that's been working ok, but all of a sudden seems to be ignoring the return value. I return True if I don't want to commit to proceed. But it's committing anyway. Running 3.9.2. Has anything

Re: [PATCH 3 of 3] revlog: optimize _chunkraw when startrev==endrev

On Tue, 01 Nov 2016 18:25:47 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1477244433 25200 > # Sun Oct 23 10:40:33 2016 -0700 > # Node ID 4c96a177e4ff6a63156ec8cf49483a78e4437756 > # Parent

[PATCH 7 of 7] crecord: use scmutil.termsize()

# HG changeset patch # User Yuya Nishihara # Date 1476972992 -32400 # Thu Oct 20 23:16:32 2016 +0900 # Node ID afbe258b29cc994cfabf6dcc7a31be245c2bec2c # Parent 5a6ee9257e4d6c67c6414b9d0f0fef35d3f2d545 # EXP-Topic stdio crecord: use scmutil.termsize() diff --git

[PATCH 4 of 7] scmutil: remove superfluous indent from termwidth()

# HG changeset patch # User Yuya Nishihara # Date 1476968252 -32400 # Thu Oct 20 21:57:32 2016 +0900 # Node ID e62366ab7b244ce64e86935783a061f791c59281 # Parent 96aa6ffa3be75ea5a4fa9fe2d0440758d744b6af # EXP-Topic stdio scmutil: remove superfluous indent from termwidth()

[PATCH 2 of 7] scmutil: make termwidth() obtain stdio from ui

# HG changeset patch # User Yuya Nishihara # Date 1476967331 -32400 # Thu Oct 20 21:42:11 2016 +0900 # Node ID 433d529a9bbb4017281215dd3fa028410682e4dc # Parent e8790ea449691089861957e8259adb2a753748c8 # EXP-Topic stdio scmutil: make termwidth() obtain stdio from ui I'm

[PATCH 6 of 7] scmutil: extend termwidth() to return terminal height, renamed to termsize()

# HG changeset patch # User Yuya Nishihara # Date 1476972545 -32400 # Thu Oct 20 23:09:05 2016 +0900 # Node ID 5a6ee9257e4d6c67c6414b9d0f0fef35d3f2d545 # Parent 1bdd3d02c485da8592d7da1fcb5778bea5890706 # EXP-Topic stdio scmutil: extend termwidth() to return terminal height,

[PATCH 1 of 7] scmutil: move util.termwidth()

# HG changeset patch # User Yuya Nishihara # Date 1476967124 -32400 # Thu Oct 20 21:38:44 2016 +0900 # Node ID e8790ea449691089861957e8259adb2a753748c8 # Parent d44c407a59998c0a023e58bc278e19e939185e4f # EXP-Topic stdio scmutil: move util.termwidth() I'm going to get rid of

[PATCH 5 of 7] scmutil: clarify that we explicitly do termwidth - 1 on Windows

# HG changeset patch # User Yuya Nishihara # Date 1476971832 -32400 # Thu Oct 20 22:57:12 2016 +0900 # Node ID 1bdd3d02c485da8592d7da1fcb5778bea5890706 # Parent e62366ab7b244ce64e86935783a061f791c59281 # EXP-Topic stdio scmutil: clarify that we explicitly do termwidth - 1 on

Re: [PATCH 2 of 4] revlog: add a context manager to allow file handle reuse

On Tue, 01 Nov 2016 18:16:37 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1477099818 25200 > # Fri Oct 21 18:30:18 2016 -0700 > # Node ID d631065a702fa7eb956258e2289679d5902ccff6 > # Parent

[Bug 5412] New: hg won't generate webrev/diffs among two specific revisions

https://bz.mercurial-scm.org/show_bug.cgi?id=5412 Bug ID: 5412 Summary: hg won't generate webrev/diffs among two specific revisions Product: Mercurial Version: 3.8.3 Hardware: PC OS: Other