Re: [PATCH 6 of 7] color: move 'styles' definition on the 'ui' object

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
On Mon, Feb 27, 2017 at 7:00 AM, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1478459761 -3600 > # Sun Nov 06 20:16:01 2016 +0100 > # Node ID d520bd43c7b26c3017329a2f9563701e5641d62d > # Parent 8e725873d8e1bec5dbdd0c69cbfc12af54af6a6a > # EXP-Topic col

Re: [PATCH 4 of 7] color: move the dict with terminfo parameters on the ui object

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
On Mon, Feb 27, 2017 at 7:00 AM, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1488031251 -3600 > # Sat Feb 25 15:00:51 2017 +0100 > # Node ID bdebc6e9429942e8dec6b9b6fe38be8c11bb06d9 > # Parent c6d19f0ac5ae80f933602fe217ff12ace828d02f > # EXP-Topic col

Re: [PATCH 2 of 7] color: initialize color for local peer ui

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
On Mon, Feb 27, 2017 at 6:59 AM, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1488044041 -3600 > # Sat Feb 25 18:34:01 2017 +0100 > # Node ID c3224694bdae9cdb7530f952e2c767e419b7f280 > # Parent 92526381242cd381375a465d5a800446916d2d7b > # EXP-Topic col

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

2017-02-27 Thread Durham Goode
On 2/27/17 11:09 AM, Danek Duvall wrote: Durham Goode wrote: On 2/24/17 4:10 PM, Danek Duvall wrote: Is that the central issue? That is, you want to run a tool once over all unresolved files, rather than one at a time? It seems like perhaps a new config option for merge-tools could indicate

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

2017-02-27 Thread Durham Goode
On 2/27/17 5:59 PM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-27 17:39:10 -0800: On 2/27/17 4:58 PM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-27 16:37:56 -0800: Do you mean outputting the actual file content in the json? I was thinking of having just

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

2017-02-27 Thread Jun Wu
Excerpts from Durham Goode's message of 2017-02-27 17:39:10 -0800: > > On 2/27/17 4:58 PM, Jun Wu wrote: > > Excerpts from Durham Goode's message of 2017-02-27 16:37:56 -0800: > >> Do you mean outputting the actual file content in the json? I was > >> thinking of having just the paths to the file

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

2017-02-27 Thread Durham Goode
On 2/27/17 4:58 PM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-27 16:37:56 -0800: Do you mean outputting the actual file content in the json? I was thinking of having just the paths to the file contents be in the json. That way we don't have to json escape a bunch of binary

mercurial@31106: 8 new changesets

2017-02-27 Thread Mercurial Commits
8 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b44ab288358e changeset: 31099:b44ab288358e user:Matt Harbison date:Sat Feb 25 21:13:59 2017 -0500 summary: subrepo: run the repo decoders when archiving https://www.mercurial-scm.org/repo/hg/rev/8903f6

Re: [PATCH 1 of 2] manifest: allow specifying the revlog filename

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
+mercurial-devel again (I had initially thought my comment was not about the patch, but it turns out it was) On Sat, Feb 25, 2017 at 3:23 PM, Durham Goode wrote: > On 2/24/17 10:00 PM, Martin von Zweigbergk wrote: >> >> -list >> >> On Fri, Feb 24, 2017, 14:44 Durham Goode >

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

2017-02-27 Thread Jun Wu
Excerpts from Durham Goode's message of 2017-02-27 16:37:56 -0800: > Do you mean outputting the actual file content in the json? I was > thinking of having just the paths to the file contents be in the json. > That way we don't have to json escape a bunch of binary data if we > output conflictin

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

2017-02-27 Thread Durham Goode
On 2/27/17 11:01 AM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-27 10:41:39 -0800: On 2/24/17 4:04 PM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-24 15:42:34 -0800: Maybe I don't understand your proposal. The current merge-tools are invoked once per fil

[PATCH 10 of 11 V5] update: add experimental config for default way of handling dirty wdir

2017-02-27 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 ae37f4578e3af6fd4cb7c29c9ab06ad0efd726da # Parent d23e5a40f9c4c8d3459255c6c2cb633452b914d8 update: add experimental config for default way of handling dirty wdir This allows

