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

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Same reasoning as previous commits: this function updates the dirstate. By not updating the dirstate here, we also fix the close-head test. REPOSITORY rHG

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

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY committablectx.__init__() currently looks up the branch from the dirstate unless it's passed in the extras. memctx.__init__() has a branch argument, but since

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

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Same reasoning as previous commit: these functions update the dirstate. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6363 AFFEC

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

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The help text for the command says "...it doesn't change the working directory", so I don't think this is intentional. REPOSITORY rHG Mercurial REVISION DET

D6362: context: move flags overrides from committablectx to workingctx

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY These read from the dirstate, so they shouldn't be used in other subclasses. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6362

[Bug 6136] New: hg pull hg-committed seems to get stuck in an infinite loop

https://bz.mercurial-scm.org/show_bug.cgi?id=6136 Bug ID: 6136 Summary: hg pull hg-committed seems to get stuck in an infinite loop Product: Mercurial Version: default branch Hardware: PC OS: Windows

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

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/D6360 AFFECTED FILES tests/test-copies-in-changeset.t CHANGE DETAILS diff --git a/tests/test-copies

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

martinvonz added a comment. This is quite rewritten and now ready for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6219 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial-devel mailing li

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

martinvonz updated this revision to Diff 15055. martinvonz retitled this revision from "memctx: make p[12]copies() correct" to "context: reuse changectx._copies() in all but workingctx". martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https:

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

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If a file (such as a .orig file) is temporarily added to the overlayworkingctx and then deleted, it's still going to be in the _cache dict. In tomemctx(), we

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

sangeet259 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is patch (2/2), hence must be there in the repo after 1/2, which is at https://phab.mercurial-scm.org/D6356 The current diff being used by tests upon f

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

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We should just report no copy if the context is clean. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6358 AFFECTED FILES mercu

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

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a similar to https://phab.mercurial-scm.org/rHGdd1ab72be9832584993955dfeb98d46c79602935 (test: demonstrate crash with in-memory rebase and copies, 201

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

sangeet259 added a comment. > Oh, nice! I sometimes use run-tests.py -i and just accept an unreadable diff because I know that hg diff might make it easier to read. I had not understood why :) Glad to know you will be helped :) Added some description to the commit message! REPOSITO

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

martinvonz added a comment. In https://phab.mercurial-scm.org/D6356#92453, @sangeet259 wrote: > In https://phab.mercurial-scm.org/D6356#92451, @martinvonz wrote: > > > > The future changes to run-tests.py will enable one to use mdiif > > > to diff rather than unidiff whenever the me

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

sangeet259 added a comment. In https://phab.mercurial-scm.org/D6356#92451, @martinvonz wrote: > > The future changes to run-tests.py will enable one to use mdiif > > to diff rather than unidiff whenever the mercurial is installed in the system. > > Perhaps a naive question, but why

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

martinvonz added a comment. > The future changes to run-tests.py will enable one to use mdiif > to diff rather than unidiff whenever the mercurial is installed in the system. Perhaps a naive question, but why is that desirable? How will I (as someone running tests) notice? REPOSITORY

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

sangeet259 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Patch 1/2 This patch adds some functions to mdiff.py that will be called from run-tests.py which will be added in the second part of this patch series.

[Bug 6135] New: TypeError: old sha1 for refs/heads/hg is not a bytestring None

https://bz.mercurial-scm.org/show_bug.cgi?id=6135 Bug ID: 6135 Summary: TypeError: old sha1 for refs/heads/hg is not a bytestring None Product: Mercurial Version: 4.7.1 Hardware: PC OS: Windows S

[PATCH] histedit: make actions toggleables

# HG changeset patch # User f...@google.com # Date 1557508115 25200 # Fri May 10 10:08:35 2019 -0700 # Node ID 23bc04dc2d149829133db571f6a922e95843c9f9 # Parent 458dc948aff9f1217718b7679f890fea510d54f7 histedit: make actions toggleables. If the same action is applied twice, revert to pick.

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

martinvonz added a comment. This makes sense to me. Do you still want this queued? INLINE COMMENTS > test-glog.t:3147-3148 > > -All but the first 3 lines: > +(This formerly tested "All but the first 3 lines", but is now showing that > it's > +still not treated any differently): > I'm

D6355: shelve: add `update --shelve` if shelve extension is loaded

martinvonz added inline comments. INLINE COMMENTS > test-shelve.t:1177 > + $ hg update '.^' --shelve > + nothing changed > + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved It's not clear that this is related to `--shelve`. Can we instead first check if the working is di

D6343: sslutil: add support for SSLKEYLOGFILE to wrapsocket

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc8d55ff80da1: sslutil: add support for SSLKEYLOGFILE to wrapsocket (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6343?vs=15

D6347: phabricator: add custom vcr matcher to match request bodies

Kwan added inline comments. INLINE COMMENTS > martinvonz wrote in phabricator.py:135-144 > Can this be written simply `return set(r1params) == set(r2params)`? Ha! Yes, of course it can. Sorry, I keep forgetting one can do that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercur

D6081: i18n-ja: correct translation of "committing"

martinvonz added a comment. Matt, could you abandon these two reviews? That would clean up our dashboard a little (there are lots of obsolete reviews there, so not a big deal). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6081 To: matvore, #hg-reviewers Cc: m

D6347: phabricator: add custom vcr matcher to match request bodies

martinvonz added inline comments. INLINE COMMENTS > phabricator.py:135-144 > +if len(r1params) is not len(r2params): > +return False > +for r1param in r1params: > +if r1param in r2params: > +r2params.remove(r1param) > +else: > +

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

kevincox requested changes to this revision. kevincox added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > dirstate.rs:16 > +pub type DirstateVec = Vec<(Vec, DirstateTuple)>; > +pub type CopyMap<'a> = Vec<(&'a [u8], &'a [u8])>; > + You have a lot of tuples here

D6345: rust-discovery: optionally don't randomize at all, for tests

kevincox accepted this revision. kevincox added a comment. The code and rust style looks fine. I'm not sure that taking the N smallest elements is the best approach for testing though. I can imagine it hiding some issues with larger values. REPOSITORY rHG Mercurial REVISION DETAIL https

Re: Google Summer of Code 2019.

Thank you, Sushil. Really excited to work with the hg community and make some good contributions. (^_^) ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel