D6387: bookmarks: keep bookmarks in .hg/store if new config set

indygreg added a comment. I still need to look at this commit in detail, but any commit that alters the on-disk or on-network behavior of Mercurial should ideally be accompanied by a docs change to `mercurial/help/internals`. I say //ideally// because some things still aren't documented.

D6396: rust-python3: compatibility fix for integer conversion

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf887a8c1abde: rust-python3: compatibility fix for integer conversion (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6397: rust-python3: compatibility fix for incoming PyLong

yuja added a comment. > @@ -153,7 +153,7 @@ > > _vec?, > ?, > DirstateParents { p1, p2 }, > > - now.value(py) as i32, +now.into_object().extract::(py)?, Minor thing, but I think `as_object()` is preferred since it isn't needed to consume the now value to

Re: D6397: rust-python3: compatibility fix for incoming PyLong

> @@ -153,7 +153,7 @@ > _vec?, > ?, > DirstateParents { p1, p2 }, > -now.value(py) as i32, > +now.into_object().extract::(py)?, Minor thing, but I think `as_object()` is preferred since it isn't needed to consume the now value to extract.

Re: Is anyone using patchwork?

> On May 17, 2019, at 3:14 PM, Antonio Muci wrote: > > Just a curiosity: > > I send my few patches via email (patchbomb ext) because somewhere in the doc > it was mentioned as being the preferred method. > > What is the best way to contribute nowadays? The vast majority of patches come in

Re: Is anyone using patchwork?

On Fri, May 17, 2019 at 12:11 PM Pulkit Goyal <7895pul...@gmail.com> wrote: > > > On Fri, May 17, 2019 at 9:53 PM Martin von Zweigbergk via Mercurial-devel < > mercurial-devel@mercurial-scm.org> wrote: > >> A few users still send patches by email. I use patchworks when I queue >> their patches.

D6407: relnotes: mention removed support for mixed log graph lines

martinvonz updated this revision to Diff 15185. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6407?vs=15181=15185 REVISION DETAIL https://phab.mercurial-scm.org/D6407 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next

D6407: relnotes: mention removed support for mixed log graph lines

spectral accepted this revision. spectral added inline comments. INLINE COMMENTS > next:25 > + `experimental.graphstyle.grandparent = 3.` would use `!` for the > + first three lines of the graph and then `.`. This is now longer > + supported. s/now/no REPOSITORY rHG Mercurial REVISION

Re: Is anyone using patchwork?

Just a curiosity: I send my few patches via email (patchbomb ext) because somewhere in the doc it was mentioned as being the preferred method. What is the best way to contribute nowadays? Antonio On May 17, 2019 20:48, Martin von Zweigbergk via Mercurial-devel wrote: > > A few users still

Re: Is anyone using patchwork?

On Fri, May 17, 2019 at 9:53 PM Martin von Zweigbergk via Mercurial-devel < mercurial-devel@mercurial-scm.org> wrote: > A few users still send patches by email. I use patchworks when I queue > their patches. If you're okay with queuing patches from these (few) users, > I'm okay with shutting down

D6409: convert: don't include file in "files" list if it's added in p2

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If the file is from p2, we should clearly compare the flags to what they were in p2. Also note that manifest.flags('non-existent') unfortunately returns

Re: Is anyone using patchwork?

A few users still send patches by email. I use patchworks when I queue their patches. If you're okay with queuing patches from these (few) users, I'm okay with shutting down patchworks. Or maybe there's another way to get the patches without installing a mail client? On Fri, May 17, 2019 at 11:44

D6408: convert: demonstrate broken {files} list in merge commits with file flags

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When there is a merge in which the flags for a file from p2 is non-empty, `hg convert` will incorrectly include that in the changeset's files list.

Is anyone using patchwork?

I got a monitoring email about it yesterday for some transient issue, and discovered that it was still running but it doesn't look like anyone is seriously using it (it's a mess). Is it worth continuing to maintain, or should I consider tearing it down rather than trying to fix my robots that

[Bug 6141] New: Evolving a merge switches parents

https://bz.mercurial-scm.org/show_bug.cgi?id=6141 Bug ID: 6141 Summary: Evolving a merge switches parents Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug

