D8046: copies: fix crash when copy source is not in graft base

martinvonz 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/D8046 AFFECTED FILES mercurial/copies.py tests/test-shelve.t CHANGE DETAILS dif

D8045: tests: add test showing crash when shelving ghosted rename target

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When you `hg rename` a file and then delete the rename target, `hg shelve` will give you a traceback. Note that the shelve succeeds and the shelve is corre

D8044: packaging: include __init__.py in `defaultrc` and `helptext` on Windows

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I didn't notice anything going wrong, but it's probably bad to diverge from the source tree. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL h

D7827: rebase: don't use rebased node as dirstate p2 (BC)

Herald added a subscriber: mjpieters. martinvonz updated this revision to Diff 19705. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7827?vs=19541&id=19705 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7827/new/ REVISION DE

D7829: rebase: remove some now-unused parent arguments

martinvonz updated this revision to Diff 19707. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7829?vs=19347&id=19707 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7829/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7828: rebase: remove some redundant setting of dirstate parents

martinvonz updated this revision to Diff 19706. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7828?vs=19346&id=19706 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7828/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7826: rebase: stop relying on having two parents to resume rebase

martinvonz updated this revision to Diff 19704. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7826?vs=19344&id=19704 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7826/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8043: graphlog: use '@' also for other context in merge conflict

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes these commands' behavior consistent with `hg rebase`, which already shows '@' for the node it's grafting. I'm happy to use a different symbol fo

D8041: revset: add a revset for parents in merge state

martinvonz created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This may be particularly useful soon, when I'm going to change how `hg rebase` sets its parents during conflict resolution. REPOSITORY rHG Mercuria

D8042: tests: add `hg log -G` output when there are merge conflicts

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The next commit will change the behavior for these. I've used slightly different commands in the different tests to match the surrounding style. REPOSITORY

D7907: rebase: always be graft-like, not merge-like, also for merges

martinvonz updated this revision to Diff 19699. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7907?vs=19377&id=19699 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7907/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8040: mergestate: add accessors for local and other nodeid, not just contexts

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The mergestate can contain invalid nodeids. In that case, `mergestate.localctx` or `mergestate.otherctx` will fail. This patch provides a way of accessing the

D7906: rebase: define base in only place in defineparents()

martinvonz updated this revision to Diff 19698. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7906?vs=19342&id=19698 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7906/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8035: copy: add support for marking committed copies

martinvonz updated this revision to Diff 19697. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8035?vs=19671&id=19697 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8035/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8029: uncopy: add new `hg uncopy` command

martinvonz updated this revision to Diff 19692. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8029?vs=19669&id=19692 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8029/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8030: uncopy: add support for unmarking committed copies

martinvonz updated this revision to Diff 19693. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8030?vs=19670&id=19693 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8030/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7999: merge: make hg.merge() take a context instead of a node

martinvonz added a comment. In D7999#118500 , @martinvonz wrote: > In D7999#118496 , @durin42 wrote: > >> Breaks `test-merge2.t` but otherwise seems like a good series. > > Doesn't break it

D8033: copy: move argument validation a little earlier

martinvonz updated this revision to Diff 19696. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8033?vs=19666&id=19696 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8033/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy

martinvonz updated this revision to Diff 19695. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8032?vs=19665&id=19695 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8032/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8027: graft: default `base` argument to common case of `ctx.p1()`

martinvonz updated this revision to Diff 19691. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8027?vs=19660&id=19691 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8027/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8031: copy: rewrite walkpat() to depend less on dirstate

martinvonz updated this revision to Diff 19694. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8031?vs=19664&id=19694 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8031/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8026: graft: let caller pass in overlayworkingctx to merge.graft()

martinvonz updated this revision to Diff 19690. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8026?vs=19659&id=19690 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8026/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz updated this revision to Diff 19689. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7974?vs=19568&id=19689 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. In D7974#118492 , @durin42 wrote: > This one needs rebased. Done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/ REVISION DETAIL https://phab.mercurial-scm.o

D8030: uncopy: add support for unmarking committed copies

martinvonz added a comment. In D8030#118542 , @durin42 wrote: > In D8030#118489 , @martinvonz wrote: > >> In D8030#118480 , @durin42 wrote: >> >>

D8038: setup: don't skip the search for global hg.exe if there is no local instance

Closed by commit rHG35289b5654e0: setup: don't skip the search for global hg.exe if there is no local instance (authored by mharbison72). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". RE

D8037: make: also delete hg.exe when cleaning

Closed by commit rHGdd0226d07866: make: also delete hg.exe when cleaning (authored by mharbison72). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINC

D8030: uncopy: add support for unmarking committed copies

durin42 added a comment. durin42 accepted this revision as: durin42. In D8030#118489 , @martinvonz wrote: > In D8030#118480 , @durin42 wrote: > >> I'm conflicted on rolling the `uncopy && amend`

D8018: cmdutil: change check_incompatible_arguments() *arg to single iterable

Closed by commit rHGd4c1501225c4: cmdutil: change check_incompatible_arguments() *arg to single iterable (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITOR

D7987: copies: print debug information about copies per side/branch

Closed by commit rHG4295c420b321: copies: print debug information about copies per side/branch (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Me

D7990: merge: start using the per-side copy dicts

Closed by commit rHG45f0d1cd562a: merge: start using the per-side copy dicts (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT https://pha

D7989: copies: define a type to return from mergecopies()

Closed by commit rHGece703502f52: copies: define a type to return from mergecopies() (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT htt

D7988: merge: move initialization of copy dicts to one place

Closed by commit rHG4c90001a6084: merge: move initialization of copy dicts to one place (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D7986: copies: make mergecopies() distinguish between copies on each side

Closed by commit rHG6ca9f45b32b0: copies: make mergecopies() distinguish between copies on each side (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY

D8020: rust: remove an unnecessary set of parentheses

Closed by commit rHG3c265cef6edc: rust: remove an unnecessary set of parentheses (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANG

D8002: pathutil: mark parent directories as audited as we go

Closed by commit rHG51c86c6167c1: pathutil: mark parent directories as audited as we go (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D8024: profiling: flush stdout before writing profile to stderr

Closed by commit rHGd6d4170882cd: profiling: flush stdout before writing profile to stderr (authored by spectral). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercuria

D8025: rust: re-format with nightly rustfmt

Closed by commit rHG732098027b34: rust: re-format with nightly rustfmt (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE L

D7999: merge: make hg.merge() take a context instead of a node

martinvonz added a comment. In D7999#118496 , @durin42 wrote: > Breaks `test-merge2.t` but otherwise seems like a good series. Doesn't break it for me (I think I just re-ran that test on all the commits in this series). I guess it's a (sem

D7999: merge: make hg.merge() take a context instead of a node

This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. Breaks `test-merge2.t` but otherwise seems like a good series. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7999/new/ REVISION DETAIL

D7974: merge: when rename was made on both sides, use ancestor as merge base

This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. This one needs rebased. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7974

D8030: uncopy: add support for unmarking committed copies

martinvonz added a comment. In D8030#118480 , @durin42 wrote: > I'm conflicted on rolling the `uncopy && amend` action into the uncopy command like this. Could users not (without this patch) do `hg uncopy foo && hg amend`? I don't think s

D8030: uncopy: add support for unmarking committed copies

durin42 added a comment. I'm conflicted on rolling the `uncopy && amend` action into the uncopy command like this. Could users not (without this patch) do `hg uncopy foo && hg amend`? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8030/new/ REVISION

D8029: uncopy: add new `hg uncopy` command

durin42 added a comment. In D8029#118464 , @martinvonz wrote: > In D8029#118463 , @marmoute wrote: > >> Coudl we use a flag for to `hg copy` for that ? something like `hg copy --forget` > >

D8022: chg: pass copies of some envvars so we can detect py37+ modifications

spectral added a comment. > I'll see how easy that is to implement and send a separate review request once I have it working. D8039 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8022/new/ REVISION DETAIL

D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

spectral created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Python 3.7+ will "coerce" the LC_CTYPE variable in many instances, and this can cause issues with chg being able to start up. D7550

mercurial@44190: 10 new changesets

10 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/3fb39dc2e356 changeset: 44181:3fb39dc2e356 user:Georges Racinet date:Wed Jan 22 16:35:56 2020 +0100 summary: rust-revlog: a trait for the revlog index https://www.mercurial-scm.org/repo/hg/rev/9896a8d

D8022: chg: pass copies of some envvars so we can detect py37+ modifications

spectral added a comment. In D8022#118428 , @yuja wrote: >> This would cause a difference in behavior between hg and chg. I don't know how big of an issue that would be. >> hg: starts up, python coerces LC_CTYPE, hg spawns a non-python s

[Bug 6262] New: divergence on one side after split infects other side

https://bz.mercurial-scm.org/show_bug.cgi?id=6262 Bug ID: 6262 Summary: divergence on one side after split infects other side Product: Mercurial Version: default branch Hardware: PC OS: Linux Status: UNCONFIRMED

D8029: uncopy: add new `hg uncopy` command

martinvonz added a comment. In D8029#118463 , @marmoute wrote: > Coudl we use a flag for to `hg copy` for that ? something like `hg copy --forget` Why would you prefer that? Discoverability? An argument against it is that the command

D8029: uncopy: add new `hg uncopy` command

marmoute added a comment. Coudl we use a flag for to `hg copy` for that ? something like `hg copy --forget` REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8029/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8029 To: martinvonz, #hg-reviewers

D7907: rebase: always be graft-like, not merge-like, also for merges

martinvonz added a comment. Reviewers: This patch is independent of D7827 , so please don't let that patch block this one. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7907/new/ REVISION DETAIL https://phab.m

D3896: copies: handle case when both merge cset are not descendant of merge base

martinvonz added a comment. Pretty sure this was made obsolete by D6255 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D3896/new/ REVISION DETAIL https://phab.mercurial-scm.org/D3896 To: pulkit, #hg-reviewers,

Re: [PATCH 1 of 7 RESEND] rust-cpython: remove useless wrappers from PyLeaked, just move by map()

I had already reviewed these patches last time, so +1 for me, especially now that the whole ref-sharing stuff has been upstreamed in 0.4 thanks to Yuya. On 1/29/20 12:50 AM, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1571711923 -32400 # Tue Oct 22 11:38:43 20

Re: Nlnet funding for transitioning out of SHA-1

I just sent the proposal. I will keep you updated in this thread. Thanks again for helping, Raphaël On 1/28/20 12:46 PM, Raphaël Gomès wrote: Hello again, I think the current proposal is complete, I will re-read the entire thing later tonight to be sure. I plan on submitting tomorrow mornin