Jun Wu writes:
> hash-preserving obsstore,
I've commented on this before but I will try to be as explicit as
possible here.
I do not want to think about hash-preserving obsstore right now.
I do not want to think about it for the next year even.
I want obs-exchange to solved
I think the series is a good improvement and can be queued with some small
in-flight fixes.
Excerpts from Gregory Szorc's message of 2017-07-09 16:46:17 -0700:
> diff --git a/mercurial/color.py b/mercurial/color.py
> --- a/mercurial/color.py
> +++ b/mercurial/color.py
> @@ -135,13 +135,31 @@
Excerpts from Gregory Szorc's message of 2017-07-09 16:46:16 -0700:
> [...]
> @@ -146,6 +179,43 @@ def _terminfocolors(ui):
> for color, value in TERMINFO_COLOR_8.items():
> colors[color] = (value, False)
>
> +# Add 16 and 256 bit colors if supported and allowed by config
On Mon, 19 Jun 2017 11:30:28 -0400, Yuya Nishihara wrote:
On Sun, 18 Jun 2017 22:19:29 -0400, Augie Fackler wrote:
> On Jun 16, 2017, at 22:02, Matt Harbison
wrote:
>
> On Fri, 16 Jun 2017 09:59:30 -0400, Augie Fackler
wrote:
>
This should be retitled to "remove nullmerge and revignored states".
(it seems Phabricator could be helpful in this situation - the title could
be changed without a resend)
Excerpts from Jun Wu's message of 2017-07-09 12:14:53 -0700:
> # HG changeset patch
> # User Jun Wu
> # Date
# HG changeset patch
# User Gregory Szorc
# Date 1499641339 25200
# Sun Jul 09 16:02:19 2017 -0700
# Node ID fa6223b9e2a0d9fbfa81329b83c0512417cee713
# Parent 98c54db9407a7e0ba94a632aafdbbec3fc76fa8b
color: automatically define 16 and 256 colors if supported
The
# HG changeset patch
# User Gregory Szorc
# Date 1499628062 25200
# Sun Jul 09 12:21:02 2017 -0700
# Node ID 129c9709980108beecfa1c02a52c679654de8b21
# Parent 4672db164c986da4442bd864cd044512d975c3f2
color: call curses.setupterm() earlier
It doesn't make sense to
# HG changeset patch
# User Gregory Szorc
# Date 1499643195 25200
# Sun Jul 09 16:33:15 2017 -0700
# Node ID 91d6e437a93d91c1423e2ce735dc053a131fd590
# Parent fa6223b9e2a0d9fbfa81329b83c0512417cee713
[RFC] color: support different styling depending on color support
# HG changeset patch
# User Gregory Szorc
# Date 1499639997 25200
# Sun Jul 09 15:39:57 2017 -0700
# Node ID 98c54db9407a7e0ba94a632aafdbbec3fc76fa8b
# Parent 129c9709980108beecfa1c02a52c679654de8b21
color: refactor how terminfo colors are defined
Terminfo colors
On Sun, 09 Jul 2017 19:34:53 -0400, Matt Harbison
wrote:
# HG changeset patch
# User Matt Harbison
# Date 1499582763 14400
# Sun Jul 09 02:46:03 2017 -0400
# Node ID 81a3a3e44a191cfea66e25d472d65cce6cf2020d
# Parent
# HG changeset patch
# User Matt Harbison
# Date 1499632684 14400
# Sun Jul 09 16:38:04 2017 -0400
# Node ID 3ecc0fb587347c91f730eecf261ec707d91e367a
# Parent 52be0dbe23036b919defce0c417175ab615a05b2
test-subrepo: demonstrate a status problem when merge deletes a
# HG changeset patch
# User Matt Harbison
# Date 1499631210 14400
# Sun Jul 09 16:13:30 2017 -0400
# Node ID 52be0dbe23036b919defce0c417175ab615a05b2
# Parent 97e2a1b90d6f74fbff1f7c62dc97b16462b9a7d2
subrepo: make the output references to subrepositories consistent
# HG changeset patch
# User Matt Harbison
# Date 1499573943 14400
# Sun Jul 09 00:19:03 2017 -0400
# Node ID 09a3c95bdd28d00bc0071a4ade1ab31cf61262b2
# Parent 19ffd0a7aa46964067e35dd6a092adac2c238502
identify: simplify the dirty check
This is equivalent to the
# HG changeset patch
# User Matt Harbison
# Date 1499583346 14400
# Sun Jul 09 02:55:46 2017 -0400
# Node ID 97e2a1b90d6f74fbff1f7c62dc97b16462b9a7d2
# Parent 81a3a3e44a191cfea66e25d472d65cce6cf2020d
subrepo: consider the parent repo dirty when a file is missing
# HG changeset patch
# User Matt Harbison
# Date 1499574183 14400
# Sun Jul 09 00:23:03 2017 -0400
# Node ID fca94a77d9cac7b60a4b152fcb42ddb4dd1a
# Parent 09a3c95bdd28d00bc0071a4ade1ab31cf61262b2
blackbox: simplify the dirty check
Same idea (and possibly
# HG changeset patch
# User Matt Harbison
# Date 1499575996 14400
# Sun Jul 09 00:53:16 2017 -0400
# Node ID 3026ee006b20cf266d90181edbc9e2061cce8f92
# Parent fca94a77d9cac7b60a4b152fcb42ddb4dd1a
cmdutil: simplify the dirty check in howtocontinue()
This is
# HG changeset patch
# User Matt Harbison
# Date 1499582763 14400
# Sun Jul 09 02:46:03 2017 -0400
# Node ID 81a3a3e44a191cfea66e25d472d65cce6cf2020d
# Parent 3026ee006b20cf266d90181edbc9e2061cce8f92
archival: flag missing files as a dirty wdir() in the metadata
# HG changeset patch
# User Matt Harbison
# Date 1499573131 14400
# Sun Jul 09 00:05:31 2017 -0400
# Node ID 19ffd0a7aa46964067e35dd6a092adac2c238502
# Parent 1e872b08a4e93b21e60cba695e4022bf71d4acf4
tests: tweak the subrepo dirty state tests
This is a continuation
On Sun, Jul 9, 2017 at 3:09 PM, Martin von Zweigbergk via Mercurial-devel <
mercurial-devel@mercurial-scm.org> wrote:
> # HG changeset patch
> # User Martin von Zweigbergk
> # Date 1499404838 25200
> # Thu Jul 06 22:20:38 2017 -0700
> # Node ID
# HG changeset patch
# User Martin von Zweigbergk
# Date 1499404838 25200
# Thu Jul 06 22:20:38 2017 -0700
# Node ID 27c6b35d4637ae4bca2b78c6f2f2f06af0d47873
# Parent 9087f9997f42ce3035e97a03bce63852a20e
sparse: access status fields by name instead of
On Sat, Jul 8, 2017 at 4:28 PM, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc
> # Date 1499546059 25200
> # Sat Jul 08 13:34:19 2017 -0700
> # Node ID 43da636d83fc5e4eae97a6c3b526552407a4ec77
> # Parent
# HG changeset patch
# User Rishabh Madan
# Date 1499636627 -7200
# Sun Jul 09 23:43:47 2017 +0200
# Node ID c83144b6b48a2374a37114336e58974546e915e3
# Parent 43c97ccdfd39cfa447100b54e923d1d3d753476b
releasenotes: add similarity check function to compare incoming
# HG changeset patch
# User Rishabh Madan
# Date 1499635502 -7200
# Sun Jul 09 23:25:02 2017 +0200
# Node ID 43c97ccdfd39cfa447100b54e923d1d3d753476b
# Parent 5f22d3d43d36d46cea98c86b2a49eee2d323fd9e
releasenotes: add import check for fuzzywuzzy
This patch adds
Excerpts from Martin von Zweigbergk's message of 2017-07-09 13:44:26 -0700:
> If we wanted to, we could drop support for the case you in the mention
> there (with the AD and BC strips) and make each call to delayedstrip()
> result in one backup (with its own name/topic). I think I prefer that
>
On Sun, Jul 9, 2017 at 12:54 PM, Jun Wu wrote:
> Excerpts from Augie Fackler's message of 2017-07-09 15:28:15 -0400:
>>
>> > On Jul 9, 2017, at 2:24 PM, Martin von Zweigbergk
>> > wrote:
>> >
>> > On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
On Sun, Jul 9, 2017 at 10:52 AM, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1499458441 -7200
> # Fri Jul 07 22:14:01 2017 +0200
> # Node ID 6edb62505c697329de034c2fdc47befd5896f31f
> # Parent
It's not very clear to me that what do we plan to use the effectflags.
I guess the most useful case is divergent resolution, like Alice changes
message, Bob changes content, so we know what to do. But a chain of changes
could cancel effects with each other, like:
A0 - (amend by Alice) -> A1 -
Excerpts from Martin von Zweigbergk's message of 2017-07-09 12:54:50 -0700:
> I agree that amend and metaedit should not need it. I could be made an
> option, since at least rebase and histedit seem to need it. Anyway, we
> can always deal with that when someone files a bug report.
An option
On Sun, Jul 9, 2017 at 10:06 AM, Jun Wu wrote:
> Looks good to me. Thanks for the cleanup!
Yep. Queued, thanks!
>
> Excerpts from Boris Feld's message of 2017-07-09 18:49:04 +0200:
>> # HG changeset patch
>> # User Octobus
>> # Date 1499605879 -7200
>> #
On Sun, Jul 9, 2017 at 12:21 PM, Jun Wu wrote:
> Excerpts from Martin von Zweigbergk's message of 2017-07-09 12:04:11 -0700:
>> On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
>> > diff --git a/hgext/histedit.py b/hgext/histedit.py
>> > --- a/hgext/histedit.py
>> > +++
Excerpts from Augie Fackler's message of 2017-07-09 15:28:15 -0400:
>
> > On Jul 9, 2017, at 2:24 PM, Martin von Zweigbergk
> > wrote:
> >
> > On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
> >> # HG changeset patch
> >> # User Jun Wu
> >> #
> On Jul 9, 2017, at 2:24 PM, Martin von Zweigbergk
> wrote:
>
> On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
>> # HG changeset patch
>> # User Jun Wu
>> # Date 1499557831 25200
>> # Sat Jul 08 16:50:31 2017 -0700
>> # Node ID
Excerpts from Martin von Zweigbergk's message of 2017-07-09 12:04:11 -0700:
> On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
> > diff --git a/hgext/histedit.py b/hgext/histedit.py
> > --- a/hgext/histedit.py
> > +++ b/hgext/histedit.py
> > @@ -1182,5 +1182,9 @@ def
# HG changeset patch
# User Jun Wu
# Date 1499571514 25200
# Sat Jul 08 20:38:34 2017 -0700
# Node ID e633aabf34125ef5d5453c211cee7e63654346d2
# Parent 8ba4291b60f1b98903bdac9f18057ae8b7f64d58
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull
# HG changeset patch
# User Jun Wu
# Date 1499571514 25200
# Sat Jul 08 20:38:34 2017 -0700
# Node ID 22d54f1e4c09d8fb68ea897afcdd0b705db94b5a
# Parent 49d1672e7567f2a16c5ce9afa64babe08891718f
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull
# HG changeset patch
# User Jun Wu
# Date 1499568916 25200
# Sat Jul 08 19:55:16 2017 -0700
# Node ID 5a13cf09bacd7912367c4f15b73920fadaf0a457
# Parent 1e872b08a4e93b21e60cba695e4022bf71d4acf4
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull
# HG changeset patch
# User Jun Wu
# Date 1499569552 25200
# Sat Jul 08 20:05:52 2017 -0700
# Node ID 85aa943fb16e8fe9f8fed13871a28bdd20ff31b0
# Parent 5a13cf09bacd7912367c4f15b73920fadaf0a457
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull
# HG changeset patch
# User Jun Wu
# Date 1499570073 25200
# Sat Jul 08 20:14:33 2017 -0700
# Node ID 8ba4291b60f1b98903bdac9f18057ae8b7f64d58
# Parent 85aa943fb16e8fe9f8fed13871a28bdd20ff31b0
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull
# HG changeset patch
# User Jun Wu
# Date 1499571514 25200
# Sat Jul 08 20:38:34 2017 -0700
# Node ID 49d1672e7567f2a16c5ce9afa64babe08891718f
# Parent e633aabf34125ef5d5453c211cee7e63654346d2
# Available At https://bitbucket.org/quark-zju/hg-draft
# hg pull
I'd like to comment on next plans of radixlink and hash-preserving obsstore,
since they look promising and I didn't send followups promptly.
The previous radixlink code works, but comparing to the radixtree in
revlog.c, the radixlink series I have sent is 4x larger in space usage, and
70% slower
On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -1182,5 +1182,9 @@ def _finishhistedit(ui, repo, state):
> mapping[n] = ()
>
> -safecleanupnode(ui, repo, mapping)
On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
> # HG changeset patch
> # User Jun Wu
> # Date 1499557831 25200
> # Sat Jul 08 16:50:31 2017 -0700
> # Node ID d75e65724d2bbcf17fcaaad705e463e84a3de5d2
> # Parent 9a325ae88021e0e02a87ef1ae6baa8a199405140
> #
On Sun, 2017-07-09 at 19:52 +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1499458552 -7200
> # Fri Jul 07 22:15:52 2017 +0200
> # Node ID 8b71290526ddb77f157e075191dd748793d85601
> # Parent 6edb62505c697329de034c2fdc47befd5896f31f
> #
# HG changeset patch
# User Boris Feld
# Date 1495198006 -7200
# Fri May 19 14:46:46 2017 +0200
# Node ID f8953ed43f8d1b146dcff688030133f0d6123a49
# Parent 985d753d4f5799f2a332140adedb06efd465d62b
# EXP-Topic obs-cache
obscache: instantiate the cache and keep it warm
# HG changeset patch
# User Boris Feld
# Date 1499458924 -7200
# Fri Jul 07 22:22:04 2017 +0200
# Node ID 5b49f653a4a50607127e37e7511c8a8e343cc8d9
# Parent 7c41d1484f53c53d516153d19a90c331c3f87c16
# EXP-Topic obs-cache
cache: add a obsstoresourcebase class
This
# HG changeset patch
# User Boris Feld
# Date 1495197986 -7200
# Fri May 19 14:46:26 2017 +0200
# Node ID 63214f4d9a766761259b650539eede424413e6a2
# Parent 774ff18cc36b72822f598b4fa5a51628513926e3
# EXP-Topic obs-cache
obscache: add a cache for 1/2 of the "obsolete"
# HG changeset patch
# User Boris Feld
# Date 1497674383 -7200
# Sat Jun 17 06:39:43 2017 +0200
# Node ID 7c41d1484f53c53d516153d19a90c331c3f87c16
# Parent e73d330f6fdb0cf1635920f4302b61b321ec58e2
# EXP-Topic obs-cache
obsstore: add a method to incrementally retrieve
# HG changeset patch
# User Boris Feld
# Date 1495198021 -7200
# Fri May 19 14:47:01 2017 +0200
# Node ID 3a93e99b0e718befd57a32615a14fd0d3c194456
# Parent f8953ed43f8d1b146dcff688030133f0d6123a49
# EXP-Topic obs-cache
obscache: use the obscache to compute the
# HG changeset patch
# User Boris Feld
# Date 1499458441 -7200
# Fri Jul 07 22:14:01 2017 +0200
# Node ID 6edb62505c697329de034c2fdc47befd5896f31f
# Parent 89796a25d4bb91fb418ad3e70faad2c586902ffb
# EXP-Topic obs-cache
cache: introduce an abstract class for cache we
# HG changeset patch
# User Boris Feld
# Date 1495197862 -7200
# Fri May 19 14:44:22 2017 +0200
# Node ID 985d753d4f5799f2a332140adedb06efd465d62b
# Parent 63214f4d9a766761259b650539eede424413e6a2
# EXP-Topic obs-cache
obsstore: pass a repository object for
# HG changeset patch
# User Boris Feld
# Date 1496358960 -7200
# Fri Jun 02 01:16:00 2017 +0200
# Node ID 59528ec2969e10de1c3eec16149b483083b89218
# Parent 7774ff78ef2e7433368184e7de743342b771b91c
# EXP-Topic obs-cache
obscache: skip updating outdated obscache
# HG changeset patch
# User Boris Feld
# Date 1499565372 -7200
# Sun Jul 09 03:56:12 2017 +0200
# Node ID 7774ff78ef2e7433368184e7de743342b771b91c
# Parent 3a93e99b0e718befd57a32615a14fd0d3c194456
# EXP-Topic obs-cache
cache: add a way to check if a cache is up to
# HG changeset patch
# User Boris Feld
# Date 1499523976 -7200
# Sat Jul 08 16:26:16 2017 +0200
# Node ID 774ff18cc36b72822f598b4fa5a51628513926e3
# Parent 5d3e659c979aa428ba44b138cfac30b7cca28fb3
# EXP-Topic obs-cache
cache: adds debug details about what the content
# HG changeset patch
# User Boris Feld
# Date 1499458959 -7200
# Fri Jul 07 22:22:39 2017 +0200
# Node ID 5d3e659c979aa428ba44b138cfac30b7cca28fb3
# Parent 5b49f653a4a50607127e37e7511c8a8e343cc8d9
# EXP-Topic obs-cache
cache: introduce a dualsourcebase class
This
# HG changeset patch
# User Jun Wu
# Date 1496552183 25200
# Sat Jun 03 21:56:23 2017 -0700
# Node ID ff2ebc11f12a26a4e0bda3ccf5fde63f5f690813
# Parent 8b71290526ddb77f157e075191dd748793d85601
# EXP-Topic obs-cache
obsstore: keep self._data updated with _addmarkers
This makes
# HG changeset patch
# User Jun Wu
# Date 1496595729 25200
# Sun Jun 04 10:02:09 2017 -0700
# Node ID e73d330f6fdb0cf1635920f4302b61b321ec58e2
# Parent ff2ebc11f12a26a4e0bda3ccf5fde63f5f690813
# EXP-Topic obs-cache
obsstore: let read marker API take a range of offsets
This
# HG changeset patch
# User Boris Feld
# Date 1499458552 -7200
# Fri Jul 07 22:15:52 2017 +0200
# Node ID 8b71290526ddb77f157e075191dd748793d85601
# Parent 6edb62505c697329de034c2fdc47befd5896f31f
# EXP-Topic obs-cache
cache: introduce a changelogsourcebase class
# HG changeset patch
# User Boris Feld
# Date 1499458441 -7200
# Fri Jul 07 22:14:01 2017 +0200
# Node ID 6edb62505c697329de034c2fdc47befd5896f31f
# Parent 89796a25d4bb91fb418ad3e70faad2c586902ffb
# EXP-Topic obs-cache
cache: introduce an abstract class for cache we
# HG changeset patch
# User Boris Feld
# Date 1499458552 -7200
# Fri Jul 07 22:15:52 2017 +0200
# Node ID 8b71290526ddb77f157e075191dd748793d85601
# Parent 6edb62505c697329de034c2fdc47befd5896f31f
# EXP-Topic obs-cache
cache: introduce a changelogsourcebase class
Looks good to me. Thanks for the cleanup!
Excerpts from Boris Feld's message of 2017-07-09 18:49:04 +0200:
> # HG changeset patch
> # User Octobus
> # Date 1499605879 -7200
> # Sun Jul 09 15:11:19 2017 +0200
> # Node ID a6ed7f0670010e5a6551d736b00dc0bf7367bba8
> #
# HG changeset patch
# User Rishabh Madan
# Date 1499619850 -7200
# Sun Jul 09 19:04:10 2017 +0200
# Node ID 5f22d3d43d36d46cea98c86b2a49eee2d323fd9e
# Parent 4672db164c986da4442bd864cd044512d975c3f2
releasenotes: add custom admonitions support for release notes
On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu wrote:
> # HG changeset patch
> # User Jun Wu
> # Date 1499557831 25200
> # Sat Jul 08 16:50:31 2017 -0700
> # Node ID 9a325ae88021e0e02a87ef1ae6baa8a199405140
> # Parent d1b9eb1ad8ac5f9e645337034594862e1ba37092
> #
# HG changeset patch
# User Octobus
# Date 1499605879 -7200
# Sun Jul 09 15:11:19 2017 +0200
# Node ID a6ed7f0670010e5a6551d736b00dc0bf7367bba8
# Parent 4672db164c986da4442bd864cd044512d975c3f2
# EXP-Topic fix-cleanup
cleanupnode: do not use generator for node mapping
>
> > class releasenotessections(object):
> > -def __init__(self, ui):
> > -# TODO support defining custom sections from config.
> > -self._sections = list(DEFAULT_SECTIONS)
> > +def __init__(self, repo, revs, ui):
> > +custom_sections =
On Fri, 07 Jul 2017 19:13:58 +0200, Rishabh Madan wrote:
> # HG changeset patch
> # User Rishabh Madan
> # Date 1499447586 -7200
> # Fri Jul 07 19:13:06 2017 +0200
> # Node ID 766932e4c2768577173f1bfaa10e919b9df739ec
> # Parent
# HG changeset patch
# User Josef 'Jeff' Sipek
# Date 1499599407 -10800
# Sun Jul 09 14:23:27 2017 +0300
# Branch stable
# Node ID c497d62fdcea9861369a15896a1f59d6f3787765
# Parent db3830646e34220cfcac0837a33f9a8503dea5d2
tutorial: word wrap long lines
diff --git
# HG changeset patch
# User Josef 'Jeff' Sipek
# Date 1499601692 -10800
# Sun Jul 09 15:01:32 2017 +0300
# Branch stable
# Node ID d3297cb2c810432906d8cf4b45e412f2f87241b0
# Parent c497d62fdcea9861369a15896a1f59d6f3787765
tutorial: fix grammar and spelling
diff --git
# HG changeset patch
# User Josef 'Jeff' Sipek
# Date 1499599224 -10800
# Sun Jul 09 14:20:24 2017 +0300
# Branch stable
# Node ID db3830646e34220cfcac0837a33f9a8503dea5d2
# Parent 61e73c8fe169717105e832b23086683848a9ef53
tutorial: use rm instead of 'hg rm' for an
68 matches
Mail list logo