[PATCH] merge: add resolve --prep, which outputs conflicted comparison files

# HG changeset patch # User Phil Cohen # Date 1487831905 28800 # Wed Feb 22 22:38:25 2017 -0800 # Node ID 77da232f2d689cdb9545e060405e8776f2193488 # Parent 96eaefd350aec869047d9e2da90913ae698463df merge: add resolve --prep, which outputs conflicted comparison files Normally

Re: [PATCH 04 of 10] localrepo: move ui loading to baselocalrepository

Excerpts from Kevin Bullock's message of 2017-02-22 20:31:14 -0600: > There's another alternative we might consider: can we move all of the > "side effects" out of the localrepository class entirely? That is, instead > of resorting to inheritance, could we create a lower-level "repo storage" >

mercurial@31051: 38 new changesets

38 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/219629d42786 changeset: 31014:219629d42786 user:Augie Fackler date:Thu Feb 16 11:34:50 2017 -0500 summary: ui: construct _keepalnum list in a python3-friendly way

Re: [PATCH 04 of 10] localrepo: move ui loading to baselocalrepository

> On Feb 13, 2017, at 19:09, Jun Wu wrote: > > Whatever we will end up with, I want to make sure: > > 1. There is a "repo" object passed to preload functions, not a "repopath" > > "repopath" is just not practically useful as too many checks need to be > done on it. The

[PATCH 2 of 2 RESEND] serve: mark --stdio and --cmdserver as "(ADVANCED)" flags

# HG changeset patch # User Jun Wu # Date 1487816772 28800 # Wed Feb 22 18:26:12 2017 -0800 # Node ID 8bc0039a28785dce6e9aa05e7323986b92833068 # Parent a9d70a1a09e4e391f8ec22d10831999d7c3e5294 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 1 of 2 RESEND] help: hide command line options marked as "advanced"

# HG changeset patch # User Jun Wu # Date 1478011845 0 # Tue Nov 01 14:50:45 2016 + # Node ID a9d70a1a09e4e391f8ec22d10831999d7c3e5294 # Parent 80f04ba7f4d1f439d726068f02172f9a52b981fe # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 3 of 4 V2] chgcache: implement the background preloading thread

# HG changeset patch # User Jun Wu # Date 1487813979 28800 # Wed Feb 22 17:39:39 2017 -0800 # Node ID 28571825744fb4f4b424385f55afa9484532ef43 # Parent 630457e88fa0485bce7822345ea640b5cdcb9b8e # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 4 of 4 V2] chgserver: start background preloading thread

# HG changeset patch # User Jun Wu # Date 1487814470 28800 # Wed Feb 22 17:47:50 2017 -0800 # Node ID 5c44925eab9a424369967e852b05f42443eac3a6 # Parent 28571825744fb4f4b424385f55afa9484532ef43 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 1 of 4 V2] chgcache: implement socketpair-based IPC

# HG changeset patch # User Jun Wu # Date 1487802520 28800 # Wed Feb 22 14:28:40 2017 -0800 # Node ID aef9e96fb573b85f5731367a470f574dbe730839 # Parent 80f04ba7f4d1f439d726068f02172f9a52b981fe # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: [PATCH 1 of 6] color: move '_colormode' to the core 'ui' class

On 02/22/2017 06:31 PM, Gregory Szorc wrote: On Feb 22, 2017, at 08:54, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1487589128 -3600 # Mon Feb 20 12:12:08 2017 +0100 # Node ID

[PATCH] wireproto: remove unused code

# HG changeset patch # User Jun Wu # Date 1487787258 28800 # Wed Feb 22 10:14:18 2017 -0800 # Node ID 2cf1e5207fdfb3beac255dbacf74b8ac03e5125d # Parent 80f04ba7f4d1f439d726068f02172f9a52b981fe # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

bitbucket, introduce in a directory a subrepo

Hi I have a repo which sits in bitbucket. Now I decided that I would like to push one directory as repo itself. Like repomain/dir1 repomain/dir2 dir1 should be in a a repo of its own in bitbucket. I thought I could do this with subrepos, but I am not so sure whether this can be done for

Re: [PATCH 1 of 6] color: move '_colormode' to the core 'ui' class