D6398: rust: sort dependencies entries in Cargo.toml

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0a6209c9fcf5: rust: sort dependencies entries in Cargo.toml (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6407: relnotes: mention removed support for mixed log graph lines

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds release notes for https://phab.mercurial-scm.org/rHG264a2cbb25d045d38b6a1b8884bb1182de620079 (graphmod: remove support for graph lines mixing

D6401: match: use '' instead of '.' for root directory (API)

martinvonz updated this revision to Diff 15179. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6401?vs=15173=15179 REVISION DETAIL https://phab.mercurial-scm.org/D6401 AFFECTED FILES hgext/narrow/narrowcommands.py mercurial/changegroup.py

D6403: util: make util.dirs() and util.finddirs() include root directory (API)

martinvonz updated this revision to Diff 15180. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6403?vs=15175=15180 REVISION DETAIL https://phab.mercurial-scm.org/D6403 AFFECTED FILES mercurial/cext/dirs.c mercurial/cext/parsers.c

D6401: match: use '' instead of '.' for root directory (API)

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think '' is generally a better value for the root directory than '.' is. For example, os.path.join('', 'foo') => 'foo',

D6403: util: make util.dirs() and util.finddirs() include root directory (API)

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This changes the behavior of test-origbackup-conflict.t so it no longer errors out when the backup path points to an existing file. Instead, it replaces the

D6406: match: drop unnecessary adding of '' to set of dirs

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This breaks some tests for "rootfilesin:" in a pattern matcher even more, but that just shows how broken that case is. REPOSITORY rHG Mercurial REVISION

D6405: narrowcommands: drop unnecessary adding of '' for root directory

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's now included by util.dirs(). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6405 AFFECTED

D6404: copies: remove hack for adding root dir to util.dirs object

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6404 AFFECTED FILES mercurial/copies.py CHANGE DETAILS diff --git a/mercurial/copies.py

D6402: dirstate: drop workaround for '.' matching root directory

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The check was added in https://phab.mercurial-scm.org/rHG31abcae33b4f22cea9d0db5fdfa5f3f11370dd06 (dirstate: do not ignore current directory '.' (issue

D6400: dirstate: move special handling of files==['.'] together

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think it makes it a little clearer to have the two conditions for files==['.'] near each other. REPOSITORY rHG Mercurial REVISION DETAIL

D6399: tests: fix test-clonebundles on recent openbsd

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I guess openbsd feels like it needs to stringify this errno in lowercase and omit the "host" part of "hostname. Okay. Reported in a big test diff talking

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

Alphare updated this revision to Diff 15169. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6271?vs=15147=15169 REVISION DETAIL https://phab.mercurial-scm.org/D6271 AFFECTED FILES rust/Cargo.lock rust/hg-core/Cargo.toml

D6272: rust-filepatterns: add `rust-cpython` bindings for `filepatterns`

Alphare updated this revision to Diff 15170. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6272?vs=15148=15170 REVISION DETAIL https://phab.mercurial-scm.org/D6272 AFFECTED FILES rust/hg-cpython/src/ancestors.rs rust/hg-cpython/src/exceptions.rs

D6391: py3: make contrib/testparseutil.py to work on str(unicodes)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5364ba1f796f: py3: make contrib/testparseutil.py to work on str(unicodes) (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6387: bookmarks: keep bookmarks in .hg/store if new config set

This revision was automatically updated to reflect the committed changes. Closed by commit rHG526750cdd02d: bookmarks: keep bookmarks in .hg/store if new config set (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6389: rust-dirstate: create dirstate submodule

kevincox added inline comments. INLINE COMMENTS > mod.rs:6 > +pub p1: &'a [u8], > +pub p2: &'a [u8], > +} If 1 and 2 are the best names why not just make it `pub struct DirstateParetens([&[u8]; 2])`? > mod.rs:7 > +pub p2: &'a [u8], > +} > + It seems odd that this struct is public

D6388: exchange: don't take wlock if bookmarks are stored in .hg/store/

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5d4ec64a6fcb: exchange: dont take wlock if bookmarks are stored in .hg/store/ (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6398: rust: sort dependencies entries in Cargo.toml

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I should probably write a test to enforce this... REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6398 AFFECTED FILES

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

martinvonz added inline comments. INLINE COMMENTS > martinvonz wrote in lib.rs:21 > Dropped from where? Where did the file use to be? It doesn't seem to be added > by this patch here in Phabricator. I get the same compilation error on > `b05c1041de8f`, which is the version before my

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in lib.rs:21 > Dropped from where? Where did the file use to be? It doesn't seem to be added > by this patch here in Phabricator. I get the same compilation error on > `b05c1041de8f`, which is the version before my `histedit`.

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

martinvonz added inline comments. INLINE COMMENTS > Alphare wrote in lib.rs:21 > It looks like the `filepatterns.rs` file was dropped. Maybe during a > `histedit` or other command, but it was definitely there when I sent my > patch, and I can't reproduce this issue locally, the file exists. Do

D6397: rust-python3: compatibility fix for incoming PyLong

gracinet created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On Python3, PyInt is PyLong and it doesn't have the `value()` method. Re upcasting to PythonObj as done here works, but we might prefer

D6396: rust-python3: compatibility fix for integer conversion

gracinet created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On python3, `to_py_object()` on the usize gives us a PyLong, whereas it is the generic `PyObject` already on python2, which fits the

D6395: rust-dirstate: call new "dirs" rust implementation from Python

Alphare created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a simple module attribute replacement, will take precedence over the Python and C implementations. REPOSITORY rHG Mercurial REVISION DETAIL

D6393: rust-dirstate: add "dirs" Rust implementation

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Following the work done in https://phab.mercurial-scm.org/rHGd1786c1d34fa927d4048054ebe62c55fa14f9b1e and working towards the goal of a

D6394: rust-dirstate: add "dirs" rust-cpython binding

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There is an obvious performance and memory issue with those bindings on larger repos as it copies and allocates everything at once, round-trip.

D6389: rust-dirstate: create dirstate submodule

Alphare updated this revision to Diff 15159. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6389?vs=15144=15159 REVISION DETAIL https://phab.mercurial-scm.org/D6389 AFFECTED FILES rust/hg-core/src/dirstate.rs rust/hg-core/src/dirstate/mod.rs

D6271: rust-filepatterns: add a Rust implementation of pattern-related utils

Alphare added inline comments. INLINE COMMENTS > martinvonz wrote in lib.rs:21 > I get the following from `HGWITHRUSTEXT= make local`: > > error[E0583]: file not found for module `filepatterns` > --> hg-core/src/lib.rs:21:5 > | > 21 | mod filepatterns; > | >

Re: D6282: branch: abort if closing branch from a non-branchhead cset

I am +1 with adding the `--force` option to override the abort as it seems the better option than 1) warning message (as it would change the repo anyway) 2) adding a message in commit editor. (hard to notice) I will send a patch for it. Let me know if you have a different opinion on this :-) On

D6392: rust-cpython: build for py3, Windows and MacOSX

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa5fa9140ce4c: rust-cpython: build for py3, Windows and MacOSX (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE