[Bug 5522] New: merge reports invalid nothing to merge

https://bz.mercurial-scm.org/show_bug.cgi?id=5522 Bug ID: 5522 Summary: merge reports invalid nothing to merge Product: Mercurial Version: 4.1.2 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug

Re: Internal-changeset concept

On 4/5/17 11:40 AM, Ryan McElroy wrote: On 4/4/17 9:07 PM, Martin von Zweigbergk via Mercurial-devel wrote: On Tue, Apr 4, 2017 at 12:06 PM, Jun Wu wrote: Since most people want a separate hidden storage that handles wider cases, I don't think this incomplete (internal-only)

Re: [PATCH 3 of 4] tests: add tests for --binary option in Git mode

On Wed, 5 Apr 2017 15:37:46 +0100, Ryan McElroy wrote: > On 4/4/17 11:21 PM, Alexander Fomin wrote: > > # HG changeset patch > > # User Alexander Fomin > > # Date 1491335167 25200 > > # Tue Apr 04 12:46:07 2017 -0700 > > # Node ID 373acf7da1a621607a1cc062b96ad67a42a7e016 > > #

Re: [PATCH 2 of 4] hg: add --binary option for Git mode diffs

On Tue, 4 Apr 2017 15:21:21 -0700, Alexander Fomin wrote: > # HG changeset patch > # User Alexander Fomin > # Date 1491334100 25200 > # Tue Apr 04 12:28:20 2017 -0700 > # Node ID 27515c7e38db9d93e18b7df13149da7c0d88eeb2 > # Parent 9be2b4ec19e846d2a95fe801ebe76f83fffd1ea9 >

Re: [PATCH 4 of 4] hg: make --binary option for Git diffs default to off

On Wed, 5 Apr 2017 15:37:51 +0100, Ryan McElroy wrote: > On 4/4/17 11:21 PM, Alexander Fomin wrote: > > # HG changeset patch > > # User Alexander Fomin > > # Date 1491342655 25200 > > # Tue Apr 04 14:50:55 2017 -0700 > > # Node ID 76f6cd23643c9816a688a1e12900a6856c5fabf6 > > #

Re: [PATCH 1 of 4 V2] obsolete: track node versions

On 4/5/17 11:23 AM, Pierre-Yves David wrote: Summary --- I think we need to take an extra step back in the current discussion. We seems be get slowly lost in a sub branch of evolution design, discussing sub-concerns with a partial view of the big picture. I agree. Overall, my feeling is

Re: Hidden Commits in 4.3

On 4/5/17 12:06 PM, Pierre-Yves David wrote: On 04/05/2017 03:11 AM, Durham Goode wrote: There's been a lot of discussion about how to hide and unhide commits lately [0][1], and I feel the complexity of our current approach is hurting our ability to reason about it, making it impossible to make

Re: [PATCH 4 of 6] hgweb: introduce staticimmutable web command

On Sat, 01 Apr 2017 00:29:08 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1491021501 25200 > # Fri Mar 31 21:38:21 2017 -0700 > # Node ID 0b8be3d244585f5a2874821418fce41bf7631f6c > # Parent

Re: [PATCH] perf: add historical portability for util.timer

On Wed, 05 Apr 2017 14:11:37 +0200, Philippe Pepiot wrote: > # HG changeset patch > # User Philippe Pepiot > # Date 1491391351 -7200 > # Wed Apr 05 13:22:31 2017 +0200 > # Node ID 8bec80c135fb155b8d10679900f08661b7f4d06a > # Parent

Re: [PATCH 1 of 2] repo: fix deprecation version for 'repo.join'

On Tue, 04 Apr 2017 16:54:22 +0200, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1491317338 -7200 > # Tue Apr 04 16:48:58 2017 +0200 > # Node ID 1efd0a70a0c9a185d3f6de6030a37608a9a8dbd5 > # Parent

Re: Hidden Commits in 4.3

