mercurial@43939: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/4ca89cc20d02 changeset: 43937:4ca89cc20d02 user:Rodrigo Damazio Bovendorp date:Wed Dec 18 23:41:36 2019 -0800 summary: status: extract active-merge state for reuse https://www.mercurial-scm.org/repo/hg

D7653: rust-index: add a function to convert PyObject index for hg-core

marmoute updated this revision to Diff 18887. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7653?vs=18699&id=18887 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7653/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7653 AFFECTED FILE

D7658: rust-index: expose a method to retrieve the C index

marmoute updated this revision to Diff 18891. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7658?vs=18704&id=18891 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7658/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7658 AFFECTED FILE

D7656: rust-index: make it possible to clone the struct referencing the C index

marmoute updated this revision to Diff 18889. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7656?vs=18702&id=18889 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7656/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7656 AFFECTED FILE

D7655: rust-index: add a struct wrapping the C index

marmoute updated this revision to Diff 1. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7655?vs=18701&id=1 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7655/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7655 AFFECTED FILE

D7657: rust-index: handle `MixedIndex` in `pyindex_to_graph`

marmoute updated this revision to Diff 18890. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7657?vs=18703&id=18890 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7657/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7657 AFFECTED FILE

D7651: nodetree: simplify a conditionnal in shortesthexnodeidprefix

marmoute updated this revision to Diff 18886. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7651?vs=18806&id=18886 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7651/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7651 AFFECTED FILE

D7695: patch: fix header.__repr__() to not have `b''` prefixes in file names

Closed by commit rHG0671f0a19d93: patch: fix header.__repr__() to not have `b''` prefixes in file names (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7695

D7699: cmdutil: allow native string as input to check_at_most_one_arg()

Closed by commit rHG6c8108274dc5: cmdutil: allow native string as input to check_at_most_one_arg() (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7699?vs=18

D7698: cmdutil: return underscore-separate name from check_at_most_one_arg()

Closed by commit rHGdfac25883dbf: cmdutil: return underscore-separate name from check_at_most_one_arg() (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7698?

D7668: status: make unresolved files always be in the morestatus structured output

Closed by commit rHG07ebb567e8bb: status: make unresolved files always be in the morestatus structured output (authored by rdamazio). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7

D7704: status: make morestatus call out unresolved conflicts after update

Closed by commit rHG489fdf27769c: status: make morestatus call out unresolved conflicts after update (authored by rdamazio). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7704?vs=18

D7667: status: extract active-merge state for reuse

Closed by commit rHG4ca89cc20d02: status: extract active-merge state for reuse (authored by rdamazio). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D7667?vs=18875&id=18879#toc REPOSITORY rHG Mercurial CHANGE

D7697: rebase: restore i18n of a hint message

Closed by commit rHGd77230743968: rebase: restore i18n of a hint message (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7697?vs=18864&id=18882 CHANGES SINC

D7667: status: extract active-merge state for reuse

pulkit added a comment. Amended the following in flight to make black happy: diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -879,11 +879,8 @@ def readmorestatus(repo): if activemerge: unr

D7699: cmdutil: allow native string as input to check_at_most_one_arg()

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. I hope one day we have a clear understanding of what is bytes and what is not in core. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.o

D7705: phases: make the working directory consistently a draft

marmoute added a comment. The working copy is not necessarly draft phase. For example, it will be secret is the working copy parent is secret. One can also control it using the `phases.new-commit` config. The `mercurial.phases.newcommitphase(ui)` function can help you there. REPOSITORY

Re: [PATCH STABLE v2] py3: force bytestr conversion of "reason" in scmutil.callcatch()

On Wed, 18 Dec 2019 20:19:43 +0100, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1576696641 -3600 > # Wed Dec 18 20:17:21 2019 +0100 > # Branch stable > # Node ID 33249635134f8c3fdcd79b1a0da15880a2f57650 > # Parent 743c69b393326ab82383638c1fed669794ac0ec1 > py3

Re: Heptapod as a Bitbucket replacement - inviting Mercurial FOSS projects

> A key part is that Heptapod is now inviting all generic FOSS projects > related to Mercurial to come over from Bitbucket to our own Heptapod > server. I filled my request¹ but I doesn't seem to have rights to attach label to the issue. Or I don't know how to do it. Thank you for your offer. BTW

D7705: phases: make the working directory consistently a draft

rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this change, `hg log -r 'wdir() and public()'` would return it. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.o

D7668: status: make unresolved files always be in the morestatus structured output

rdamazio marked an inline comment as done. rdamazio updated this revision to Diff 18877. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7668?vs=18846&id=18877 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7668/new/ REVISION

D7704: status: make morestatus call out unresolved conflicts after update

rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7704 AFFECTED FILES mercurial/cmdutil.py tests/test-update-branches.t CHANGE DETA

D7667: status: extract active-merge state for reuse

rdamazio retitled this revision from "status: make morestatus call out unresolved conflicts after update" to "status: extract active-merge state for reuse". rdamazio updated this revision to Diff 18875. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7667?