D6381: exthelper: add some semi-useful trace logs

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It'd be nice to make the trace functions a little better-named in the output, but I'm not sure how much better we can do without overhead. This at least lets

Re: [PATCH] log: flag topo-sorted set as such

On Wed, May 15, 2019 at 4:34 PM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1557962120 -32400 > # Thu May 16 08:15:20 2019 +0900 > # Node ID 77eb2f52d411836a9f7cadd7b3c7d095945cadcc > # Parent 52c3d16d4c62567e4858ddc8c082443a1f7a2f78 > log: flag

[PATCH] log: flag topo-sorted set as such

# HG changeset patch # User Yuya Nishihara # Date 1557962120 -32400 # Thu May 16 08:15:20 2019 +0900 # Node ID 77eb2f52d411836a9f7cadd7b3c7d095945cadcc # Parent 52c3d16d4c62567e4858ddc8c082443a1f7a2f78 log: flag topo-sorted set as such This isn't required right now, but revs.istopo()

D6380: copies: fix duplicatecopies() with overlay context

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The reasoning for this check is in https://phab.mercurial-scm.org/rHG78d760aa3607f13c8d24b9a6807aa998c4d61f0a (duplicatecopies: do not mark items not in the

D6379: tests: demonstrate crash when rebasing across copy with --collapse

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As reported by timeless. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6379 AFFECTED FILES tests/test-rebase-inmemory.t

mercurial@42286: 18 new changesets

18 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c8d55ff80da1 changeset: 42269:c8d55ff80da1 user:Augie Fackler date:Sat May 04 23:31:42 2019 -0400 summary: sslutil: add support for SSLKEYLOGFILE to wrapsocket

Re: Google Summer of Code '19: Add functionality to store an unresolved merge-state

On Wed, 15 May, 2019, 10:26 PM Pulkit Goyal, <7895pul...@gmail.com> wrote: > > > On Wed, May 15, 2019 at 7:53 PM Martin von Zweigbergk via Mercurial-devel < > mercurial-devel@mercurial-scm.org> wrote: > >> >> >> *From: *Navaneeth Suresh >> *Date: *Wed, May 15, 2019 at 5:13 AM >> *To:

Re: [PATCH 1 of 2] rust: published the three extension crates to crates.io

> On Apr 16, 2019, at 17:12, Georges Racinet > wrote: > > Of course I'm all willing to give ownership on these crates to the > project, but that requires a GitHub Organization (only for > authentication). Reference: (ref: >

D6331: log: add config for making `hg log -G` always topo-sorted

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa39f8aa64cef: log: add config for making `hg log -G` always topo-sorted (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5112: graphmod: remove support for graph lines mixing parent/grandparent styles (BC)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2e97640c598e: graphmod: remove support for graph lines mixing parent/grandparent styles (BC) (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6372: log: remove an unnecessary "and opts.get('rev')" condition

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9bf6455741c4: log: remove an unnecessary and opts.get(rev) condition (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6261: rust-discovery: exposing sampling to python

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe7d3e56fa32e: rust-discovery: exposing sampling to python (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6377: py3: add a r'' to prevent transformer adding b''

This revision was automatically updated to reflect the committed changes. Closed by commit rHGeefe3d669beb: py3: add a r to prevent transformer adding b (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6349: rust-dirstate: add rust-cpython bindings to the new parse/pack functions

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe240bec26626: rust-dirstate: add rust-cpython bindings to the new parse/pack functions (authored by Alphare, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6378: py3: add 5 new passing tests

This revision was automatically updated to reflect the committed changes. Closed by commit rHG181583d30539: py3: add 5 new passing tests (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6378?vs=15113=15118 REVISION

D6348: rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate`

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd1786c1d34fa: rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` (authored by Alphare, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6350: rust-dirstate: call parse/pack bindings from Python

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9c6c0f736e1d: rust-dirstate: call parse/pack bindings from Python (authored by Alphare, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. (forgot to tag as needing changes) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6271 To: Alphare, #hg-reviewers, kevincox, durin42 Cc: durin42,

D6273: rust-filepatterns: call new Rust implementations from Python

durin42 accepted this revision. durin42 added a comment. This revision is now accepted and ready to land. Are there any performance implications of this yet? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6273 To: Alphare, #hg-reviewers, durin42 Cc: durin42,

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

durin42 accepted this revision. durin42 added a comment. This revision is now accepted and ready to land. Meta-comment: we should extract an hgignore crate (with minimal other deps) and publish that, because that'd be a step towards automatic hgignore support in ripgrep (burntsushi has

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

durin42 added a comment. Ugh, but I got conflicts in Cargo.lock - could you rebase and let me know when you're ready? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6271 To: Alphare, #hg-reviewers, kevincox, durin42 Cc: durin42, kevincox, mercurial-devel

D5299: phabricator: fallback reading arcanist config files

durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. I see at least one outstanding comment that points out a typo. I'm generally in favor of this though, so please let us know when it's time to take another look. REPOSITORY

D6377: py3: add a r'' to prevent transformer adding b''

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame because just r'' prefix REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6377 AFFECTED FILES mercurial/commands.py

D6378: py3: add 5 new passing tests

pulkit 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/D6378 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff --git a/contrib/python3-whitelist

D6306: copies: write empty entries in changeset when also writing to filelog

This revision was automatically updated to reflect the committed changes. Closed by commit rHG278dcb24e535: copies: write empty entries in changeset when also writing to filelog (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6365: context: move contents of committablectx.markcommitted() to workingctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfdd4d668ceb5: context: move contents of committablectx.markcommitted() to workingctx (authored by martinvonz, committed by ). CHANGED PRIOR TO COMMIT

D6376: changelog: define changelogrevision.p[12]copies for null revision

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2a7109cc5a28: changelog: define changelogrevision.p[12]copies for null revision (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6374: context: default to using branch from dirstate only in workingctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHG62bb49a1d05d: context: default to using branch from dirstate only in workingctx (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6366: context: let caller pass in branch to committablectx.__init__()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdf2f22befdc8: context: let caller pass in branch to committablectx.__init__() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6363: context: move walk() and match() overrides from committablectx to workingctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4fbfc893e6b9: context: move walk() and match() overrides from committablectx to workingctx (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6362: context: move flags overrides from committablectx to workingctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHG491855ea9d62: context: move flags overrides from committablectx to workingctx (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6364: tests: demonstrate that close-head command updates working copy

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc51b103220c7: tests: demonstrate that close-head command updates working copy (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6219: context: reuse changectx._copies() in all but workingctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa13b30555ffb: context: reuse changectx._copies() in all but workingctx (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6361: overlayworkingctx: don't include added-then-deleted files in memctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe79aeb518aa1: overlayworkingctx: dont include added-then-deleted files in memctx (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6358: overlaycontext: allow calling copydata() on clean context

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcdcebc897529: overlaycontext: allow calling copydata() on clean context (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6360: tests: demonstrate loss of changeset copy metadata on rebase

This revision was automatically updated to reflect the committed changes. Closed by commit rHG83b225fbd788: tests: demonstrate loss of changeset copy metadata on rebase (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6357: tests: demonstrate another failure with in-memory rebase and copies

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5265c7d47213: tests: demonstrate another failure with in-memory rebase and copies (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6365: context: move contents of committablectx.markcommitted() to workingctx

durin42 added inline comments. INLINE COMMENTS > context.py:1228 > """ > - > -with self._repo.dirstate.parentchange(): > -for f in self.modified() + self.added(): > -self._repo.dirstate.normal(f) > -for f in self.removed(): > -

D6375: commit: fix a typo ("form p1" -> "from p1")

martinvonz added a comment. In https://phab.mercurial-scm.org/D6375#92739, @pulkit wrote: > Amending the following diff in flight: > > diff --git a/tests/test-graft.t b/tests/test-graft.t > --- a/tests/test-graft.t > +++ b/tests/test-graft.t > @@ -755,7 +755,7 @@

D6375: commit: fix a typo ("form p1" -> "from p1")

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8988e640a8ac: commit: fix a typo (form p1 - from p1) (authored by martinvonz, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6375?vs=15085=15098#toc REPOSITORY rHG

D6375: commit: fix a typo ("form p1" -> "from p1")

pulkit added a comment. Amending the following diff in flight: diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -755,7 +755,7 @@ Transplants of grafts can find a destina committing files: b

Re: Google Summer of Code '19: Add functionality to store an unresolved merge-state

On Wed, May 15, 2019 at 7:53 PM Martin von Zweigbergk via Mercurial-devel < mercurial-devel@mercurial-scm.org> wrote: > > > *From: *Navaneeth Suresh > *Date: *Wed, May 15, 2019 at 5:13 AM > *To: *Pierre-Yves David > *Cc: *mercurial-devel > > On Tue, May 14, 2019 at 5:51 PM Pierre-Yves David < >>

Re: Google Summer of Code '19: Add functionality to store an unresolved merge-state

*From: *Navaneeth Suresh *Date: *Wed, May 15, 2019 at 5:13 AM *To: *Pierre-Yves David *Cc: *mercurial-devel On Tue, May 14, 2019 at 5:51 PM Pierre-Yves David < > pierre-yves.da...@ens-lyon.org> wrote: > >> >> >> On 5/12/19 8:31 PM, Navaneeth Suresh wrote: >> > Hello everyone, >> > >> > I am

D6356: mdiff: prepare mdiff to be used for run-tests to replace unidiff

pulkit added a comment. In https://phab.mercurial-scm.org/D6356#92695, @sangeet259 wrote: > In https://phab.mercurial-scm.org/D6356#92644, @pulkit wrote: > > > > Why do I need to split the patches into two ? > > > The reason to split what would have been a single patch into two is

D6359: test: change test's diff generation to use mdiff for nicer output

pulkit added a comment. The commit message has diff which confuses `hg import`. You need to indent those diffs. Also, remove the pastebin links as they are not required since we have diffs. > Download this bundle : http://bit.ly/2DuJjsS This link asks me to login. So

D6356: mdiff: prepare mdiff to be used for run-tests to replace unidiff

pulkit added a comment. > Patch 1/2 we don't add that to commit messages. INLINE COMMENTS > mdiff.py:531 > + > +def prepare_mdiff(expected, output): > +"""Prepare the inputs for the mdiff.unidiff function""" may be worth to rename it to `prepare_mdiff_input`. > mdiff.py:540 > +

D6319: automation: initial support for running Linux tests

This revision was automatically updated to reflect the committed changes. Closed by commit rHG65b3ef162b39: automation: initial support for running Linux tests (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6318: automation: move image operations to own functions

This revision was automatically updated to reflect the committed changes. Closed by commit rHG195dcc10b3d7: automation: move image operations to own functions (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6316: automation: do a force push to synchronize

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5c242c427897: automation: do a force push to synchronize (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6317: automation: add --version argument to build-all-windows-packages

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd137a3d5ad41: automation: add --version argument to build-all-windows-packages (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6286: automation: wait for instance profiles and roles

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8dc22a209420: automation: wait for instance profiles and roles (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6315: automation: add check that hg source directory is a repo

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4274b1369b75: automation: add check that hg source directory is a repo (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6288: automation: shore up rebooting behavior

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe570106beda1: automation: shore up rebooting behavior (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6288?vs=14867=15092

D6285: automation: don't create resources when deleting things

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdd6a9723ae2b: automation: dont create resources when deleting things (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6287: automation: wait longer for WinRM connection

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf30184484dd1: automation: wait longer for WinRM connection (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6284: automation: detach policies before deleting role

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfcb97cb91ff8: automation: detach policies before deleting role (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6283: automation: only iterate over our AMIs

This revision was automatically updated to reflect the committed changes. Closed by commit rHG730edbd836d8: automation: only iterate over our AMIs (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6283?vs=14860=15087

D6287: automation: wait longer for WinRM connection

martinvonz accepted this revision. martinvonz added a comment. This revision is now accepted and ready to land. I think I asked on #mercurial a while ago if anyone knew enough about Windows packaging to review this. No one said anything. So I can't see any reason *not* to queue this series.

Re: Google Summer of Code '19: Add functionality to store an unresolved merge-state

On Tue, May 14, 2019 at 5:51 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > > > On 5/12/19 8:31 PM, Navaneeth Suresh wrote: > > Hello everyone, > > > > I am Navaneeth Suresh, one of the GSoC '19 students with Mercurial. I > > wanted to discuss my project on adding functionality

D6356: mdiff: prepare mdiff to be used for run-tests to replace unidiff

sangeet259 added a subscriber: durin42. sangeet259 added a comment. In https://phab.mercurial-scm.org/D6356#92644, @pulkit wrote: > > Why do I need to split the patches into two ? > > The reason to split what would have been a single patch into two is because > > for the next patch

D6376: changelog: define changelogrevision.p[12]copies for null revision

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Looks like I missed these in https://phab.mercurial-scm.org/rHG5382d8f8530b65ef9527596ddf6a0a24b6fd2fc6 (changelog: parse copy metadata if available in