[PATCH] hgwebdir: add support for explicit index files

# HG changeset patch # User Matt Harbison # Date 1488770552 18000 # Sun Mar 05 22:22:32 2017 -0500 # Node ID 3ff768dd4fe9faeca8ccba040fa6a085584063aa # Parent 023123a67b54d98bd4c8ef8ac8cfd7a96247519e hgwebdir: add support for explicit index files This is useful for

[Bug 5497] New: "IndexError: list index out of range" when attempting to resolve merge conflicts

https://bz.mercurial-scm.org/show_bug.cgi?id=5497 Bug ID: 5497 Summary: "IndexError: list index out of range" when attempting to resolve merge conflicts Product: Mercurial Version: 4.1.1 Hardware: PC OS:

[PATCH 1 of 2 V2] dirstate: track updated files to improve write time

# HG changeset patch # User Durham Goode # Date 1488759607 28800 # Sun Mar 05 16:20:07 2017 -0800 # Node ID 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031 # Parent 9f62182a506396ee246ee5ec535c076caff98bde dirstate: track updated files to improve write time Previously,

[PATCH 2 of 2 V2] dirstate: track otherparent files same as nonnormal

# HG changeset patch # User Durham Goode # Date 1488761157 28800 # Sun Mar 05 16:45:57 2017 -0800 # Node ID a465bc91a3c1a04c9c75a3cbd13fd5b777487de9 # Parent 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031 dirstate: track otherparent files same as nonnormal Calling

Re: [PATCH 2 of 2] dirstate: track otherparent files same as nonnormal

On 3/5/17 4:24 PM, Durham Goode wrote: # HG changeset patch # User Durham Goode # Date 1488759650 28800 # Sun Mar 05 16:20:50 2017 -0800 # Node ID f902e85491b50b1d2495fecb6b4ce2c48829ec12 # Parent 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031 dirstate: track otherparent files

[PATCH 2 of 2] dirstate: track otherparent files same as nonnormal

# HG changeset patch # User Durham Goode # Date 1488759650 28800 # Sun Mar 05 16:20:50 2017 -0800 # Node ID f902e85491b50b1d2495fecb6b4ce2c48829ec12 # Parent 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031 dirstate: track otherparent files same as nonnormal Calling

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

Excerpts from Yuya Nishihara's message of 2017-03-05 18:11:12 +0900: > On Wed, 1 Mar 2017 12:38:44 -0800, Jun Wu wrote: > > Excerpts from Yuya Nishihara's message of 2017-02-28 23:04:52 +0900: > > > Perhaps this is related to the baselocalrepostiroy-vs-repostorage story. > > > Maybe we'll have to

Re: [PATCH 8 of 8] fileset: add a 'status(...)' predicate to control evaluation context

On Sun, 5 Mar 2017 14:18:06 +0100, Pierre-Yves David wrote: > On 03/05/2017 12:49 PM, Yuya Nishihara wrote: > > On Fri, 03 Mar 2017 14:40:45 +0100, Pierre-Yves David wrote: > >> # HG changeset patch > >> # User Pierre-Yves David > >> # Date 1488546500 -3600 > >> #

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

On 03/01/2017 02:03 PM, Yuya Nishihara wrote: On Tue, 28 Feb 2017 16:44:36 +0100, Pierre-Yves David wrote: On 02/28/2017 03:29 PM, Yuya Nishihara wrote: On Tue, 28 Feb 2017 11:35:03 +0100, Pierre-Yves David wrote: On 02/28/2017 11:24 AM, Pierre-Yves David wrote: On 02/28/2017 07:57 AM,

Re: [PATCH 8 of 8] fileset: add a 'status(...)' predicate to control evaluation context

On 03/05/2017 12:49 PM, Yuya Nishihara wrote: On Fri, 03 Mar 2017 14:40:45 +0100, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1488546500 -3600 # Fri Mar 03 14:08:20 2017 +0100 # Node ID

Re: [PATCH 8 of 8] fileset: add a 'status(...)' predicate to control evaluation context

On Fri, 03 Mar 2017 14:40:45 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1488546500 -3600 > # Fri Mar 03 14:08:20 2017 +0100 > # Node ID 3e95bf7ed38189f6f56de89571fffc667280bb56 > # Parent

Re: [PATCH 6 of 8] fileset: add revs(revs, fileset) to evaluate set in working directory

On Fri, 03 Mar 2017 14:40:43 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1488541496 -3600 > # Fri Mar 03 12:44:56 2017 +0100 > # Node ID 2d0e9bb0f121ebbd041abf2ad121a18f200f6206 > # Parent

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

On Wed, 1 Mar 2017 12:38:44 -0800, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-02-28 23:04:52 +0900: > > Perhaps this is related to the baselocalrepostiroy-vs-repostorage story. > > Maybe we'll have to settle it first? > > > > My view is that there will be a repostorage object,

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

On Thu, 2 Mar 2017 13:32:23 -0800, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-03-03 00:51:12 +0900: > > I hope so, but googling "fork thread" or "fork thread python" made me feel > > bad. I haven't read them carefully, but they seemed to say "don't do it." > > Good catch! > >