Re: ShareSafePlan

2020-09-30 Thread Martin von Zweigbergk via Mercurial-devel
On Wed, Sep 30, 2020 at 8:46 AM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > > > On 9/17/20 6:15 PM, Martin von Zweigbergk wrote: > > > > > > On Wed, Sep 16, 2020 at 1:26 AM Pulkit Goyal <7895pul...@gmail.com > > > wrote: > > > > On Wed, Sep 16,

D9135: doc: Generate separate commands/topics/extension web pages.

2020-09-30 Thread ludovicchabant (Ludovic Chabant)
ludovicchabant created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D9135 AFFECTED FILES .hgignore doc/Makefile doc/gendoc.py doc/templates/cmdheader.txt

D9134: help: extract logic for listing commands and topics.

2020-09-30 Thread ludovicchabant (Ludovic Chabant)
ludovicchabant created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D9134 AFFECTED FILES mercurial/help.py CHANGE DETAILS diff --git a/mercurial/help.py

Re: [SOLVED]

2020-09-30 Thread Uwe Brauer
> Le dim. 27 sept. 2020 à 18:25, Uwe Brauer a écrit : > If you installed mercurial and mercurial-git from Ubuntu packages, it seems > the problem comes from the dependancies defined in the package. It should > depends from python-brotli. > In this case, a bug report could be send to Ubuntu. No

D9133: rust: start plugging the dirstate tree behind a feature gate

2020-09-30 Thread Raphaël Gomès
Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The previous patch added the `dirstate-tree` feature gate to enable the two dirstate implementations to co-habit while the tree-based one gets better. This

D9132: rust: introduce `dirstate-tree` cargo feature

2020-09-30 Thread Raphaël Gomès
Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This feature gates (at compile-time) the use of the newly-added dirstate tree. The motivation for this is that the dirstate tree is currently *very* slow;

Re: [PATCH] hgweb: don't try to wrap mod_wsgi loggers

2020-09-30 Thread Ludovic Chabant
> It might be better to test isinstance(stream, io.RawIOBase). If the stream > is a RawIOBase, write() should return the number of bytes written. I'm not super familiar with Python C/native extension code, but it doesn't look to me like the mod_wsgi.Log type is inheriting from an io base class?

Re: ShareSafePlan

2020-09-30 Thread Pierre-Yves David
On 9/17/20 6:15 PM, Martin von Zweigbergk wrote: On Wed, Sep 16, 2020 at 1:26 AM Pulkit Goyal <7895pul...@gmail.com > wrote: On Wed, Sep 16, 2020 at 4:20 AM Martin von Zweigbergk mailto:martinv...@google.com>> wrote: > > > > On Tue,

[PATCH 4 of 4] merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED

2020-09-30 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1601469441 -19800 # Wed Sep 30 18:07:21 2020 +0530 # Node ID 14952218057615c12b3b1d0a4efdfe4ae716d38e # Parent 588675e205f86d6ae515ec5e9e3b626617c92211 # EXP-Topic merge-newnode-final merge: if CHANGED_DELETED and

[PATCH 3 of 4] tests: fix a typo in `desc()` revset in test-merge-criss-cross.t

2020-09-30 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1601468500 -19800 # Wed Sep 30 17:51:40 2020 +0530 # Node ID 588675e205f86d6ae515ec5e9e3b626617c92211 # Parent 39f0021504cfdd65db3de938cf6a123d18f8 # EXP-Topic merge-newnode-final tests: fix a typo in `desc()` revset

[PATCH 2 of 4] merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED

2020-09-30 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1601461014 -19800 # Wed Sep 30 15:46:54 2020 +0530 # Node ID 39f0021504cfdd65db3de938cf6a123d18f8 # Parent aa8ac5a5deb695a489172726016d3be57ad17cc1 # EXP-Topic merge-newnode-final merge: if DELETED_CHANGED and GET are

[PATCH 1 of 4] tests: add newfilenode test case in test-merge-changedelete.t

2020-09-30 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1601458765 -19800 # Wed Sep 30 15:09:25 2020 +0530 # Node ID aa8ac5a5deb695a489172726016d3be57ad17cc1 # Parent db11f8f39cafb7973f1cc7076c5e6e595440501e # EXP-Topic merge-newnode-final tests: add newfilenode test case in

D9125: changing-files: add a debug command display changed files

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The binary output from sidedata is useful to verify the underlying data do not get corrupted. However having a human readable version is much simpler for

D9130: salvaged: properly deal with salvaged file during copy tracing

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY When salvaged files are encountered, the removal have been reverted and we should keep the rename information from the other side. The conditional was

D9129: salvaged: persist the salvaged set on disk

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY With the new side data storage, this is trivial. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9129 AFFECTED

D9128: changing-files: add clean computation of changed file for merges

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is "a tad more complicated" than the previous cases. See inline documentation for details (have fun). REPOSITORY rHG Mercurial BRANCH default

D9127: changing-files: add clean computation of changed files for linear changesets

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The `files` field is not reliable, so we need to compute things from scratch. We deal with the second simplest case, linear changesets. We diff the current

D9126: changing-files: add clean computation of changed files for roots

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The `files` field is not reliable, so we need to compute things from scratch. We start with the simplest case root changesets. In the beginning they was

D9124: side-data: add a test to check sidedata upgrade

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We want to make sure that sidedata computed at commit time and during upgrade are the same. To do so, we upgrade the repository in `test-copies-chain-merge.t`

D9123: changing-files: split the changing files computation from encoding

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The side data encoding is already in its own function, now we move the changing files computation in it own function, it will receive more updates in the

D9122: salvaged: explicitly skip salvaged file while encoding

2020-09-30 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is a temporary measure to avoid diverging test cases (between commit time sidedata and upgraded sidedata) while we implement salvaged tracking in the

Re: [PATCH] hgdemandimport: exclude more sqlalchemy modules

2020-09-30 Thread Yuya Nishihara
On Tue, 29 Sep 2020 14:38:52 -0700, Ludovic Chabant wrote: > # HG changeset patch > # User Ludovic Chabant > # Date 1601415526 25200 > # Tue Sep 29 14:38:46 2020 -0700 > # Node ID 0b78eb21c79f02980e59ae30c6049075534b > # Parent f8726d166fcaa0d690f6783146172758b2e14deb > hgdemandimport:

Re: [PATCH] hgweb: don't try to wrap mod_wsgi loggers

2020-09-30 Thread Yuya Nishihara
On Tue, 29 Sep 2020 14:32:21 -0700, Ludovic Chabant wrote: > # HG changeset patch > # User Ludovic Chabant > # Date 1601413962 25200 > # Tue Sep 29 14:12:42 2020 -0700 > # Node ID f8726d166fcaa0d690f6783146172758b2e14deb > # Parent 80bf7b1ada15622ea45b8ecc5647404f5acb2905 > hgweb: don't try

Re: add a topic for a whole branch

2020-09-30 Thread Uwe Brauer
>>> "SF" == Steve Fink writes: > On 9/28/20 12:21 AM, Uwe Brauer wrote: >> Right, I think I will end up with an alias >> for >> >> hg topic -r 'descendants(not public() and ancestors(.))' feature > Yeah, I have >   [revsetalias] >   my($1) = not public() and $1 >   topobranch($1) =