> On Feb 22, 2017, at 08:54, Pierre-Yves David > wrote: > > # HG changeset patch > # User Pierre-Yves David > # Date 1487589128 -3600 > # Mon Feb 20 12:12:08 2017 +0100 > # Node ID d32d64e7e9f084bf01cbac178ad2c2e74e130f9d >

Re: [PATCH 1 of 6] color: move 'win32' declaration to the core module

On 02/22/2017 04:11 PM, Yuya Nishihara wrote: On Tue, 21 Feb 2017 23:17:57 +0100, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1482372679 -3600 # Thu Dec 22 03:11:19 2016 +0100 # Node ID

[PATCH 3 of 6] move: move the 'label' method to the core class

# HG changeset patch # User Pierre-Yves David # Date 1487590284 -3600 # Mon Feb 20 12:31:24 2017 +0100 # Node ID 9a9e8b28b717e30ed43030cc64f115a4356193de # Parent f53e95ec986616a48a3a8e67e5a9674b8a684d6e # EXP-Topic color move: move the 'label' method to the

[PATCH 5 of 6] color: move 'write-err' logic to the core ui class

# HG changeset patch # User Pierre-Yves David # Date 1487590943 -3600 # Mon Feb 20 12:42:23 2017 +0100 # Node ID 707f0b5ada6d7237306d87a34ab5569b3e7c8844 # Parent 0f2be97ca31046bbf9c9f37fcdacf7b406e94054 # EXP-Topic color color: move 'write-err' logic to the

[PATCH 2 of 6] color: inline the 'showlabel' method

# HG changeset patch # User Pierre-Yves David # Date 1487589203 -3600 # Mon Feb 20 12:13:23 2017 +0100 # Node ID f53e95ec986616a48a3a8e67e5a9674b8a684d6e # Parent d32d64e7e9f084bf01cbac178ad2c2e74e130f9d # EXP-Topic color color: inline the 'showlabel' method

[PATCH 6 of 6] color: drop the 'colorui' class

# HG changeset patch # User Pierre-Yves David # Date 1487590955 -3600 # Mon Feb 20 12:42:35 2017 +0100 # Node ID 3a3b29a24fb75a50547ea3eeef7948117e10 # Parent 707f0b5ada6d7237306d87a34ab5569b3e7c8844 # EXP-Topic color color: drop the 'colorui' class Now

[PATCH 4 of 6] color: move 'write' logic to the core ui class

# HG changeset patch # User Pierre-Yves David # Date 1487590299 -3600 # Mon Feb 20 12:31:39 2017 +0100 # Node ID 0f2be97ca31046bbf9c9f37fcdacf7b406e94054 # Parent 9a9e8b28b717e30ed43030cc64f115a4356193de # EXP-Topic color color: move 'write' logic to the core

Re: [PATCH abc] Allow specifying default --flag options via config

Hi Yuya Nishihara, Then I am leaving this bug on you. On Wed, Feb 22, 2017 at 8:11 PM, Yuya Nishihara wrote: > On Wed, 22 Feb 2017 18:23:46 +0530, Pulkit Goyal wrote: > > On Wed, Feb 22, 2017 at 5:57 PM, rishi shah > > > diff -r 3844b3299a53 -r

Re: changegroup hook Linux httpd cgi

Mercurial will search the PATH for the hook script, so you ought to be able to get rid of the "./" if you add the directory containing the script to the PATH. You could do that in your Apache configuration, or in the cgi script. The cgi version would look something like: import os

Re: changegroup hook Linux httpd cgi

Seem like the hgrc is executed, but it cannot find the command: *hg push --debug* *...* *remote: /bin/sh: **refresh_repos* *: command not found* *remote: warning: changegroup.refresh_repos hook exited with status 127* *...* So under Linux I have to put *changegroup.refresh_redmine =

Re: [PATCH 1 of 6] color: move 'win32' declaration to the core module

On Tue, 21 Feb 2017 23:17:57 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1482372679 -3600 > # Thu Dec 22 03:11:19 2016 +0100 > # Node ID 60a489f0531abbafc7f53a3dd4bad50f13b38015 > # Parent

[PATCH 08 of 11] hgweb: handle "linerange" request parameter in filediff command

# HG changeset patch # User Denis Laxalde # Date 1484922599 -3600 # Fri Jan 20 15:29:59 2017 +0100 # Node ID 39e3bd58cb1af11ba2fd0a1a74bb134711dfe718 # Parent b3f8ef870003ee2ca6b6db70860a065f255902b7 # EXP-Topic linerange-log/hgweb-filelog hgweb: handle "linerange"

[PATCH 11 of 11] hgweb: add a "followlines" link to hover-box in annotate

# HG changeset patch # User Denis Laxalde # Date 1487773255 -3600 # Wed Feb 22 15:20:55 2017 +0100 # Node ID bc884002d0bef8aad8ef203f1722e94d49d7e940 # Parent 2029f766a989dc8739bd2e640f3511c441f4abc9 # EXP-Topic linerange-log/hgweb-filelog hgweb: add a

[PATCH 02 of 11] context: also return ancestor's line range in blockancestors

# HG changeset patch # User Denis Laxalde # Date 1484583276 -3600 # Mon Jan 16 17:14:36 2017 +0100 # Node ID af5922c52aef6f494cb7c7e9914f1ba987916ea2 # Parent a65cc4f311cd1aab4502811e865a67ef7205c010 # EXP-Topic linerange-log/hgweb-filelog context: also return

[PATCH 09 of 11] hgweb: link to diff with linerange in filelog template

# HG changeset patch # User Denis Laxalde # Date 1484838729 -3600 # Thu Jan 19 16:12:09 2017 +0100 # Node ID 2a5126051c337f38bd15862c3c5d96a83ab47acc # Parent 39e3bd58cb1af11ba2fd0a1a74bb134711dfe718 # EXP-Topic linerange-log/hgweb-filelog hgweb: link to diff with

[PATCH 01 of 11] context: add a followfirst flag to blockancestors

# HG changeset patch # User Denis Laxalde # Date 1484582905 -3600 # Mon Jan 16 17:08:25 2017 +0100 # Node ID a65cc4f311cd1aab4502811e865a67ef7205c010 # Parent 693a5bb478543a986808264e586073a3ceedc38f # EXP-Topic linerange-log/hgweb-filelog context: add a

[PATCH 03 of 11] gitweb: add "more" and "less" navigation links in filelog template

# HG changeset patch # User Denis Laxalde # Date 1487761757 -3600 # Wed Feb 22 12:09:17 2017 +0100 # Node ID 0a725b74eeb2a8eca6d1d82ba8ec8c2d188e8684 # Parent af5922c52aef6f494cb7c7e9914f1ba987916ea2 # EXP-Topic linerange-log/hgweb-filelog gitweb: add "more" and

[PATCH 07 of 11] hgweb: explictly pass basectx in webutil.diffs

# HG changeset patch # User Denis Laxalde # Date 1484670348 -3600 # Tue Jan 17 17:25:48 2017 +0100 # Node ID b3f8ef870003ee2ca6b6db70860a065f255902b7 # Parent ddf1b3d89b595aa5b376bb51a8edf458b8f1b1c8 # EXP-Topic linerange-log/hgweb-filelog hgweb: explictly pass

[PATCH 04 of 11] hgweb: handle a "linerange" request parameter in filelog command

# HG changeset patch # User Denis Laxalde # Date 1484844060 -3600 # Thu Jan 19 17:41:00 2017 +0100 # Node ID 4d83e067c9c6e0f5fb7b126a9739aa9dd8113af4 # Parent 0a725b74eeb2a8eca6d1d82ba8ec8c2d188e8684 # EXP-Topic linerange-log/hgweb-filelog hgweb: handle a

[PATCH 10 of 11] hgweb: buffer lines by block in annotate

# HG changeset patch # User Denis Laxalde # Date 1487769833 -3600 # Wed Feb 22 14:23:53 2017 +0100 # Node ID 2029f766a989dc8739bd2e640f3511c441f4abc9 # Parent 2a5126051c337f38bd15862c3c5d96a83ab47acc # EXP-Topic linerange-log/hgweb-filelog hgweb: buffer lines by

Re: [PATCH] smartset: preserve istopo for baseset operations

On Tue, 21 Feb 2017 16:33:56 -0800, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1487723371 28800 > # Tue Feb 21 16:29:31 2017 -0800 > # Node ID 70e221675023dc23b5da10ae0c1d6baffdd6dd93 > # Parent 37ab9e20991c1d39014db8297065357fbded0213 > # Available At

Re: [PATCH abc] Allow specifying default --flag options via config