> On Apr 5, 2017, at 10:01, Ryan McElroy wrote: > > Side-note: +1 on Simon's request to put the doc onto the wiki as a plan. In general, +1 on wiki pages, but only after the potential for a storm of comments has dwindled: discussion in doc comments is significantly less painful

Re: [PATCH 4 of 4] hg: make --binary option for Git diffs default to off

On 4/4/17 11:21 PM, Alexander Fomin wrote: # HG changeset patch # User Alexander Fomin # Date 1491342655 25200 # Tue Apr 04 14:50:55 2017 -0700 # Node ID 76f6cd23643c9816a688a1e12900a6856c5fabf6 # Parent 373acf7da1a621607a1cc062b96ad67a42a7e016 hg: make --binary option for

Re: [PATCH 1 of 4] patch: make diff in Git mode respect --text option (issue5510)

On 4/4/17 11:21 PM, Alexander Fomin wrote: # HG changeset patch # User Alexander Fomin # Date 1490992236 25200 # Fri Mar 31 13:30:36 2017 -0700 # Node ID 9be2b4ec19e846d2a95fe801ebe76f83fffd1ea9 # Parent 65969cd351b73228642d1e491e8c78b20d85405a patch: make diff in Git mode

Re: [PATCH 3 of 4] tests: add tests for --binary option in Git mode

On 4/4/17 11:21 PM, Alexander Fomin wrote: # HG changeset patch # User Alexander Fomin # Date 1491335167 25200 # Tue Apr 04 12:46:07 2017 -0700 # Node ID 373acf7da1a621607a1cc062b96ad67a42a7e016 # Parent 27515c7e38db9d93e18b7df13149da7c0d88eeb2 tests: add tests for --binary

Re: [PATCH] update: add a hint when aborting for uncommitted changes

On Apr 5, 2017 04:01, "Pierre-Yves David" wrote: On 04/05/2017 07:29 AM, Martin von Zweigbergk wrote: > On Tue, Apr 4, 2017 at 9:40 AM, Pierre-Yves David > wrote: > >> # HG changeset patch >> # User Pierre-Yves David

[Bug 5524] New: Abort during convertion

https://bz.mercurial-scm.org/show_bug.cgi?id=5524 Bug ID: 5524 Summary: Abort during convertion Product: Mercurial Version: 4.1.2 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug

[Bug 5526] New: Error trying to convert cpp-netlib git repo

https://bz.mercurial-scm.org/show_bug.cgi?id=5526 Bug ID: 5526 Summary: Error trying to convert cpp-netlib git repo Product: Mercurial Version: 4.0.2 Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

Re: Hidden Commits in 4.3

obsstore-based hidden is broken by design, since it cannot unhide commits: $ hg export . > patch.txt $ hg prune . # could also be done by pulling obsmarkers from a remote # peer, or it could be amend / metaedit etc. $ hg import --exact --bypass patch.txt # cannot really

Re: [PATCH] perf: add historical portability for util.timer

On 04/05/2017 04:10 PM, Yuya Nishihara wrote: On Wed, 05 Apr 2017 14:11:37 +0200, Philippe Pepiot wrote: # HG changeset patch # User Philippe Pepiot # Date 1491391351 -7200 # Wed Apr 05 13:22:31 2017 +0200 # Node ID 8bec80c135fb155b8d10679900f08661b7f4d06a #

[PATCH V2] fsmonitor: match watchman and filesystem encoding

# HG changeset patch # User Olivier Trempe # Date 1488981822 18000 # Wed Mar 08 09:03:42 2017 -0500 # Branch stable # Node ID 2021c3032968bef6b8d1cd7bea5a22996ced994c # Parent 68f263f52d2e3e2798b4f1e55cb665c6b043f93b fsmonitor: match watchman and filesystem encoding

[PATCH V2] perf: add historical portability for util.timer

# HG changeset patch # User Philippe Pepiot # Date 1491391351 -7200 # Wed Apr 05 13:22:31 2017 +0200 # Node ID c0231296470330eeae91058b9a3d7a6785e16cbe # Parent 04ec317b81280c189fcea33a05c8cbbac3c186b1 # Available At https://hg.logilab.org/users/ppepiot/hg #

Re: [PATCH 4 of 6] hgweb: introduce staticimmutable web command

On Thu, 6 Apr 2017 00:33:23 +0900, Yuya Nishihara wrote: > On Sat, 01 Apr 2017 00:29:08 -0700, Gregory Szorc wrote: > > # HG changeset patch > > # User Gregory Szorc > > # Date 1491021501 25200 > > # Fri Mar 31 21:38:21 2017 -0700 > > # Node ID

Re: [PATCH 4 of 4] hg: make --binary option for Git diffs default to off

On 4/5/17 3:59 PM, Yuya Nishihara wrote: On Wed, 5 Apr 2017 15:37:51 +0100, Ryan McElroy wrote: On 4/4/17 11:21 PM, Alexander Fomin wrote: # HG changeset patch # User Alexander Fomin # Date 1491342655 25200 # Tue Apr 04 14:50:55 2017 -0700 # Node ID

[Bug 5525] New: New hg blame flag to show _current_ line number

https://bz.mercurial-scm.org/show_bug.cgi?id=5525 Bug ID: 5525 Summary: New hg blame flag to show _current_ line number Product: Mercurial Version: unspecified Hardware: All OS: All Status: UNCONFIRMED

Re: Hidden Commits in 4.3

Excerpts from Pierre-Yves David's message of 2017-04-05 13:06:04 +0200: > I think we really needs to take a step back here. Before thinking about > unification, I think we needs a clean definition of what we are doing > here. As mentioned in another thread[2], they are at least three >

Re: [PATCH V2] fsmonitor: match watchman and filesystem encoding

On 4/5/17 08:42, Olivier Trempe wrote: # HG changeset patch # User Olivier Trempe # Date 1488981822 18000 # Wed Mar 08 09:03:42 2017 -0500 # Branch stable # Node ID 2021c3032968bef6b8d1cd7bea5a22996ced994c # Parent 68f263f52d2e3e2798b4f1e55cb665c6b043f93b

mercurial@31773: 13 new changesets

13 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b044c339c06d changeset: 31761:b044c339c06d parent: 31758:04ec317b8128 user:Jun Wu date:Wed Mar 29 14:45:01 2017 -0700 summary: verify: document corner cases

Fwd: Hidden Commits in 4.3

*sigh* I was confused by the gmail/inbox default reply yet again. The below was meant not just for Greg. Doesn't really add much value at this point :-P -- Forwarded message -- From: Martin von Zweigbergk Date: Tue, Apr 4, 2017 at 9:20 PM Subject: Re:

Re: Hidden Commits in 4.3

On 05/04/2017 02:11, Durham Goode wrote: There's been a lot of discussion about how to hide and unhide commits lately [0][1], and I feel the complexity of our current approach is hurting our ability to reason about it, making it impossible to make progress. I would like to formally propose a

Re: [PATCH] update: add a hint when aborting for uncommitted changes

On Wed, Apr 5, 2017 at 1:39 PM, Pierre-Yves David wrote: > > > On 04/05/2017 05:17 PM, Martin von Zweigbergk wrote: >> >> >> >> On Apr 5, 2017 04:01, "Pierre-Yves David" >> > >> wrote: >> >> >>

Re: Hidden Commits in 4.3

On 4/5/17 5:29 AM, Durham Goode wrote: On 4/4/17 8:58 PM, Gregory Szorc wrote: On Tue, Apr 4, 2017 at 6:11 PM, Durham Goode > wrote: There's been a lot of discussion about how to hide and unhide commits lately [0][1], and I feel the

Re: Hidden Commits in 4.3

