D7849: core: migrate uses of hashlib.sha1 to hashutil.sha1

Closed by commit rHG4ebd162f4d8c: core: migrate uses of hashlib.sha1 to hashutil.sha1 (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7849?vs=19190&id=19200 CH

D7851: hgext: replace references to hashlib.sha1 with hashutil.sha1

Closed by commit rHG006e7821704a: hgext: replace references to hashlib.sha1 with hashutil.sha1 (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7851?vs=19192&id=

D7852: scmutil: fix an unbound variable with progressbar debug enabled

Closed by commit rHG733aefddc4aa: scmutil: fix an unbound variable with progressbar debug enabled (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/D7852?vs=19

D7815: sha1dc: initial implementation of Python extension

Closed by commit rHGbde1cd4c99d9: sha1dc: initial implementation of Python extension (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7815?vs=19188&id=19198 CHA

D7850: sslutil: migrate to hashutil.sha1 instead of hashlib.sha1

Closed by commit rHGfde05ece875c: sslutil: migrate to hashutil.sha1 instead of hashlib.sha1 (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7850?vs=19191&id=192

D7848: hashutil: new package for hashing-related features

Closed by commit rHG0803f803ba03: hashutil: new package for hashing-related features (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7848?vs=19189&id=19199 CHA

D7851: hgext: replace references to hashlib.sha1 with hashutil.sha1

This revision is now accepted and ready to land. indygreg added a comment. indygreg accepted this revision. Would you mind a follow-up to teach `check-code` to ban `hashlib.sha` so usage doesn't creep back in? REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://p

D7850: sslutil: migrate to hashutil.sha1 instead of hashlib.sha1

This revision is now accepted and ready to land. indygreg added a comment. indygreg accepted this revision. Yeah, the new SHA-1 routine probably doesn't matter in this context. And we should probably drop support for SHA-1 certificate fingerprint verification. But consistency in using our SHA

D7848: hashutil: new package for hashing-related features

This revision is now accepted and ready to land. indygreg added a comment. indygreg accepted this revision. I'm not keen on a new module just for 6 lines. But whatever. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7848/new/ REVISION

D7855: fsmonitor: properly handle str ex.msg

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY ex.msg is always a str, since pywatchman uses str for exception messages. This commit removes a b'' from a string compare to avoid types mismatch and adds a

D7854: phases: make phasecache._phasesets immutable

rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, some code paths would mutate the cache itself, which could give weird results if multiple revsets got evaluated through that path. REPOSITORY rHG

D7853: phases: reduce code duplication in phasecache.getrevset

rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a functional NOP other than reducing some of the duplication in that method. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab

D7705: phases: make the working directory consistently a draft

rdamazio added a comment. x REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7705/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7705 To: rdamazio, #hg-reviewers, marmoute Cc: yuja, marmoute, mercurial-devel _

D7705: phases: make the working directory consistently a draft

rdamazio added a comment. In D7705#114943 , @yuja wrote: >> @@ -252,25 +254,44 @@ >> >> revs = set.union(*[self._phasesets[p] for p in phases]) >> if repo.changelog.filteredrevs: >> revs = revs - repo.changelog.filteredrevs

D7852: scmutil: fix an unbound variable with progressbar debug enabled

mharbison72 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/D7852 AFFECTED FILES mercurial/scmutil.py CHANGE DETAILS diff --git a/mercurial/scmutil.py b/mercu

D7849: core: migrate uses of hashlib.sha1 to hashutil.sha1

durin42 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/D7849 AFFECTED FILES mercurial/chgserver.py mercurial/exchange.py mercurial/hg.py

D7851: hgext: replace references to hashlib.sha1 with hashutil.sha1

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When in a non-pure build of Mercurial, this will provide protections against SHA1 collision attacks. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D7850: sslutil: migrate to hashutil.sha1 instead of hashlib.sha1

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a straight-line replacement like the others, but I split it out since it's used in a network context and I'm not sure this is appropriate (we should prob

D7815: sha1dc: initial implementation of Python extension

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

D7848: hashutil: new package for hashing-related features

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Right now this just tries to use our sha1dc and if it's missing (eg a --pure build) we fall back to hashlib. I imagine in the future we'll want some other things

D7815: sha1dc: initial implementation of Python extension

durin42 added a comment. durin42 marked 3 inline comments as done. Good call on tests, I had the return type of `hexdigest()` wrong. Please do let me know if you think of any missing cases here. INLINE COMMENTS > indygreg wrote in cext.c:68 > I'm not super keen on overloading `OverflowError`

D7812: examples: specify rustfmt nightly using a $() construct

gracinet added a comment. @pulkit yes, after toolchain reinstall, this rustup which works for me REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7812/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7812 To: durin42, #hg-reviewers Cc: pulkit, qua

mercurial@44056: 9 new changesets (1 on stable)

9 new changesets (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/61881b170140 changeset: 44048:61881b170140 branch: stable parent: 44033:4e0a6d157910 user:timeless date:Thu Jan 09 14:19:20 2020 -0500 summary: fix: fix grammar/typos in hg help

warning/backup when using hg up -C

Hi I just, by mistake, run hg up -C and deleted important changes. Could you either add a warning message or add a backup feature like shelve? Thanks Uwe Brauer ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.merc

D7824: tests: add test of rebase with conflict in merge commit

martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in test-rebase-conflicts.t:460 > I think it will be weird to have current parents as 7 and 8. Rebase copies > commit, so if there is a merge commit, it copies it instead of recreating > one. Also if we have 7 and 8 as parents, we

D7840: nodemap: add a (python) index class for persistent nodemap testing

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

D7835: nodemap: write nodemap data on disk

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

D7630: absorb: make the absorbed changeset be automatically "evolved"

pulkit added a comment. >>>! In D7630#115300 , @pulkit wrote: >> This results in an empty commit which is not similar to what rebase or evolve will generally result in after `D7631` unless `ui.allowemptycommit=True` is set. I think good behav

D7630: absorb: make the absorbed changeset be automatically "evolved"

martinvonz added a comment. In D7630#112603 , @rdamazio wrote: > Sorry for the upload mess (though it's arguably a `phabsend` bug :) ). Tried uploading the "right" way now. I reported that as https://bz.mercurial-scm.org/show_bug.cgi?id=6

D7631: absorb: allowing committed changes to be absorbed into their ancestors

martinvonz added a comment. In D7631#112604 , @rdamazio wrote: > In D7631#112414 , @quark wrote: > >> `--rev` seems ambiguous since there might be different kinds of revisions to specify - targe

D7574: hg-core: add utils::path to project

This revision now requires changes to proceed. pulkit added a comment. pulkit requested changes to this revision. This one fails to apply with conflicts in `Cargo.lock`. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7574/new/ REVISION DETAIL https:/

D7575: hg-core: vendor Facebook's configparser crate

pulkit added a comment. The C bindings need to be dropped in this patch. Queued the previous patches, many thanks for importing things! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7575/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7575 To

D7812: examples: specify rustfmt nightly using a $() construct

pulkit added a comment. @gracinet Does this looks good to you? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7812/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7812 To: durin42, #hg-reviewers Cc: pulkit, quark, gracinet, mercurial-devel

D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit added inline comments. INLINE COMMENTS > rdamazio wrote in absorb.py:993 > Done. Notice that *technically* the user could do such an absorb while in the > middle of a merge, but it sounds like a bad idea and inviting troubles, so > I'm letting it also disallow that case. I'll be surprise

D7630: absorb: make the absorbed changeset be automatically "evolved"

pulkit added a comment. This results in an empty commit which is not similar to what rebase or evolve will generally result in after `D7631` unless `ui.allowemptycommit=True` is set. I think good behavior is to obsolete the absorbed changeset in favour of either it's parent or one of the rev

D7840: nodemap: add a (python) index class for persistent nodemap testing

marmoute created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Using the persistent nodemap require a compeling performance boost and an existing implementation. The benefit of the persisten

D7845: nodemap: add basic checking of the on disk nodemap content

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The simplest check it so verify we have all the revision we needs, and nothing more. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org

D7847: nodemap: provide the on disk data to the index who support it

marmoute created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Time to start defining the API and prepare the rust index support. We provide a method to do so. We use a distinct method inste

D7835: nodemap: write nodemap data on disk

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

D7846: nodemap: all check that revision and nodes match in the nodemap

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY More check is always useful. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7846 AFFECTED FILES mercurial/revlogutils/nodemap.py

D7844: nodemap: code to parse a serialized nodemap

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We now have code to read back what we serialized. This will be put to use in later changesets. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercuri

D7843: nodemap: move the iteratio inside the Block object

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Having the iteration inside the serialization function does not help readability. Now that we have a `Block` object, let us move that code there. REPOSITORY rH

D7834: nodemap: have some python code serializing a nodemap

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

D7842: nodemap: use an explicit "Block" object in the reference implementation

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will help us to introduce some test around the data currently written on disk. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/

D7841: nodemap: add a optional `nodemap_add_full` method on indexes

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This method can be used to obtains serialized data for a full nodemap. The end goal is for some index implementation to managed the nodemap serialization them

D7836: nodemap: add a function to read the data from disk

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

D7839: nodemap: deleted older raw data file when creating a new ones

marmoute edited the summary of this revision. marmoute updated this revision to Diff 19176. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7839?vs=19159&id=19176 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7839/new/ REVISION DETAIL https

D7838: nodemap: use an intermediate "docket" file to carry small metadata

marmoute edited the summary of this revision. marmoute updated this revision to Diff 19175. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7838?vs=19158&id=19175 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7838/new/ REVISION DETAIL https

D7837: nodemap: only use persistent nodemap for non-inlined revlog

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

D7830: revlog: reorder a conditionnal about revlogio

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

D7832: transaction: add a `hasfinalize` method

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

D7831: changelog: fix the diverted opener to accept more kwargs

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

D7830: revlog: reorder a conditionnal about revlogio

Closed by commit rHG612225e994ff: revlog: reorder a conditionnal about revlogio (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7830?vs=19150&id=19165 CHANGES

D7832: transaction: add a `hasfinalize` method

Closed by commit rHG8e09551206f5: transaction: add a `hasfinalize` method (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7832?vs=19152&id=19167 CHANGES SINCE

D7823: workingctx: move setparents() logic from localrepo to mirror overlayworkingctx

Closed by commit rHGb74270da5eee: workingctx: move setparents() logic from localrepo to mirror overlayworkingctx (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.o

D7831: changelog: fix the diverted opener to accept more kwargs

Closed by commit rHG7f67f53492f7: changelog: fix the diverted opener to accept more kwargs (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7831?vs=19151&id=191

D7825: rebase: delete seemingly unnecessary needupdate()

Closed by commit rHG894c91c2e363: rebase: delete seemingly unnecessary needupdate() (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/D7825?vs=19145&id=19164 C

D7822: overlayworkginctx: implement a setparents() to mirror dirstate.setparents()

Closed by commit rHG436d106de670: overlayworkginctx: implement a setparents() to mirror dirstate.setparents() (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/

D7821: overlayworkingctx: default branch to base context's branch

Closed by commit rHG2ecbc4ec87d8: overlayworkingctx: default branch to base context's branch (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/D7821?vs=19141&id

D7820: grep: speed up `hg grep --all-files some/path` by using ctx.matches(match)

Closed by commit rHG6cfaebb625d3: grep: speed up `hg grep --all-files some/path` by using ctx.matches(match) (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/D

D7824: tests: add test of rebase with conflict in merge commit

pulkit added inline comments. INLINE COMMENTS > test-rebase-conflicts.t:460 > +It's weird that the current parents are not 7 and 8 since that's what we're > +merging > + $ hg tglog I think it will be weird to have current parents as 7 and 8. Rebase copies commit, so if there is a merge commit,

Re: 5.4sprint location/date finalization

On Mon, Jan 6, 2020 at 10:18 PM Augie Fackler wrote: > Howdy folks, > > https://www.mercurial-scm.org/wiki/5.4Sprint has three choices of > location: Finland, Brussels, and Paris. Given the tentative availability of > Paris, and the relative proximity of Brussels and Paris means Brussels is > pro