# HG changeset patch
# User Martin von Zweigbergk
# Date 1486501890 28800
# Tue Feb 07 13:11:30 2017 -0800
# Node ID a85eff052c57bde4c6100a23888c471f595c2d85
# Parent 05ff0729e9f4166f1f08855d25aa6ed4dddf155b
destutil: remove dead code about non-linear updates
IIUC, the non-linear updates no
# HG changeset patch
# User Martin von Zweigbergk
# Date 1486620747 28800
# Wed Feb 08 22:12:27 2017 -0800
# Node ID 14817ea5de6a92ef99fd4b5983e5a644c8fcb170
# Parent 1f51b4658f21bbb797e922d155c1046eddccf91d
tests: add test for updating to null revision
While working on merge.py, I realized
# HG changeset patch
# User Martin von Zweigbergk
# Date 1486662931 28800
# Thu Feb 09 09:55:31 2017 -0800
# Node ID 05ff0729e9f4166f1f08855d25aa6ed4dddf155b
# Parent 85fdf08596df69b9e9d8dd206e90d9017416b572
update: fix typo/stale comment to match code
The comment about "obsolete.background
# HG changeset patch
# User Martin von Zweigbergk
# Date 1486594177 28800
# Wed Feb 08 14:49:37 2017 -0800
# Node ID efccada71f928962cd578ab7e763506df5d7fb86
# Parent 14817ea5de6a92ef99fd4b5983e5a644c8fcb170
update: localize logic around which ancestor to use
The merge code works by applyin
# HG changeset patch
# User Martin von Zweigbergk
# Date 1486623813 28800
# Wed Feb 08 23:03:33 2017 -0800
# Node ID 85fdf08596df69b9e9d8dd206e90d9017416b572
# Parent efccada71f928962cd578ab7e763506df5d7fb86
merge: remove unused handling of default destination in merge.update()
As far as I
On Tue, Feb 07, 2017 at 11:25:35PM -0800, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc
> # Date 1486538687 28800
> # Tue Feb 07 23:24:47 2017 -0800
> # Node ID 56db55cfb5c51ccc565f67191cb1540cbf9b329f
> # Parent a68510b69f413545722c086eaeb840dd5e8305b4
> zstd: vendor py
On Wed, Feb 08, 2017 at 08:10:48AM -0800, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth
> # Date 1486570121 28800
> # Wed Feb 08 08:08:41 2017 -0800
> # Node ID a847eb00fcfeffce458e11b80ad38d4d4e7a700f
> # Parent d50cda2a403786836d1f0d5c99401599dc4f43ec
> zeroconf:
On Wed, Feb 08, 2017 at 02:52:31PM -0800, Jun Wu wrote:
> # HG changeset patch
> # User Jun Wu
> # Date 1486593930 28800
> # Wed Feb 08 14:45:30 2017 -0800
> # Node ID cb56fce57eceef2cf4cd9893d387b9fe2b3cecd6
> # Parent 5fc577761fb78168fcbd7ec93d911a1b7b4989c9
> # Available At https://bitbuc
On Wed, Feb 08, 2017 at 11:23:46PM +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pul...@gmail.com>
> # Date 1486490137 -19800
> # Tue Feb 07 23:25:37 2017 +0530
> # Node ID 47e72d467dd8da66092ca6b6a91235d8432e2dc1
> # Parent 61c589c75ebbce625d7056297e122863b68ac
On Thu, Feb 09, 2017 at 05:59:35AM -0800, 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
> # Available At https://bitbuc
On Thu, Feb 09, 2017 at 05:53:02PM +0900, FUJIWARA Katsunori wrote:
> At Thu, 09 Feb 2017 02:19:45 +0900,
> FUJIWARA Katsunori wrote:
>>
>> # HG changeset patch
>> # User FUJIWARA Katsunori
>> # Date 1486572068 -32400
>> # Thu Feb 09 01:41:08 2017 +0900
>> # Branch stable
>> # Node ID 05b836
On Thu, Feb 09, 2017 at 08:22:02AM -0800, Jun Wu wrote:
> Excerpts from David Demelier's message of 2017-02-08 17:41:50 +0100:
>> # HG changeset patch
>> # User David Demelier
>> # Date 1486485215 -3600
>> # Tue Feb 07 17:33:35 2017 +0100
>> # Node ID 5ecf752f0a79482fe2cecfa73c5a733dab29fb88
# HG changeset patch
# User Jun Wu
# Date 1486689360 28800
# Thu Feb 09 17:16:00 2017 -0800
# Node ID e042a694438fc4b35edcdcda99a4b6c4a0ce5bf2
# Parent 400747616e74d8af7ea053692e861d2495e56d78
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486689500 28800
# Thu Feb 09 17:18:20 2017 -0800
# Node ID 2c2051dfbf9079a294cded41ada42b67dd3c37f5
# Parent e042a694438fc4b35edcdcda99a4b6c4a0ce5bf2
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486689613 28800
# Thu Feb 09 17:20:13 2017 -0800
# Node ID 90cfe2f9473ab23300591f5904ba51c98cddca16
# Parent 2c2051dfbf9079a294cded41ada42b67dd3c37f5
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486689107 28800
# Thu Feb 09 17:11:47 2017 -0800
# Node ID 400747616e74d8af7ea053692e861d2495e56d78
# Parent d93bba366d42f9537a5556d7ff948848b608d02c
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486674516 28800
# Thu Feb 09 13:08:36 2017 -0800
# Node ID 245b1d962dcd5df48f929f10f786dc53936daabf
# Parent bdaf60a60f81431a52291ece25ad3cd60c77ac05
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486689390 28800
# Thu Feb 09 17:16:30 2017 -0800
# Node ID 76448b71f139b1fa06f2dbce04ac3f91ffd93f9d
# Parent 5e47a19fae82f4659f1e7df37f8f26dd56c4f246
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486675027 28800
# Thu Feb 09 13:17:07 2017 -0800
# Node ID 2c1834e1e6b5f734c27199d47de9b2252b8f4913
# Parent 245b1d962dcd5df48f929f10f786dc53936daabf
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486673958 28800
# Thu Feb 09 12:59:18 2017 -0800
# Node ID bdaf60a60f81431a52291ece25ad3cd60c77ac05
# Parent a68510b69f413545722c086eaeb840dd5e8305b4
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486675034 28800
# Thu Feb 09 13:17:14 2017 -0800
# Node ID 5e47a19fae82f4659f1e7df37f8f26dd56c4f246
# Parent 2c1834e1e6b5f734c27199d47de9b2252b8f4913
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
# HG changeset patch
# User Jun Wu
# Date 1486687506 28800
# Thu Feb 09 16:45:06 2017 -0800
# Node ID d93bba366d42f9537a5556d7ff948848b608d02c
# Parent 76448b71f139b1fa06f2dbce04ac3f91ffd93f9d
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
On Thu, Feb 9, 2017 at 1:52 PM, Simon Farnsworth wrote:
> ui: provide a mechanism to track and log blocked time
>
I looked through the whole series, and it generally looks good.
Could you please add a contrib/perf.py benchmark to measure the performance
of ui.write with this new context manager
Martin von Zweigbergk via Mercurial-devel wrote:
> # HG changeset patch
> # User Martin von Zweigbergk
> # Date 1486661545 28800
> # Thu Feb 09 09:32:25 2017 -0800
> # Node ID 93d94750f3abee5b9798c41160a2102c61936133
> # Parent 1f51b4658f21bbb797e922d155c1046eddccf91d
> merge: print status
# HG changeset patch
# User Martin von Zweigbergk
# Date 1486661545 28800
# Thu Feb 09 09:32:25 2017 -0800
# Node ID a5615bea1858aca891fcd3d7da6a477fc183f478
# Parent 1f51b4658f21bbb797e922d155c1046eddccf91d
merge: print status message before launching external merge tool
It seems somewhat
On Thu, Feb 9, 2017 at 1:52 PM, Simon Farnsworth wrote:
>
> diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
> --- a/mercurial/dispatch.py
> +++ b/mercurial/dispatch.py
> @@ -17,6 +17,7 @@
> import signal
> import sys
> import time
> +import timeit
> import traceback
>
>
> @@ -123,7
# HG changeset patch
# User Martin von Zweigbergk
# Date 1486661545 28800
# Thu Feb 09 09:32:25 2017 -0800
# Node ID 93d94750f3abee5b9798c41160a2102c61936133
# Parent 1f51b4658f21bbb797e922d155c1046eddccf91d
merge: print status message before launching external merge tool
It seems somewhat
# HG changeset patch
# User Simon Farnsworth
# Date 1486676255 28800
# Thu Feb 09 13:37:35 2017 -0800
# Node ID acb1103ff1de3c9c40a4b1c6b19ca65161329d02
# Parent ff695f191c30036c1171d8509f55ec60d19e0614
extdiff: log time spent in external diff program
We can't fix the time external diff pro
# HG changeset patch
# User Simon Farnsworth
# Date 1486676409 28800
# Thu Feb 09 13:40:09 2017 -0800
# Node ID be7dac985b12af413b43fa9685e29a90f80de4ef
# Parent ec1dac3c0d5fc7d0d15af324b345958a41000960
ui: log time spent blocked on stdio
We use a wrapper around Mercurial at Facebook that l
# HG changeset patch
# User Simon Farnsworth
# Date 1486676443 28800
# Thu Feb 09 13:40:43 2017 -0800
# Node ID e21b9166fc2cdcda22a071de30f97b44c5796da1
# Parent be7dac985b12af413b43fa9685e29a90f80de4ef
ui: log time spent blocked on editor
The user's editor is outside our control. Log how l
# HG changeset patch
# User Simon Farnsworth
# Date 1486676306 28800
# Thu Feb 09 13:38:26 2017 -0800
# Node ID f8b12c890147ebce0c06663f478cd76b89f6beab
# Parent acb1103ff1de3c9c40a4b1c6b19ca65161329d02
histedit: log the time taken to read in the commands list
If we're being fed an external
# HG changeset patch
# User Simon Farnsworth
# Date 1486676200 28800
# Thu Feb 09 13:36:40 2017 -0800
# Node ID ff695f191c30036c1171d8509f55ec60d19e0614
# Parent e21b9166fc2cdcda22a071de30f97b44c5796da1
crecord: log blocked time waiting for curses input
We want to know when we're blocked wa
# HG changeset patch
# User Simon Farnsworth
# Date 1486675708 28800
# Thu Feb 09 13:28:28 2017 -0800
# Node ID ec1dac3c0d5fc7d0d15af324b345958a41000960
# Parent 1f51b4658f21bbb797e922d155c1046eddccf91d
ui: provide a mechanism to track and log blocked time
We want to log the time Mercurial
# HG changeset patch
# User John Mulligan
# Date 1486671527 18000
# Thu Feb 09 15:18:47 2017 -0500
# Node ID 71debb56ce136086187d7f9c1986eb7f3b9ee0a9
# Parent eb78ec9e97b70310e2944f72c29463bedfc21442
keepalive: honor urllib2 style get_method overrides
In urllib2 docs and discussions it can
# HG changeset patch
# User John Mulligan
# Date 1486671641 18000
# Thu Feb 09 15:20:41 2017 -0500
# Node ID 6441cf5bde93d1b33a08e9f39778394048c27fe4
# Parent 71debb56ce136086187d7f9c1986eb7f3b9ee0a9
bugzilla: add a rest api backend (usable with bugzilla 5.0+)
Add support for the bugzilla r
At Fri, 10 Feb 2017 00:59:55 +0900,
FUJIWARA Katsunori wrote:
>
> # HG changeset patch
> # User FUJIWARA Katsunori
> # Date 1486654820 -32400
> # Fri Feb 10 00:40:20 2017 +0900
> # Branch stable
> # Node ID d601eb13858c986c771d18daf075926077172f14
> # Parent 2757e877b4d159fda8c6377c91287499
# HG changeset patch
# User FUJIWARA Katsunori
# Date 1486653227 -32400
# Fri Feb 10 00:13:47 2017 +0900
# Branch stable
# Node ID 8645ffc1a98ac26a773658fbd103ddb2d224184a
# Parent af3b5aa61fc05a124697809bf472a5592f38489c
misc: update year in copyright lines
This patch also does below:
-
Excerpts from David Demelier's message of 2017-02-08 17:41:50 +0100:
> # HG changeset patch
> # User David Demelier
> # Date 1486485215 -3600
> # Tue Feb 07 17:33:35 2017 +0100
> # Node ID 5ecf752f0a79482fe2cecfa73c5a733dab29fb88
> # Parent 1f51b4658f21bbb797e922d155c1046eddccf91d
> hg: allo
# HG changeset patch
# User FUJIWARA Katsunori
# Date 1486654816 -32400
# Fri Feb 10 00:40:16 2017 +0900
# Branch stable
# Node ID 2757e877b4d159fda8c6377c91287499808a901f
# Parent 8645ffc1a98ac26a773658fbd103ddb2d224184a
misc: replace domain of mercurial ML address by mercurial-scm.org
Thi
# HG changeset patch
# User FUJIWARA Katsunori
# Date 1486654820 -32400
# Fri Feb 10 00:40:20 2017 +0900
# Branch stable
# Node ID d601eb13858c986c771d18daf075926077172f14
# Parent 2757e877b4d159fda8c6377c91287499808a901f
misc: replace domain of mercurial-devel ML address by mercurial-scm.or
# HG changeset patch
# User Jun Wu
# Date 1486648674 28800
# Thu Feb 09 05:57:54 2017 -0800
# Node ID 93e23f7b87a4ab456053b6ba573615be16c6c4b0
# Parent a68510b69f413545722c086eaeb840dd5e8305b4
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull https://bitbucket.or
After reading the surrounding code, I believe 127.0.0.1 is fine. So this
patch looks good to me. Thanks!
The test failure where 127.0.0.1 does not exist is actually caused by other
code. I'll send a fix soon.
Excerpts from Simon Farnsworth's message of 2017-02-09 11:33:07 +:
> There's one chu
https://bz.mercurial-scm.org/show_bug.cgi?id=5483
Bug ID: 5483
Summary: Move "Mercurial" to the top of the Component list on
Bugzilla
Product: Mercurial
Version: default branch
Hardware: PC
OS: Windows
https://bz.mercurial-scm.org/show_bug.cgi?id=5482
Bug ID: 5482
Summary: revlog._chunks wastes IO for discontiguous delta
chains
Product: Mercurial
Version: default branch
Hardware: All
OS: All
St
https://bz.mercurial-scm.org/show_bug.cgi?id=5481
Bug ID: 5481
Summary: With aggressivemergedeltas=False, one merge parent is
ignored for delta generation even if the other parent
is unsuitable
Product: Mercurial
https://bz.mercurial-scm.org/show_bug.cgi?id=5480
Bug ID: 5480
Summary: Manifest grows out of control in large repository with
hundreds of branches, regular merges and a refactor
involving 1000s of file moves
Product: Mercur
There's one chunk in test-paths.t that fails without this change on my
Facebook IPv6-only devserver, and succeeds with it. Beyond that, I have
no interest in this code at all.
I chose 127.0.0.1 as the replacement where the "external" address is
IPv6 because this code already uses 127.0.0.1 as
At Thu, 09 Feb 2017 02:19:45 +0900,
FUJIWARA Katsunori wrote:
>
> # HG changeset patch
> # User FUJIWARA Katsunori
> # Date 1486572068 -32400
> # Thu Feb 09 01:41:08 2017 +0900
> # Branch stable
> # Node ID 05b83627f1922f34680664080b22bd2b8baac91a
> # Parent af3b5aa61fc05a124697809bf472a559
48 matches
Mail list logo