On 4/5/17 4:06 AM, Pierre-Yves David wrote: On 04/05/2017 03:11 AM, Durham Goode wrote: There's been a lot of discussion about how to hide and unhide commits lately [0][1], and I feel the complexity of our current approach is hurting our ability to reason about it, making it impossible to make

Re: [PATCH 4 of 4] hg: make --binary option for Git diffs default to off

On 05/04/2017, 07:37, "Ryan McElroy" wrote: > > On 4/4/17 11:21 PM, Alexander Fomin wrote: > > # HG changeset patch > > # User Alexander Fomin > > # Date 1491342655 25200 > > # Tue Apr 04 14:50:55 2017 -0700 > > # Node ID 76f6cd23643c9816a688a1e12900a6856c5fabf6

Re: Hidden Commits in 4.3

On Wed, Apr 5, 2017 at 3:02 PM, Durham Goode wrote: > On 4/5/17 4:06 AM, Pierre-Yves David wrote: >> >> On 04/05/2017 03:11 AM, Durham Goode wrote: >>> >>> There's been a lot of discussion about how to hide and unhide commits >>> lately [0][1], and I feel the complexity of our

Re: [PATCH] py3: have registrar process docstrings in bytes

On Wed, Apr 05, 2017 at 12:56:54AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1491320098 -32400 > # Wed Apr 05 00:34:58 2017 +0900 > # Node ID de8d9a4ba73002af9d2992a15e0a196c2fcaf217 > # Parent

Re: [PATCH] update: add a hint when aborting for uncommitted changes

On 04/05/2017 05:17 PM, Martin von Zweigbergk wrote: On Apr 5, 2017 04:01, "Pierre-Yves David" > wrote: On 04/05/2017 07:29 AM, Martin von Zweigbergk wrote: On Tue, Apr 4, 2017 at 9:40 AM, Pierre-Yves

Re: [PATCH V2] fsmonitor: match watchman and filesystem encoding

On 4/5/17 13:30, Olivier Trempe wrote: Absolutely. This will be fixed in V3. I also realize the "import sys" statement was removed 3 months ago. I missed it when rebasing... This will also be fixed in V3. Thanks. In general, do you think you could add a test for the behavior where fsmonitor

Re: [PATCH 4 of 4 NEW-CONCEPT] track-tags: write all tag changes to a file

I don't think "writing things that hook *may* need to filesystem" is a good approach. It introduces unnecessary overhead if the hook does not need that information. I think a better way is to have per-hook config to let hooks explicitly declare what they need, before we run them. Excerpts from

Re: [PATCH 4 of 4 NEW-CONCEPT] track-tags: write all tag changes to a file

> On Apr 4, 2017, at 07:09, Pierre-Yves David > wrote: > > > > On 04/03/2017 10:50 PM, Augie Fackler wrote: >> On Thu, Mar 30, 2017 at 05:03:42PM +0200, Pierre-Yves David wrote: >>> # HG changeset patch >>> # User Pierre-Yves David

mercurial@31792: 19 new changesets

19 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/7d2cbe11ae48 changeset: 31774:7d2cbe11ae48 user:Yuya Nishihara date:Wed Mar 29 21:13:55 2017 +0900 summary: pycompat: introduce identity function as a compat stub

Re: [PATCH 4 of 4 NEW-CONCEPT] track-tags: write all tag changes to a file

On 04/05/2017 09:27 PM, Augie Fackler wrote: On Apr 4, 2017, at 07:09, Pierre-Yves David wrote: On 04/03/2017 10:50 PM, Augie Fackler wrote: On Thu, Mar 30, 2017 at 05:03:42PM +0200, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David

Re: [PATCH V2] fsmonitor: match watchman and filesystem encoding

