Re: [PATCH 1 of 4] runtests: add a function to test if IPv6 is available

2017-02-15 Thread Jun Wu
Excerpts from Augie Fackler's message of 2017-02-15 21:23:37 -0500: > I'm not overjoyed at the static default. Is there a reason to use the > static default instead of checking HGPORT, so that multiple users on a > single box (such as the big compile farm machine several of us favor) > can run the

Re: [PATCH 1 of 4] runtests: add a function to test if IPv6 is available

2017-02-15 Thread Augie Fackler
On Wed, Feb 15, 2017 at 06:57:37PM -0800, Jun Wu wrote: > Excerpts from Augie Fackler's message of 2017-02-15 21:32:38 -0500: > > On Wed, Feb 15, 2017 at 06:26:11PM -0800, Jun Wu wrote: > > > Excerpts from Augie Fackler's message of 2017-02-15 21:23:37 -0500: > > > > I'm not overjoyed at the

[PATCH] localrepo: move extension loading to a separate method

2017-02-15 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1487216474 28800 # Wed Feb 15 19:41:14 2017 -0800 # Node ID dda2ebe89f50fcf3bf5a9b8d2266aa2dd5b106ea # Parent e5363cb96233861fc99f7e9b85d7884d3121558c # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: [PATCH] runtests: check ports on IPv6 address

2017-02-15 Thread Augie Fackler
> On Feb 9, 2017, at 8:59 AM, Jun Wu wrote: > > # HG changeset patch > # User Jun Wu > # Date 1486648674 28800 > # Thu Feb 09 05:57:54 2017 -0800 > # Node ID 93e23f7b87a4ab456053b6ba573615be16c6c4b0 > # Parent a68510b69f413545722c086eaeb840dd5e8305b4 > #

Re: [PATCH] runtests: check ports on IPv6 address

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 8:12 PM, Augie Fackler wrote: > >> On Feb 9, 2017, at 8:59 AM, Jun Wu wrote: >> >> # HG changeset patch >> # User Jun Wu >> # Date 1486648674 28800 >> # Thu Feb 09 05:57:54 2017 -0800 >> # Node ID

Re: [PATCH 1 of 4] runtests: add a function to test if IPv6 is available

2017-02-15 Thread Jun Wu
Excerpts from Augie Fackler's message of 2017-02-15 21:32:38 -0500: > On Wed, Feb 15, 2017 at 06:26:11PM -0800, Jun Wu wrote: > > Excerpts from Augie Fackler's message of 2017-02-15 21:23:37 -0500: > > > I'm not overjoyed at the static default. Is there a reason to use the > > > static default

Re: [PATCH] runtests: check ports on IPv6 address

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 8:23 PM, Martin von Zweigbergk wrote: > On Wed, Feb 15, 2017 at 8:12 PM, Augie Fackler wrote: >> >>> On Feb 9, 2017, at 8:59 AM, Jun Wu wrote: >>> >>> # HG changeset patch >>> # User Jun Wu >>> # Date

Re: [PATCH 1 of 4] runtests: add a function to test if IPv6 is available

2017-02-15 Thread Augie Fackler
On Wed, Feb 15, 2017 at 04:50:14PM -0800, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1487204311 28800 > # Wed Feb 15 16:18:31 2017 -0800 > # Node ID a70fa1e0fcdb11980338d72dde33dfe047bda7c2 > # Parent e5363cb96233861fc99f7e9b85d7884d3121558c > # Available At

Re: [PATCH] runtests: check ports on IPv6 address

2017-02-15 Thread Augie Fackler
> On Feb 15, 2017, at 11:24 PM, Martin von Zweigbergk > wrote: > > On Wed, Feb 15, 2017 at 8:23 PM, Martin von Zweigbergk > wrote: >> On Wed, Feb 15, 2017 at 8:12 PM, Augie Fackler wrote: >>> On Feb 9, 2017, at 8:59 AM,

Re: [PATCH] bookmarks: fix HG_PENDING handling