[PATCH 11 of 11 V5] update: allow setting default update check to "noconflict"

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1486973155 28800 # Mon Feb 13 00:05:55 2017 -0800 # Node ID c88aa4bc36ee81b0837d2949501d6b4fcf825c38 # Parent ae37f4578e3af6fd4cb7c29c9ab06ad0efd726da update: allow setting default update check to "noconflict" The new value allows upd

[PATCH 05 of 11 V5] merge: combine the two "can't happen" cases in docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488236556 28800 # Mon Feb 27 15:02:36 2017 -0800 # Node ID e1f1afc6f1c31748077da2abe2a7b613eef17914 # Parent 658aa233506c722935c640eb3b46fc2176f5df58 merge: combine the two "can't happen" cases in docstring table diff -r 658aa233506c

[PATCH 08 of 11 V5] merge: combine the "merge" cases in docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488236959 28800 # Mon Feb 27 15:09:19 2017 -0800 # Node ID b99e3df11bb16c8c1118f2bf29ea0d0816591259 # Parent 77edbed1c44886a45c4f398cdabd0f463a6c1c38 merge: combine the "merge" cases in docstring table diff -r 77edbed1c448 -r b99e3df

[PATCH 06 of 11 V5] merge: clarify non-linear default updates in docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488238174 28800 # Mon Feb 27 15:29:34 2017 -0800 # Node ID 5fe59a06b365dcb9c399ffbb0b64d985b53f2745 # Parent e1f1afc6f1c31748077da2abe2a7b613eef17914 merge: clarify non-linear default updates in docstring table Non-linear updates won

[PATCH 09 of 11 V5] update: accept --merge to allow merging across topo branches (issue5125)

2017-02-27 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 d23e5a40f9c4c8d3459255c6c2cb633452b914d8 # Parent b99e3df11bb16c8c1118f2bf29ea0d0816591259 update: accept --merge to allow merging across topo branches (issue5125) diff -r b9

[PATCH 07 of 11 V5] merge: combine "dirty" cases in docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488236821 28800 # Mon Feb 27 15:07:01 2017 -0800 # Node ID 77edbed1c44886a45c4f398cdabd0f463a6c1c38 # Parent 5fe59a06b365dcb9c399ffbb0b64d985b53f2745 merge: combine "dirty" cases in docstring table diff -r 5fe59a06b365 -r 77edbed1c44

[PATCH 02 of 11 V5] merge: drop redundant column in docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488234797 28800 # Mon Feb 27 14:33:17 2017 -0800 # Node ID 63a4df2dc6339d6d5c555eb8caaf9ad202b87f21 # Parent c0134c2ac2ac52fdb39cd8ba953e1d52a153458f merge: drop redundant column in docstring table The "same" and "cross" columns now

[PATCH 03 of 11 V5] merge: make "linear" an input in docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488236333 28800 # Mon Feb 27 14:58:53 2017 -0800 # Node ID 4287db2a458cd9497c5273bb129d4e32798fabc1 # Parent 63a4df2dc6339d6d5c555eb8caaf9ad202b87f21 merge: make "linear" an input in docstring table Instead of having two ouputs, it s

[PATCH 04 of 11 V5] merge: move "incompatible options" case first in docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488236413 28800 # Mon Feb 27 15:00:13 2017 -0800 # Node ID 658aa233506c722935c640eb3b46fc2176f5df58 # Parent 4287db2a458cd9497c5273bb129d4e32798fabc1 merge: move "incompatible options" case first in docstring table diff -r 4287db2a45

[PATCH 01 of 11 V5] merge: drop obsolete non-linear cases from docstring table

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488234442 28800 # Mon Feb 27 14:27:22 2017 -0800 # Node ID c0134c2ac2ac52fdb39cd8ba953e1d52a153458f # Parent a185b903bda3c64678d1f9399bfa0be8d326dbff merge: drop obsolete non-linear cases from docstring table Since 6b1fc09c699a (upda

mercurial@31098: 16 new changesets

2017-02-27 Thread Mercurial Commits
16 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c42feb5f3143 changeset: 31083:c42feb5f3143 user:Pierre-Yves David date:Mon Feb 20 12:12:08 2017 +0100 summary: color: move '_colormode' to the core 'ui' class https://www.mercurial-scm.org/repo/hg/rev

[PATCH] tests: un-nest the `order` repo in test-rebase-scenario-global

2017-02-27 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1484861228 18000 # Thu Jan 19 16:27:08 2017 -0500 # Node ID 9458a27320261aa23db959f8f84193fa4a316aee # Parent 3f8f53190d6afed0aca6c6527236edad28ce785c tests: un-nest the `order` repo in test-rebase-scenario-global This wasn't hurting anything

[PATCH] osx: install bash and zsh completions by default

2017-02-27 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1486412372 18000 # Mon Feb 06 15:19:32 2017 -0500 # Node ID 514fb53d0a35229162cf58b9e6631e881e959177 # Parent 3f8f53190d6afed0aca6c6527236edad28ce785c osx: install bash and zsh completions by default The zsh location appears to be on the defa

[PATCH] internals: add some brief documentation about censor

2017-02-27 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1485220644 18000 # Mon Jan 23 20:17:24 2017 -0500 # Node ID 065219350c9ce3c31a35d13fe97be0673e321e09 # Parent 3f8f53190d6afed0aca6c6527236edad28ce785c internals: add some brief documentation about censor diff --git a/mercurial/help/internals/

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

2017-02-27 Thread Jun Wu
Excerpts from Martin von Zweigbergk's message of 2017-02-27 14:29:08 -0800: > On Tue, Feb 21, 2017 at 2:27 PM, Martin von Zweigbergk > wrote: > > Sure. I'm on vacation, so I can do that next week, or in a follow-up. > > Whichever the person considering queuing prefers. > > I'm back from vacation.

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