On Wed, Apr 5, 2017 at 1:55 PM, Siddharth Agarwal wrote: > > On 4/5/17 08:42, Olivier Trempe wrote: >> >> # HG changeset patch >> # User Olivier Trempe >> # Date 1488981822 18000 >> # Wed Mar 08 09:03:42 2017 -0500 >> # Branch stable >> # Node

[PATCH] perf: add historical portability for util.timer

# HG changeset patch # User Philippe Pepiot # Date 1491391351 -7200 # Wed Apr 05 13:22:31 2017 +0200 # Node ID 8bec80c135fb155b8d10679900f08661b7f4d06a # Parent 04ec317b81280c189fcea33a05c8cbbac3c186b1 # Available At https://hg.logilab.org/users/ppepiot/hg #

Re: Internal-changeset concept

On 04/04/2017 09:06 PM, Jun Wu wrote: Since most people want a separate hidden storage that handles wider cases, I don't think this incomplete (internal-only) solution worths investment. They seems to be misunderstanding here. We should probably jump on a Face to Face medium What I've

Re: Internal-changeset concept

(the most interesting content, directly about the internal-concept, is at the end of this email) On 04/05/2017 03:23 PM, Ryan McElroy wrote: On 4/5/17 11:40 AM, Ryan McElroy wrote: […] (3) Thanks to Pierre-Yves for the detailed analysis of verious mechanisms for implementing internal-only

Re: [PATCH 1 of 4 V2] obsolete: track node versions

On 04/05/2017 03:30 PM, Ryan McElroy wrote: […] I strongly believe that going back into a long discussion or battle over how evolve should behave is a good use of anyone's time. Can't we just build out core hiding mechanisms and build experiences on top of that? We can each use this in the way

Re: [PATCH 4 of 4 NEW-CONCEPT] track-tags: write all tag changes to a file

On 04/05/2017 10:54 PM, Jun Wu wrote: I don't think "writing things that hook *may* need to filesystem" is a good approach. It introduces unnecessary overhead if the hook does not need that information. I do not find the overhead concerning. The thing to keep in mind is that if they are

Re: [PATCH 4 of 4 NEW-CONCEPT] track-tags: write all tag changes to a file

Excerpts from Pierre-Yves David's message of 2017-04-06 01:09:47 +0200: > > On 04/05/2017 10:54 PM, Jun Wu wrote: > > I don't think "writing things that hook *may* need to filesystem" is a good > > approach. It introduces unnecessary overhead if the hook does not need that > > information. > > I

[PATCH 1 of 3 v2] patch: make diff in git mode respect --text option (issue5510)

# HG changeset patch # User Alexander Fomin # Date 1491430506 25200 # Wed Apr 05 15:15:06 2017 -0700 # Node ID bb06942306b27dfbbe554c307f82a5c6b08e0cae # Parent 65969cd351b73228642d1e491e8c78b20d85405a patch: make diff in git mode respect --text option (issue5510) This

[PATCH 3 of 3 v2] hg: make --binary option for git diffs default to off (BC)

# HG changeset patch # User Alexander Fomin # Date 1491431909 25200 # Wed Apr 05 15:38:29 2017 -0700 # Node ID f3814cce4dda8e8090736f642b694ce7cd3792bb # Parent 900f393807023064cb484e86e3ccffa6338b55bb hg: make --binary option for git diffs default to off (BC) This patch is

[PATCH 2 of 3 v2] hg: add --binary option for git mode diffs

# HG changeset patch # User Alexander Fomin # Date 1491431468 25200 # Wed Apr 05 15:31:08 2017 -0700 # Node ID 900f393807023064cb484e86e3ccffa6338b55bb # Parent bb06942306b27dfbbe554c307f82a5c6b08e0cae hg: add --binary option for git mode diffs This patch adds --binary

Re: Hidden Commits in 4.3

(important bit about how we -already- have a generic hiding API is at the end of the email). On 04/05/2017 04:06 PM, Ryan McElroy wrote: On 4/5/17 12:06 PM, Pierre-Yves David wrote: On 04/05/2017 03:11 AM, Durham Goode wrote: I think we really needs to take a step back here. Before