On Wed, 22 Feb 2017 18:23:46 +0530, Pulkit Goyal wrote: > On Wed, Feb 22, 2017 at 5:57 PM, rishi shah > > diff -r 3844b3299a53 -r 035603e2e432 hgext/patchbomb.py > > --- a/hgext/patchbomb.pyThu Feb 16 10:33:59 2017 -0800 > > +++ b/hgext/patchbomb.pyTue

Re: [PATCH 2 of 2 pager-endgame] pager: add a config knob to just globally turn off the pager

On Tue, 21 Feb 2017 16:18:13 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1486505605 18000 > # Tue Feb 07 17:13:25 2017 -0500 > # Node ID 390e26db66994cc2f627933815db02353958289f > # Parent 589dcabe2b7a2b9f2d49646d710335e5a70ad492 >

Re: [PATCH 09 of 19 pager] help: enable pager

On Tue, 21 Feb 2017 10:51:32 -0500, Augie Fackler wrote: > > On Feb 21, 2017, at 07:58, Yuya Nishihara wrote: > > On Sun, 19 Feb 2017 18:13:00 -0500, Augie Fackler wrote: > >> # HG changeset patch > >> # User Augie Fackler > >> # Date 1486440561 18000 > >> #

Re: [PATCH 1 of 2 pager-tweaks] incoming: delay pager activation until right before printing changes

On Tue, 21 Feb 2017 14:00:07 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1487692393 18000 > # Tue Feb 21 10:53:13 2017 -0500 > # Node ID 54759a9a01b70dc90fe8db95023f18244b50a7c4 > # Parent 59e69ed81776f0186cb6e6c69f8d7659afab26b7 >

Re: [PATCH 1 of 2 pager-dispatch-tweaks] help: move rst formatting of help documents into help.py

On Tue, 21 Feb 2017 16:14:52 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1487704651 18000 > # Tue Feb 21 14:17:31 2017 -0500 > # Node ID f489d1ec2070f25a09f571177b97d8284b3b1932 > # Parent 59e69ed81776f0186cb6e6c69f8d7659afab26b7 >

Re: [PATCH 1 of 2 pager-endgame] pager: move most help to a new help topic and deprecate extension

On Tue, 21 Feb 2017 16:18:12 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1486444073 18000 > # Tue Feb 07 00:07:53 2017 -0500 > # Node ID 589dcabe2b7a2b9f2d49646d710335e5a70ad492 > # Parent 59e69ed81776f0186cb6e6c69f8d7659afab26b7 >

Re: [PATCH 2 of 2 pager-dispatch-tweaks] dispatch: rearrange 'unknown command' code to better employ pager

On Tue, 21 Feb 2017 16:14:53 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1487704805 18000 > # Tue Feb 21 14:20:05 2017 -0500 > # Node ID 52083816be40edfac2e3e052ebe4d828c6c4a1c6 > # Parent f489d1ec2070f25a09f571177b97d8284b3b1932 >

Re: [PATCH abc] Allow specifying default --flag options via config

Looks like you added a flag by mistake. On Wed, Feb 22, 2017 at 5:57 PM, rishi shah wrote: > # HG changeset patch > # User rishi shah > # Date 1487681622 -19800 > # Tue Feb 21 18:23:42 2017 +0530 > # Node ID

[PATCH abc] Allow specifying default --flag options via config

# HG changeset patch # User rishi shah # Date 1487681622 -19800 # Tue Feb 21 18:23:42 2017 +0530 # Node ID 035603e2e432a706555c0cd353d74ec0639dd13a # Parent 3844b3299a53b3746e1a708c84bbd6b83adddb7d Allow specifying default --flag options via config diff -r

Re: [PATCH 5 of 5] localrepo: check HG_PENDING strictly

At Tue, 21 Feb 2017 11:16:52 -0500, Augie Fackler wrote: > > On Tue, Feb 21, 2017 at 01:28:04AM +0900, FUJIWARA Katsunori wrote: > > # HG changeset patch > > # User FUJIWARA Katsunori > > # Date 1487607660 -32400 > > # Tue Feb 21 01:21:00 2017 +0900 > > # Node ID

Phase based repoview?

This is a proposal that adds a new "archived" phase so we have "public > draft > secret > archived", and archived changesets are hidden. It was an idea I mentioned causally on IRC, and interested some people. I figured out that I had mentioned the same idea 5 months ago, where marmoute pointed me