2017-02-27 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Feb 21, 2017 at 2:27 PM, Martin von Zweigbergk wrote: > Sure. I'm on vacation, so I can do that next week, or in a follow-up. > Whichever the person considering queuing prefers. I'm back from vacation. It's unclear if the series was not queued because of Jun's comment or something else (m

Re: [PATCH 2 of 2] chg: deduplicate error handling of ui.system()

2017-02-27 Thread Augie Fackler
On Sun, Feb 19, 2017 at 02:44:52AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1487434605 -32400 > # Sun Feb 19 01:16:45 2017 +0900 > # Node ID d38553996c178b051dd8ed9aa99149b3952d09d3 > # Parent c6dd20729bb3fd2f7745139c27488ce7279f13e1 > chg: dedupli

[PATCH 3 of 3] help: document known deficiencies with revlog format

2017-02-27 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1488228075 28800 # Mon Feb 27 12:41:15 2017 -0800 # Node ID 4ecfe89fa8c1477ab54fa8ef271589a8b20c5497 # Parent 33cdab923127f930357032db7eb6c4c9441e73ae help: document known deficiencies with revlog format I've been doing a lot of work to prope

[PATCH 2 of 3] help: fix incorrect delta chain field documentation (issue5488)

2017-02-27 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1488226910 28800 # Mon Feb 27 12:21:50 2017 -0800 # Node ID 33cdab923127f930357032db7eb6c4c9441e73ae # Parent ded4aedfaffbabce6c083f660fc5fb287f0c help: fix incorrect delta chain field documentation (issue5488) The existing documentation

[PATCH 1 of 3] help: clarify revision / chunk behavior

2017-02-27 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1488226671 28800 # Mon Feb 27 12:17:51 2017 -0800 # Node ID ded4aedfaffbabce6c083f660fc5fb287f0c # Parent abb92b3d370e116b29eba4d2e3154e9691c8edbb help: clarify revision / chunk behavior Try to make it easier to understand the differences

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

2017-02-27 Thread Danek Duvall
Durham Goode wrote: > On 2/24/17 4:10 PM, Danek Duvall wrote: > > >Is that the central issue? That is, you want to run a tool once over all > >unresolved files, rather than one at a time? > > > >It seems like perhaps a new config option for merge-tools could indicate > >that it takes multiple fil

Re: [PATCH 1 of 5] transaction: introduce scope

2017-02-27 Thread Jun Wu
I'm not sure if "scope" is a good name or not in this case. Suggestions are welcome. Excerpts from Jun Wu's message of 2017-02-27 09:35:25 -0800: > # HG changeset patch > # User Jun Wu > # Date 1488185788 28800 > # Mon Feb 27 00:56:28 2017 -0800 > # Node ID 5dac612ec9a87553fcd329100846bcb01b

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

2017-02-27 Thread Jun Wu
Excerpts from Durham Goode's message of 2017-02-27 10:41:39 -0800: > On 2/24/17 4:04 PM, Jun Wu wrote: > > Excerpts from Durham Goode's message of 2017-02-24 15:42:34 -0800: > >> Maybe I don't understand your proposal. The current merge-tools are > >> invoked once per file. Would this python merg

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

2017-02-27 Thread Durham Goode
On 2/24/17 4:04 PM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-24 15:42:34 -0800: Maybe I don't understand your proposal. The current merge-tools are invoked once per file. Would this python merge-tool be invoked in some other way where it's given the full conflict state at

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

2017-02-27 Thread Durham Goode
On 2/24/17 4:10 PM, Danek Duvall wrote: Durham Goode wrote: On 2/24/17 3:25 PM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-24 15:18:40 -0800: On 2/23/17 2:57 PM, Jun Wu wrote: Congratulations on your first patch to the list! But I think we have better ways to achieve

Re: [PATCH 2 of 4 V2] chgcache: report repo paths from worker to master

2017-02-27 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-02-28 00:46:14 +0900: > On Wed, 22 Feb 2017 18:16:09 -0800, Jun Wu wrote: > > # HG changeset patch > > # User Jun Wu > > # Date 1487807803 28800 > > # Wed Feb 22 15:56:43 2017 -0800 > > # Node ID 630457e88fa0485bce7822345ea640b5cdcb9b8e > > # Par

mercurial@31082: 20 new changesets (3 on stable)

2017-02-27 Thread Mercurial Commits
20 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/18fb3cf572b4 changeset: 31063:18fb3cf572b4 branch: stable parent: 30915:aa25989b0658 user:FUJIWARA Katsunori date:Sat Feb 25 01:07:52 2017 +0900 summary: worker: ignore meaningl

Re: [PATCH 1 of 5] transaction: introduce scope

2017-02-27 Thread Jun Wu
Excerpts from Gregory Szorc's message of 2017-02-27 10:05:52 -0800: > > > On Feb 27, 2017, at 09:35, Jun Wu wrote: > > > > # HG changeset patch > > # User Jun Wu > > # Date 1488185788 28800 > > # Mon Feb 27 00:56:28 2017 -0800 > > # Node ID 5dac612ec9a87553fcd329100846bcb01bae9d80 > > # Pa

Re: [PATCH 1 of 5] transaction: introduce scope

2017-02-27 Thread Gregory Szorc
> On Feb 27, 2017, at 09:35, Jun Wu wrote: > > # HG changeset patch > # User Jun Wu > # Date 1488185788 28800 > # Mon Feb 27 00:56:28 2017 -0800 > # Node ID 5dac612ec9a87553fcd329100846bcb01bae9d80 > # Parent b4cb86ab4c719eb615a4308eafd8b1386a511eeb > # Available At https://bitbucket.org

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

2017-02-27 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-02-28 00:37:04 +0900: > On Wed, 22 Feb 2017 18:16:08 -0800, Jun Wu wrote: > > # HG changeset patch > > # User Jun Wu > > # Date 1487802520 28800 > > # Wed Feb 22 14:28:40 2017 -0800 > > # Node ID aef9e96fb573b85f5731367a470f574dbe730839 > > # Par

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

2017-02-27 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-02-28 01:02:23 +0900: > On Wed, 22 Feb 2017 18:16:10 -0800, Jun Wu wrote: > > # HG changeset patch > > # User Jun Wu > > # Date 1487813979 28800 > > # Wed Feb 22 17:39:39 2017 -0800 > > # Node ID 28571825744fb4f4b424385f55afa9484532ef43 > > # Par

[PATCH 5 of 5] bookmark: limit transaction scope to bookmarks only

2017-02-27 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488214902 28800 # Mon Feb 27 09:01:42 2017 -0800 # Node ID 234f60fffa4991fa5cf80bd5fafdc78bbb99607d # Parent f88c37484782ae7fede3c7a2a27a5f5d9b12bc9a # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 2 of 5] localrepo: take a scope parameter for repo.transaction

2017-02-27 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488189365 28800 # Mon Feb 27 01:56:05 2017 -0800 # Node ID 1462f970a1029043e7b1de4f70c52a4b360ff399 # Parent 5dac612ec9a87553fcd329100846bcb01bae9d80 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 3 of 5] localrepo: write journal files according to transaction scope

2017-02-27 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488189445 28800 # Mon Feb 27 01:57:25 2017 -0800 # Node ID 89793c9bfdc93896fd308ad9f4c400710ff2bde2 # Parent 1462f970a1029043e7b1de4f70c52a4b360ff399 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 4 of 5] localrepo: do not write dirstate if it's not in transaction scope

2017-02-27 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488189479 28800 # Mon Feb 27 01:57:59 2017 -0800 # Node ID f88c37484782ae7fede3c7a2a27a5f5d9b12bc9a # Parent 89793c9bfdc93896fd308ad9f4c400710ff2bde2 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

[PATCH 1 of 5] transaction: introduce scope

2017-02-27 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488185788 28800 # Mon Feb 27 00:56:28 2017 -0800 # Node ID 5dac612ec9a87553fcd329100846bcb01bae9d80 # Parent b4cb86ab4c719eb615a4308eafd8b1386a511eeb # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull https://bitbucket.or

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

2017-02-27 Thread Yuya Nishihara
On Wed, 22 Feb 2017 18:16:08 -0800, Jun Wu wrote: > # 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.or

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

2017-02-27 Thread Yuya Nishihara
On Wed, 22 Feb 2017 18:16:11 -0800, Jun Wu wrote: > # 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.or

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

2017-02-27 Thread Yuya Nishihara
On Wed, 22 Feb 2017 18:16:10 -0800, Jun Wu wrote: > # 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.or

Re: [PATCH 2 of 4 V2] chgcache: report repo paths from worker to master

2017-02-27 Thread Yuya Nishihara
On Wed, 22 Feb 2017 18:16:09 -0800, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1487807803 28800 > # Wed Feb 22 15:56:43 2017 -0800 > # Node ID 630457e88fa0485bce7822345ea640b5cdcb9b8e > # Parent aef9e96fb573b85f5731367a470f574dbe730839 > # Available At https://bitbucket.or

Re: [PATCH website] downloads: add link to PPA for ubuntu/debian

2017-02-27 Thread Kevin Bullock
> On Feb 26, 2017, at 02:52, Anton Shestakov wrote: > > On Sat, 25 Feb 2017 13:02:15 -0800 > heatherboo wrote: > >> # HG changeset patch >> # User heatherboo >> # Date 1488054963 28800 >> # Sat Feb 25 12:36:03 2017 -0800 >> # Node ID b91f88bda2404c91722a62a2eb9afc63867a172b >> # Parent f

[PATCH 5 of 7] color: pass 'ui' to 'win32print'

2017-02-27 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1478459453 -3600 # Sun Nov 06 20:10:53 2016 +0100 # Node ID 8e725873d8e1bec5dbdd0c69cbfc12af54af6a6a # Parent bdebc6e9429942e8dec6b9b6fe38be8c11bb06d9 # EXP-Topic color color: pass 'ui' to 'win32print' Same logic as before,'win32print' re

[PATCH 4 of 7] color: move the dict with terminfo parameters on the ui object

2017-02-27 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1488031251 -3600 # Sat Feb 25 15:00:51 2017 +0100 # Node ID bdebc6e9429942e8dec6b9b6fe38be8c11bb06d9 # Parent c6d19f0ac5ae80f933602fe217ff12ace828d02f # EXP-Topic color color: move the dict with terminfo parameters on the ui object This d

[PATCH 2 of 7] color: initialize color for local peer ui

2017-02-27 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1488044041 -3600 # Sat Feb 25 18:34:01 2017 +0100 # Node ID c3224694bdae9cdb7530f952e2c767e419b7f280 # Parent 92526381242cd381375a465d5a800446916d2d7b # EXP-Topic color color: initialize color for local peer ui The local peer is creating

[PATCH 7 of 7] color: rename '_styles' to '_defaultstyles' for clarity

2017-02-27 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1478459814 -3600 # Sun Nov 06 20:16:54 2016 +0100 # Node ID 327ebf5c800b5b64188806fd0dbd4daccc25b022 # Parent d520bd43c7b26c3017329a2f9563701e5641d62d # EXP-Topic color color: rename '_styles' to '_defaultstyles' for clarity This should m

[PATCH 6 of 7] color: move 'styles' definition on the 'ui' object

2017-02-27 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1478459761 -3600 # Sun Nov 06 20:16:01 2016 +0100 # Node ID d520bd43c7b26c3017329a2f9563701e5641d62d # Parent 8e725873d8e1bec5dbdd0c69cbfc12af54af6a6a # EXP-Topic color color: move 'styles' definition on the 'ui' object Same logic as for

[PATCH 3 of 7] color: add ui to effect rendering

2017-02-27 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1488031244 -3600 # Sat Feb 25 15:00:44 2017 +0100 # Node ID c6d19f0ac5ae80f933602fe217ff12ace828d02f # Parent c3224694bdae9cdb7530f952e2c767e419b7f280 # EXP-Topic color color: add ui to effect rendering We'll carry more and more color spe

[PATCH 1 of 7] color: add a 'ui.color' option to control color behavior

2017-02-27 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1488048263 -3600 # Sat Feb 25 19:44:23 2017 +0100 # Node ID 92526381242cd381375a465d5a800446916d2d7b # Parent a185b903bda3c64678d1f9399bfa0be8d326dbff # EXP-Topic color color: add a 'ui.color' option to control color behavior This new opt

Re: [PATCH 6 of 7] color: move triggering of the initialisation logic in core

2017-02-27 Thread Pierre-Yves David
On 02/27/2017 03:45 PM, Yuya Nishihara wrote: On Sat, 25 Feb 2017 14:11:38 +0100, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1487697612 -3600 # Tue Feb 21 18:20:12 2017 +0100 # Node ID 0deb181adc74dea75b109ebdf38fb73f5f20c724 # Parent 25fd71d9347a8c82a

Re: [PATCH 6 of 7] color: move triggering of the initialisation logic in core

2017-02-27 Thread Yuya Nishihara
On Sat, 25 Feb 2017 14:11:38 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1487697612 -3600 > # Tue Feb 21 18:20:12 2017 +0100 > # Node ID 0deb181adc74dea75b109ebdf38fb73f5f20c724 > # Parent 25fd71d9347a8c82adf2a991dab0b48ff35282f6 > # EXP-Topic c

Re: [PATCH 5 of 7] color: add the definition of '--color' in core

2017-02-27 Thread Yuya Nishihara
On Sat, 25 Feb 2017 14:11:37 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1487696961 -3600 > # Tue Feb 21 18:09:21 2017 +0100 > # Node ID 25fd71d9347a8c82adf2a991dab0b48ff35282f6 > # Parent 1b39bb158cdb97965da0b614b7c8bcd6a8b58887 > # EXP-Topic c

Re: [PATCH 3 of 7] color: move git-subrepo support into the subrepo module

2017-02-27 Thread Yuya Nishihara
On Sat, 25 Feb 2017 14:11:35 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1487695804 -3600 > # Tue Feb 21 17:50:04 2017 +0100 > # Node ID 81c3db1bc60255c7a5a1455106f4fb69b96b3658 > # Parent 03ad2d8bdc83713c1aee2ac729c4710c3bcd06a2 > # EXP-Topic c

Re: [PATCH 1 of 7] color: move 'terminfosetup' into the core module

2017-02-27 Thread Yuya Nishihara
On Sat, 25 Feb 2017 14:11:33 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1482412672 -3600 > # Thu Dec 22 14:17:52 2016 +0100 > # Node ID 1d52488a538cebabbbca205cd312a4dfd83418af > # Parent b4cb86ab4c719eb615a4308eafd8b1386a511eeb > # EXP-Topic c

Re: [PATCH] subrepo: run the repo decoders when archiving

2017-02-27 Thread Yuya Nishihara
On Sat, 25 Feb 2017 21:25:07 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1488075239 18000 > # Sat Feb 25 21:13:59 2017 -0500 > # Node ID 5ce388a91851dc6c0dc1be0342a105da659e1d47 > # Parent 88203f26ea57627cabd7cf9c4f7843661d6c43ae > subrepo: run the repo

Re: [PATCH] ui: replace obsolete default-push with default:pushurl (issue5485)

2017-02-27 Thread Yuya Nishihara
On Sun, 26 Feb 2017 10:29:19 +0530, Rishabh Madan wrote: > # HG changeset patch > # User Rishabh Madan > # Date 1488022041 -19800 > # Sat Feb 25 16:57:21 2017 +0530 > # Node ID d2c41681512393835dd8fc3249eb45147e22549d > # Parent 88203f26ea57627cabd7cf9c4f7843661d6c43ae > ui: replace obsolete

Re: [PATCH] record: update help to describe ui.interface

2017-02-27 Thread Yuya Nishihara
On Sun, 26 Feb 2017 17:21:46 +0800, Anton Shestakov wrote: > On Fri, 24 Feb 2017 08:22:02 -0800 > Eloi Morlaas wrote: > > > # HG changeset patch > > # User eloimorlaas > > # Date 1487877797 28800 > > # Thu Feb 23 11:23:17 2017 -0800 > > # Node ID c870e1aa3828c0aaca3d1d56d758e09a66788bc9 > >

Re: [PATCH] patchbomb: allow specifying default --flag options via config(issue5354)

2017-02-27 Thread Yuya Nishihara
On Sun, 26 Feb 2017 20:33:19 +0530, Pulkit Goyal wrote: > > You could set it manually. > > > > [patchbomb] > > flag = "remotenames-ext" > > > > or do you mean you want to make it templatable? > > > > [patchbomb] > > flag = "{reponame}" > > > > ​I will like to make it templatable. The only

Re: [PATCH 1 of 4 V2] serve: add support for Mercurial subrepositories

2017-02-27 Thread Yuya Nishihara
On Sun, 26 Feb 2017 23:09:59 -0500, Matt Harbison wrote: > On Sun, 26 Feb 2017 08:28:01 -0500, Yuya Nishihara wrote: > > This is a dirty hack to make hgwebdir serve a repo at '/'. > > > > diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py > > --- a/mercurial/hgweb/hgweb_mod.p

Re: [PATCH] wix: include the help for pager

2017-02-27 Thread Yuya Nishihara
On Sat, 25 Feb 2017 21:51:54 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1488077074 18000 > # Sat Feb 25 21:44:34 2017 -0500 > # Node ID f3af642d13d78e7fcdea4468c024958a5ce2a745 > # Parent 5ce388a91851dc6c0dc1be0342a105da659e1d47 > wix: include the help

Re: [PATCH] pager: add support to --patch, --list and --stat options of hg shelve

2017-02-27 Thread Yuya Nishihara
On Mon, 27 Feb 2017 17:28:46 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1487974363 -19800 > # Sat Feb 25 03:42:43 2017 +0530 > # Node ID 85896cdcb1e073b0345309836a511a89212fb32e > # Parent be74ce1b930fd5044b2eb724058f1c0688811aa1 >

Re: [PATCH] manifest: check 'if x is None' instead of 'if not x'

2017-02-27 Thread Yuya Nishihara
On Sun, 26 Feb 2017 10:17:31 -0800, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1488133007 28800 > # Sun Feb 26 10:16:47 2017 -0800 > # Node ID a21671dd2578fea1cb58011c392f6dec16f29dc7 > # Parent 88203f26ea57627cabd7cf9c4f7843661d6c43ae > manifest: check 'if x i

[PATCH] pager: add support to --patch, --list and --stat options of hg shelve

2017-02-27 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1487974363 -19800 # Sat Feb 25 03:42:43 2017 +0530 # Node ID 85896cdcb1e073b0345309836a511a89212fb32e # Parent be74ce1b930fd5044b2eb724058f1c0688811aa1 pager: add support to --patch, --list and --stat options of hg shelve

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

2017-02-27 Thread Simon King
On Sun, Feb 26, 2017 at 5:25 AM, Matt Harbison wrote: > On Sat, 25 Feb 2017 23:32:12 -0500, Augie Fackler wrote: [snip] >>> Does it seem reasonable to move the above to a method, similar to >>> ui.editor()? I'd like to detect MSYS and default to `less`. IDK if we can >>> pull that off with ju