Re: [PATCH 1 of 4 V2] obsolete: track node versions

I respond inline, but I'm also happy to drop discussion about evolve-like user experience changes and instead focus on the proposal about just making hidden commits a separate system. So we can discuss the various topics incrementally. On 4/5/17 3:23 AM, Pierre-Yves David wrote: Summary

Re: [PATCH 1 of 4] patch: make diff in Git mode respect --text option (issue5510)

On 05/04/2017, 07:37, "Ryan McElroy" wrote: > > On 4/4/17 11:21 PM, Alexander Fomin wrote: > > # HG changeset patch > > # User Alexander Fomin > > # Date 1490992236 25200 > > # Fri Mar 31 13:30:36 2017 -0700 > > # Node ID 9be2b4ec19e846d2a95fe801ebe76f83fffd1ea9

Re: [PATCH 3 of 4] tests: add tests for --binary option in Git mode

On 05/04/2017, 07:54, "Yuya Nishihara" wrote: > > On Wed, 5 Apr 2017 15:37:46 +0100, Ryan McElroy wrote: > > On 4/4/17 11:21 PM, Alexander Fomin wrote: > > > # HG changeset patch > > > # User Alexander Fomin > > > # Date 1491335167

Re: Internal-changeset concept

Excerpts from Pierre-Yves David's message of 2017-04-05 13:28:57 +0200: > > On 04/04/2017 09:06 PM, Jun Wu wrote: > > Since most people want a separate hidden storage that handles wider cases, I > > don't think this incomplete (internal-only) solution worths investment. > > They seems to be

Re: Internal-changeset concept

Excerpts from Pierre-Yves David's message of 2017-04-05 13:28:57 +0200: > > On 04/04/2017 09:06 PM, Jun Wu wrote: > > Since most people want a separate hidden storage that handles wider cases, I > > don't think this incomplete (internal-only) solution worths investment. > > They seems to be

Re: Fwd: Hidden Commits in 4.3

On 4/5/17 9:58 AM, Martin von Zweigbergk wrote: *sigh* I was confused by the gmail/inbox default reply yet again. The below was meant not just for Greg. Doesn't really add much value at this point :-P -- Forwarded message -- From: Martin von Zweigbergk

Re: Internal-changeset concept

On 4/4/17 9:07 PM, Martin von Zweigbergk via Mercurial-devel wrote: On Tue, Apr 4, 2017 at 12:06 PM, Jun Wu wrote: Since most people want a separate hidden storage that handles wider cases, I don't think this incomplete (internal-only) solution worths investment. I can't say

Re: [PATCH] update: add a hint when aborting for uncommitted changes

On 04/05/2017 07:29 AM, Martin von Zweigbergk wrote: On Tue, Apr 4, 2017 at 9:40 AM, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1491225382 -7200 # Mon Apr 03 15:16:22 2017 +0200 # Node ID

Re: Hidden Commits in 4.3

On 04/05/2017 03:11 AM, Durham Goode wrote: There's been a lot of discussion about how to hide and unhide commits lately [0][1], and I feel the complexity of our current approach is hurting our ability to reason about it, making it impossible to make progress. I would like to formally propose a

Re: [PATCH 1 of 4 V2] obsolete: track node versions

Summary --- I think we need to take an extra step back in the current discussion. We seems be get slowly lost in a sub branch of evolution design, discussing sub-concerns with a partial view of the big picture. Currently Evolution has: * an overall consistent design, * a planned final UI

[Bug 5523] New: renamed subrepos cause "repository X not found" warnings running hg verify

https://bz.mercurial-scm.org/show_bug.cgi?id=5523 Bug ID: 5523 Summary: renamed subrepos cause "repository X not found" warnings running hg verify Product: Mercurial Version: 4.0 Hardware: PC OS: Linux