On Fri, 28 Jun 2019 14:31:04 -0700, Ludovic Chabant wrote:
> For those who missed my latest adventures on IRC, I recently discovered that
> the hgloader (which patches strings and other py3 things at compile time)
> doesn't kick in if you load an extension from a specific file-system location.
>
On Sun, 30 Jun 2019 01:15:41 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1561864987 14400
> # Sat Jun 29 23:23:07 2019 -0400
> # Branch stable
> # Node ID 874e3f6d19ba89c5cd8864beba75d2c3e9d0c25c
> # Parent 044045dce23aaeb3688bcff9bd79d67fa710228f
> boo
4 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/faec09d89435
changeset: 42534:faec09d89435
user:Taapas Agrawal
date:Fri Jun 28 03:15:39 2019 +0530
summary: statecheck: shifted defaults to addunfinished()
https://www.mercurial-scm.org/repo/hg/rev/df5
# HG changeset patch
# User Matt Harbison
# Date 1561864987 14400
# Sat Jun 29 23:23:07 2019 -0400
# Branch stable
# Node ID 874e3f6d19ba89c5cd8864beba75d2c3e9d0c25c
# Parent 044045dce23aaeb3688bcff9bd79d67fa710228f
bookmarks: backout the attempt to fix the delete race
This backs out 044045
yuja added a comment.
Need to update `extensions._builtin` so the shelve "extension" is silently
ignored.
Please send a follow up.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6553/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6553
T
Need to update `extensions._builtin` so the shelve "extension" is silently
ignored.
Please send a follow up.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
yuja added a comment.
> - a/rust/hg-core/src/dirstate/dirs_multiset.rs
>
> +++ b/rust/hg-core/src/dirstate/dirs_multiset.rs
> @@ -118,7 +118,9 @@
>
> entry.remove();
> }
> Entry::Vacant(_) => {
>
> - return Err(DirstateMapError::PathNotFound(path.to_owned()))
>
>
> --- a/rust/hg-core/src/dirstate/dirs_multiset.rs
> +++ b/rust/hg-core/src/dirstate/dirs_multiset.rs
> @@ -118,7 +118,9 @@
> entry.remove();
> }
> Entry::Vacant(_) => {
> -return
> Err(DirstateMapError::PathNotFound(path.t
yuja added a comment.
> +def __contains__(&self, item: PyObject) -> PyResult {
> +Ok(self
> +.dirs_map(py)
> +.borrow()
> +.get(&item.extract::(py)?.data(py).to_owned())
> +.is_some())
`.contains_key(..)` and `.as_ref()`
> +def __contains__(&self, item: PyObject) -> PyResult {
> +Ok(self
> +.dirs_map(py)
> +.borrow()
> +.get(&item.extract::(py)?.data(py).to_owned())
> +.is_some())
`.contains_key(..)` and `.as_ref()` instead of `&...to_owned()`.
I'm surpr
yuja added a comment.
> +impl DirsMultiset {
> +/// Initializes the multiset from a dirstate or a manifest.
> +///
> +/// If `skip_state` is provided, skips dirstate entries with equal
state.
> +pub fn new(iterable: DirsIterable, skip_state: Option) -> Self {
> +
> +impl DirsMultiset {
> +/// Initializes the multiset from a dirstate or a manifest.
> +///
> +/// If `skip_state` is provided, skips dirstate entries with equal state.
> +pub fn new(iterable: DirsIterable, skip_state: Option) -> Self {
> +let mut multiset = DirsMultiset {
pulkit updated this revision to Diff 15711.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6511?vs=15446&id=15711
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6511/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6511
AFFECTED FILES
Closed by commit rHG46087aeb8ae2: shelve: move shelve extension to core
(authored by navaneeth.suresh).
This revision was automatically updated to reflect the committed changes.
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D6553?vs=15701&id=15707#toc
REPOSITORY
rHG Mercurial
CHANG
Closed by commit rHG171a367b7cf1: commit: add --force-close-branch flag to
close a non-head changeset (authored by khanchi97).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6490?vs=
Closed by commit rHGff89280c626d: automv: access status fields by name, not
index (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/D6586?vs=15704&id=15710
CHA
Closed by commit rHG1caadb8e3d2c: automv: use public API for getting copies
(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/D6585?vs=15703&id=15709
CHANGES S
taapas1128 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This adds support of `hg merge --abort` to `hg abort`.
Results are shown as tests.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org
pulkit added a comment.
Review ping for this stack.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6511/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6511
To: pulkit, #hg-reviewers
Cc: mjpieters, mercurial-devel
__
19 matches
Mail list logo