2017-02-15 Thread Augie Fackler
foozy, how does this (and timeless' other patch in the same basic area) relate to the patches you said you've got coming? Thanks! Augie On Tue, Feb 14, 2017 at 04:19:45PM +, timeless wrote: > # HG changeset patch > # User timeless > # Date 1487089111 0 > # Tue Feb

Re: [PATCH 1 of 4] runtests: add a function to test if IPv6 is available

2017-02-15 Thread Augie Fackler
On Wed, Feb 15, 2017 at 06:26:11PM -0800, Jun Wu wrote: > Excerpts from Augie Fackler's message of 2017-02-15 21:23:37 -0500: > > I'm not overjoyed at the static default. Is there a reason to use the > > static default instead of checking HGPORT, so that multiple users on a > > single box (such as

[Bug 5486] New: Mercurial+evolve sometimes segfaults on pull

2017-02-15 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5486 Bug ID: 5486 Summary: Mercurial+evolve sometimes segfaults on pull Product: Mercurial Version: 4.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

[Bug 5487] New: Cannot restore merge commit after rebase

2017-02-15 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5487 Bug ID: 5487 Summary: Cannot restore merge commit after rebase Product: Mercurial Version: 4.0.2 Hardware: PC OS: Windows Status: UNCONFIRMED Severity:

Re: [PATCH] run-tests: drop unused "useipv6" parameter from Test class

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 10:28 PM, Jun Wu wrote: > Looks good to me. I was trying to make the test class "self-contained" > without accessing global variables, as some people have strong opinion on > global variables. So it was intentional. But removing the parameter leads to >

[PATCH] chgserver: move comments in config example

2017-02-15 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1487212221 28800 # Wed Feb 15 18:30:21 2017 -0800 # Node ID 894c348d49abb67613b156a2f7c60a840818bc39 # Parent e5363cb96233861fc99f7e9b85d7884d3121558c # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH] run-tests: drop unused "useipv6" parameter from Test class

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1487225871 28800 # Wed Feb 15 22:17:51 2017 -0800 # Node ID b01c29d1eaff7875380b964da46b357d3a4445b5 # Parent 1ee685defe80117cf6aafea1ede6c33c478abceb run-tests: drop unused "useipv6" parameter from Test class

Re: [PATCH 4 of 4] runtests: unindent an "if True" block

2017-02-15 Thread Augie Fackler
On Wed, Feb 15, 2017 at 04:50:17PM -0800, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1487204998 28800 > # Wed Feb 15 16:29:58 2017 -0800 > # Node ID c5bdb942d324dcd732d277457d11eff7dc6aacc3 > # Parent bacc5256a49b34d07616c1e60e119a74ac721b7a > # Available At

Re: [PATCH] runtests: check ports on IPv6 address

2017-02-15 Thread Jun Wu
Excerpts from Augie Fackler's message of 2017-02-15 23:27:23 -0500: > >> Heh, I reported the flakiness on #mercurial earlier today. That's why > >> Jun sent a series of patches maybe 2 hours ago that you then queued. > >> Have you tested with those patches applied? I have not had time to > >> look

[PATCH 4 of 8 simple] color: move 'valideffect' function into the core module

2017-02-15 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1482370010 -3600 # Thu Dec 22 02:26:50 2016 +0100 # Node ID bb59bec58bcdf57a3aeb1a9cd4a9b5b004c7c139 # Parent b0ca5e9e8d9a6afa98accda7fcd5433ff19ddd1e # EXP-Topic color color: move 'valideffect' function

[PATCH 7 of 8 simple] color: move '_effect_str' function into the core module

2017-02-15 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1482370638 -3600 # Thu Dec 22 02:37:18 2016 +0100 # Node ID 93e658cd6e685593ddc94d2b46ba596b1bb0d143 # Parent 93992a625b7141ab5ba0a6cdd5db1aac3ab75361 # EXP-Topic color color: move '_effect_str' function

[PATCH 8 of 8 simple] color: move the '_render_effects' function to the core module

2017-02-15 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1482370733 -3600 # Thu Dec 22 02:38:53 2016 +0100 # Node ID f0f04ac8d4b17345b5375e4b11d895e7c22eb6ab # Parent 93e658cd6e685593ddc94d2b46ba596b1bb0d143 # EXP-Topic color color: move the '_render_effects'

[PATCH 6 of 8 simple] color: move configstyles into the core module

2017-02-15 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1482370462 -3600 # Thu Dec 22 02:34:22 2016 +0100 # Node ID 93992a625b7141ab5ba0a6cdd5db1aac3ab75361 # Parent 07618a3840fbce3ab1084765d94ac8d7a9380ff8 # EXP-Topic color color: move configstyles into the

[PATCH 2 of 8 simple] color: move '_effect' mapping into core

2017-02-15 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1479491318 -3600 # Fri Nov 18 18:48:38 2016 +0100 # Node ID fd46adc1f3ab7bb0800a9ff6482f7554bad8637e # Parent 42d4b49b39d6879065209ea3ca71f1e3fa88fcbc # EXP-Topic color color: move '_effect' mapping into

[PATCH stable] make: update .PHONY targets

2017-02-15 Thread Anton Shestakov
# HG changeset patch # User Anton Shestakov # Date 1487141373 -28800 # Wed Feb 15 14:49:33 2017 +0800 # Branch stable # Node ID 8e70ce179fc3b418023213ecae804b8825d04331 # Parent aa25989b0658dcefbd4c1bce7c389f006f22af30 make: update .PHONY targets diff --git a/Makefile

[PATCH 5 of 8 simple] color: rework conditional 'valideffect'

2017-02-15 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1482370203 -3600 # Thu Dec 22 02:30:03 2016 +0100 # Node ID 07618a3840fbce3ab1084765d94ac8d7a9380ff8 # Parent bb59bec58bcdf57a3aeb1a9cd4a9b5b004c7c139 # EXP-Topic color color: rework conditional

[PATCH 1 of 8 simple] color: spread '_effect' values for readability

2017-02-15 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1479491019 -3600 # Fri Nov 18 18:43:39 2016 +0100 # Node ID 42d4b49b39d6879065209ea3ca71f1e3fa88fcbc # Parent 354020079723e02ad6db68f58ef26eb7ebd005a8 # EXP-Topic color color: spread '_effect' values for

RE: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Gábor STEFANIK
> -- This message, including its attachments, is confidential. For more information please read NNG's email policy here: http://www.nng.com/emailpolicy/ By responding to this email you accept the email policy.

Re: [PATCH 2 of 4 RFC] chgcache: implement simple IPC mechanism

2017-02-15 Thread Yuya Nishihara
On Tue, 14 Feb 2017 11:05:00 -0800, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-02-14 22:49:34 +0900: > > On Mon, 13 Feb 2017 09:46:21 -0800, Jun Wu wrote: > > > Excerpts from Yuya Nishihara's message of 2017-02-13 23:00:25 +0900: > > > > Why not os.pipe()? > > > > > > > > We

Re: [PATCH stable] make: update .PHONY targets

2017-02-15 Thread Yuya Nishihara
On Wed, 15 Feb 2017 20:14:46 +0800, Anton Shestakov wrote: > # HG changeset patch > # User Anton Shestakov > # Date 1487141373 -28800 > # Wed Feb 15 14:49:33 2017 +0800 > # Branch stable > # Node ID 8e70ce179fc3b418023213ecae804b8825d04331 > # Parent

Re: [PATCH 4 of 6 V2] update: clarify that -C and -c are mutually exclusive

2017-02-15 Thread Yuya Nishihara
On Tue, 14 Feb 2017 15:08:39 -0800, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1487027086 28800 > # Mon Feb 13 15:04:46 2017 -0800 > # Node ID f9b2552610a5453bf836d3c7469fbebc59c5ad4b > # Parent

Re: help: I broke test-gendoc-ro.t and I have no idea how

2017-02-15 Thread Augie Fackler
> On Feb 15, 2017, at 8:02 PM, Simon Farnsworth wrote: > > On 16/02/2017 00:21, Augie Fackler wrote: >> With my pager-modernization work applied, I've got one test failure that is >> blocking me from mailing: >> augie% make test-gendoc-ro.t >> cd tests && python run-tests.py

[PATCH 3 of 4] minirst: support passing admonitions into findadmonitions() and parse()

2017-02-15 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1487188152 28800 # Wed Feb 15 11:49:12 2017 -0800 # Node ID 9ab3ad4934aedc649d28f74dd70207c6c6e88596 # Parent 197ba3e5885366038d453b9b22fa2910a0792988 minirst: support passing admonitions into findadmonitions() and

[PATCH 2 of 4] minirst: dynamically compile admonitions regexp

2017-02-15 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1487188034 28800 # Wed Feb 15 11:47:14 2017 -0800 # Node ID 197ba3e5885366038d453b9b22fa2910a0792988 # Parent dd90d5f7dc1908d9b69e6a4b8165a73757d1c84b minirst: dynamically compile admonitions regexp Currently,

[PATCH 1 of 4] minirst: detect bullet lists using asterisks

2017-02-15 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1487205737 28800 # Wed Feb 15 16:42:17 2017 -0800 # Node ID dd90d5f7dc1908d9b69e6a4b8165a73757d1c84b # Parent afaf3c2b129c8940387fd9928ae4fdc28259d13c minirst: detect bullet lists using asterisks Previously, the

Re: [PATCH 4 of 4] [RFC] releasenotes: command to manage release notes files

2017-02-15 Thread Gregory Szorc
On Wed, Feb 15, 2017 at 5:59 PM, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1487210192 28800 > # Wed Feb 15 17:56:32 2017 -0800 > # Node ID 9ab96e9d989c0b722ce0eedcb357e449c7bd5553 > # Parent

[PATCH 5 of 9 pager] tests: clean up a bunch of pager testing that is about to be invalidated

2017-02-15 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1486442730 18000 # Mon Feb 06 23:45:30 2017 -0500 # Node ID 78410f8a924623287609eacf70bd4912b17a01bf # Parent 1a671cd4d4aff343040e7764fcc4402725fb5a0d tests: clean up a bunch of pager testing that is about to be invalidated

[PATCH 2 of 9 pager] pager: move more behavior into core

2017-02-15 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1487198877 18000 # Wed Feb 15 17:47:57 2017 -0500 # Node ID cafe46e7d79c59567edc185979cf6568367def93 # Parent 675643abfdb6adbdfd8bddfbc263701c9caca539 pager: move more behavior into core This moves the global flag and the

[PATCH 4 of 9 pager] ui: add ignore-single-command functionality

2017-02-15 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1486441305 18000 # Mon Feb 06 23:21:45 2017 -0500 # Node ID 1a671cd4d4aff343040e7764fcc4402725fb5a0d # Parent 8695f290ba7c1a7f6c1b93ba344fbbe1193ab1a5 ui: add ignore-single-command functionality This closes the last feature

[PATCH 1 of 9 pager] pager: move pager-initiating code into core

2017-02-15 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1487198871 18000 # Wed Feb 15 17:47:51 2017 -0500 # Node ID 675643abfdb6adbdfd8bddfbc263701c9caca539 # Parent e5363cb96233861fc99f7e9b85d7884d3121558c pager: move pager-initiating code into core No functionality change. A

[PATCH 8 of 9 pager] annotate: migrate to modern pager API

2017-02-15 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1486439567 18000 # Mon Feb 06 22:52:47 2017 -0500 # Node ID 074b3f1ed66b41062e809eeabd4eb05b5554c680 # Parent 277dab1428ca0e37b649b9cd980b1467cdfc85d0 annotate: migrate to modern pager API diff --git a/hgext/pager.py

[PATCH 3 of 9 pager] ui: introduce neverpager() call

2017-02-15 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1487198883 18000 # Wed Feb 15 17:48:03 2017 -0500 # Node ID 8695f290ba7c1a7f6c1b93ba344fbbe1193ab1a5 # Parent cafe46e7d79c59567edc185979cf6568367def93 ui: introduce neverpager() call I'm about to add direct paging support

[PATCH 7 of 9 pager] ui: add a debug print right before we start the pager

2017-02-15 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1486443354 18000 # Mon Feb 06 23:55:54 2017 -0500 # Node ID 277dab1428ca0e37b649b9cd980b1467cdfc85d0 # Parent cfa569ed77883c41aecb3eaaa42876a5b0b7c52a ui: add a debug print right before we start the pager This makes it

mercurial@30964: 5 new changesets

2017-02-15 Thread Mercurial Commits
5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/e4492d55fb66 changeset: 30960:e4492d55fb66 user:Anton Shestakov date:Wed Feb 15 14:49:33 2017 +0800 summary: make: update .PHONY targets

Re: [PATCH] transaction: enable hardlink backups for non-windows systems

2017-02-15 Thread Jeroen Vaelen
Sorry for the delay in reply. Confidence in stable posix implementations could come from: - hardlink backups being the default for nearly 10 years before the previously mentioned patch disabled them after a series of bug reports coming exclusively from Windows users. - generally more

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 11:00 AM, Gábor STEFANIK wrote: >> > > > -- > This message, including its attachments, is confidential. For more > information please read NNG's email policy here: >

Re: Inconsistent HG_PENDING handling

2017-02-15 Thread FUJIWARA Katsunori
At Thu, 16 Feb 2017 00:01:05 +0900, FUJIWARA Katsunori wrote: > > At Mon, 13 Feb 2017 18:19:35 -0500, > Augie Fackler wrote: > > > > (+foozy, marmoute for transaction musing) > > > > On Sun, Feb 12, 2017 at 07:06:49PM -0500, timeless wrote: > > > bookmarks.py > > > if 'HG_PENDING' in

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 6:22 AM, Yuya Nishihara wrote: > On Wed, 15 Feb 2017 13:29:30 +, Gábor STEFANIK wrote: >> > >> -def updatetotally(ui, repo, checkout, brev, clean=False, check=False): >> > >> +def updatetotally(ui, repo, checkout, brev, clean=False, >> > >> +

RE: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Gábor STEFANIK
> -- This message, including its attachments, is confidential. For more information please read NNG's email policy here: http://www.nng.com/emailpolicy/ By responding to this email you accept the email policy.

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 10:35 AM, Gábor STEFANIK wrote: >> > > > -- > This message, including its attachments, is confidential. For more > information please read NNG's email policy here: >

Re: Inconsistent HG_PENDING handling

2017-02-15 Thread FUJIWARA Katsunori
At Thu, 16 Feb 2017 00:51:11 +0900, FUJIWARA Katsunori wrote: > > At Thu, 16 Feb 2017 00:01:05 +0900, > FUJIWARA Katsunori wrote: > > > > At Mon, 13 Feb 2017 18:19:35 -0500, > > Augie Fackler wrote: > > > > > > (+foozy, marmoute for transaction musing) > > > > > > On Sun, Feb 12, 2017 at

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 10:40 AM, Martin von Zweigbergk wrote: > On Wed, Feb 15, 2017 at 10:35 AM, Gábor STEFANIK > wrote: >>> >> >> >> -- >> This message, including its

[PATCH 01 of 10 v5] util: introduce timer()

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487188439 28800 # Wed Feb 15 11:53:59 2017 -0800 # Node ID 36ad17f00656ef853e0bd7b79e9cd98b58c92a16 # Parent afaf3c2b129c8940387fd9928ae4fdc28259d13c util: introduce timer() As documented for timeit.default_timer, there

[PATCH 02 of 10 v5] mercurial: switch to util.timer for all interval timings

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487193459 28800 # Wed Feb 15 13:17:39 2017 -0800 # Node ID 1c71bddbe01e76c1c48b5479ff67d47645afd7b6 # Parent 36ad17f00656ef853e0bd7b79e9cd98b58c92a16 mercurial: switch to util.timer for all interval timings util.timer is

[PATCH 04 of 10 v5] contrib: add a write microbenchmark to perf.py

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487192846 28800 # Wed Feb 15 13:07:26 2017 -0800 # Node ID 4d0b19ca8a56341fe2a77fd243232185ab4bf5e0 # Parent f3a219226ba0658f72801329d07c1ba516152b70 contrib: add a write microbenchmark to perf.py I'm adding some

[PATCH 06 of 10 v5] ui: time calls to ui.system

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487194152 28800 # Wed Feb 15 13:29:12 2017 -0800 # Node ID 1ae8bc5565b680008d82e93bee9455432b6ba0b2 # Parent 1487dd34f44315371738b13519cc4af1c81a7b07 ui: time calls to ui.system We want to know when we're blocked on

[PATCH 03 of 10 v5] ui: provide a mechanism to track and log blocked time

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487193465 28800 # Wed Feb 15 13:17:45 2017 -0800 # Node ID f3a219226ba0658f72801329d07c1ba516152b70 # Parent 1c71bddbe01e76c1c48b5479ff67d47645afd7b6 ui: provide a mechanism to track and log blocked time We want to log

[PATCH 1 of 4 V3] update: accept --merge to allow merging across topo branches (issue5125)

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1487019517 28800 # Mon Feb 13 12:58:37 2017 -0800 # Node ID aeb2aca1361d20c12985404b87030abf3ea22f3c # Parent afaf3c2b129c8940387fd9928ae4fdc28259d13c update: accept --merge to allow merging across topo branches

[PATCH 3 of 4 V3] update: also suggest --merge when non-linear update is aborted

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1487140898 28800 # Tue Feb 14 22:41:38 2017 -0800 # Node ID c6cd58d272aee6633fbad5eacdad742e2f9909cd # Parent 542a99ede6c3ac7cb4afccd3703fcc30e3d4c90d update: also suggest --merge when non-linear update is

Re: [PATCH 8 of 8 simple] color: move the '_render_effects' function to the core module

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Feb 15, 2017 at 3:06 AM, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1482370733 -3600 > # Thu Dec 22 02:38:53 2016 +0100 > # Node ID f0f04ac8d4b17345b5375e4b11d895e7c22eb6ab > #

[PATCH 2 of 4 V3] update: add experimental config for default way of handling dirty wdir

2017-02-15 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1487030585 28800 # Mon Feb 13 16:03:05 2017 -0800 # Node ID 542a99ede6c3ac7cb4afccd3703fcc30e3d4c90d # Parent aeb2aca1361d20c12985404b87030abf3ea22f3c update: add experimental config for default way of handling

[PATCH 09 of 10 v5] extdiff: log time spent in external diff program

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487194446 28800 # Wed Feb 15 13:34:06 2017 -0800 # Node ID c17e5f194dca47819ca2d636a3c9cfdf02733ba7 # Parent 124f329bc78f53abce06a1e8e6244fcdcc551e34 extdiff: log time spent in external diff program We can't fix the time

[PATCH 10 of 10 v5] histedit: log the time taken to read in the commands list

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487194446 28800 # Wed Feb 15 13:34:06 2017 -0800 # Node ID b9cf9ffdf15f67b42e87272e2fb328102e8284ba # Parent c17e5f194dca47819ca2d636a3c9cfdf02733ba7 histedit: log the time taken to read in the commands list If we're

[PATCH 08 of 10 v5] crecord: log blocked time waiting for curses input

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487194446 28800 # Wed Feb 15 13:34:06 2017 -0800 # Node ID 124f329bc78f53abce06a1e8e6244fcdcc551e34 # Parent ce6e773a6719fab87fa098021aac72b42709aa33 crecord: log blocked time waiting for curses input We want to know

[PATCH 05 of 10 v5] ui: log time spent blocked on stdio

2017-02-15 Thread Simon Farnsworth
# HG changeset patch # User Simon Farnsworth # Date 1487195406 28800 # Wed Feb 15 13:50:06 2017 -0800 # Node ID 1487dd34f44315371738b13519cc4af1c81a7b07 # Parent 4d0b19ca8a56341fe2a77fd243232185ab4bf5e0 ui: log time spent blocked on stdio We use a wrapper around Mercurial

Re: [PATCH 3 of 4 V3] update: also suggest --merge when non-linear update is aborted

2017-02-15 Thread Augie Fackler
On Wed, Feb 15, 2017 at 12:56:41PM -0800, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1487140898 28800 > # Tue Feb 14 22:41:38 2017 -0800 > # Node ID c6cd58d272aee6633fbad5eacdad742e2f9909cd > #

RE: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Gábor STEFANIK
> -- This message, including its attachments, is confidential. For more information please read NNG's email policy here: http://www.nng.com/emailpolicy/ By responding to this email you accept the email policy.

Re: Chrome tracing

2017-02-15 Thread Gregory Szorc
On Wed, Feb 15, 2017 at 10:43 AM, Bryan O'Sullivan wrote: > On Tue, Feb 14, 2017 at 7:02 PM, Gregory Szorc > wrote: > >> >> I support having dedicated code for annotating well-defined and important >> Mercurial operations in tracing/profiling logs.

help: I broke test-gendoc-ro.t and I have no idea how

2017-02-15 Thread Augie Fackler
With my pager-modernization work applied, I've got one test failure that is blocking me from mailing: augie% make test-gendoc-ro.t cd tests && python run-tests.py -j16 test-gendoc-ro.t --- /usr/local/google/home/augie/Programming/hg/crew/tests/test-gendoc-ro.t +++

[PATCH 4 of 4] runtests: unindent an "if True" block

2017-02-15 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1487204998 28800 # Wed Feb 15 16:29:58 2017 -0800 # Node ID c5bdb942d324dcd732d277457d11eff7dc6aacc3 # Parent bacc5256a49b34d07616c1e60e119a74ac721b7a # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 2 of 4] runtests: checkportisavailable should only check one family

2017-02-15 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1487204542 28800 # Wed Feb 15 16:22:22 2017 -0800 # Node ID d223c3d57e14f22c18030166b83e2da9143fdf67 # Parent a70fa1e0fcdb11980338d72dde33dfe047bda7c2 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 3 of 4] runtests: set web.ipv6 if we use IPv6

2017-02-15 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1487205807 28800 # Wed Feb 15 16:43:27 2017 -0800 # Node ID bacc5256a49b34d07616c1e60e119a74ac721b7a # Parent d223c3d57e14f22c18030166b83e2da9143fdf67 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: help: I broke test-gendoc-ro.t and I have no idea how

2017-02-15 Thread Simon Farnsworth
On 16/02/2017 00:21, Augie Fackler wrote: With my pager-modernization work applied, I've got one test failure that is blocking me from mailing: augie% make test-gendoc-ro.t cd tests && python run-tests.py -j16 test-gendoc-ro.t ---

Re: [PATCH 10 of 10 v5] histedit: log the time taken to read in the commands list

2017-02-15 Thread Bryan O'Sullivan
On Wed, Feb 15, 2017 at 2:07 PM, Simon Farnsworth wrote: > histedit: log the time taken to read in the commands list > Series looks great. Ship it! ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

Re: [PATCH 5 of 6] update: learn --merge to allow merging across topological branches (issue5125)

2017-02-15 Thread Yuya Nishihara
On Wed, 15 Feb 2017 13:29:30 +, Gábor STEFANIK wrote: > > >> -def updatetotally(ui, repo, checkout, brev, clean=False, check=False): > > >> +def updatetotally(ui, repo, checkout, brev, clean=False, > > >> + updatecheck='linear'): > > > > > > Please make this updatecheck=None,

Re: Inconsistent HG_PENDING handling

2017-02-15 Thread FUJIWARA Katsunori
At Mon, 13 Feb 2017 18:19:35 -0500, Augie Fackler wrote: > > (+foozy, marmoute for transaction musing) > > On Sun, Feb 12, 2017 at 07:06:49PM -0500, timeless wrote: > > bookmarks.py > > if 'HG_PENDING' in encoding.environ: > > try: > > bkfile =