D5658: tests: add more tests of uncommit/unamend with copies

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The unamend tests show suboptimal behavior. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5658 AFFECTED FILES

D5661: unamend: fix unamending of renamed rename

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, we were passing in the result of a status call for a different set of commits than what we calculated copies for, which seemed suspicous

D5662: uncommit: set dirstateparents from within _fixdirstate()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's now done in the same way for uncommit and unamend, so we can share the code. REPOSITORY rHG Mercurial REVISION DETAIL

D5660: uncommit: mark old node obsolete after updating dirstate

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The next patch will start doing more things with the context object for the old node and that ran into problems without this change. Regardless of that, I

D5659: unamend: import "copies" module as "copiesmod" to avoid shadowing

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/D5659 AFFECTED FILES hgext/uncommit.py CHANGE DETAILS diff --git a/hgext/uncommit.py

D5657: tests: clean up after each test in test-unamend.t

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/D5657 AFFECTED FILES tests/test-unamend.t CHANGE DETAILS diff --git a/tests/test-unamend.t

D5656: remotefilelog: use %d to format an int

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3d685ddf6b64: remotefilelog: use %d to format an int (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5656?vs=13352=13368

D5655: tests: use bytes for file I/O

This revision was automatically updated to reflect the committed changes. Closed by commit rHGabac73eedd4d: tests: use bytes for file I/O (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5655?vs=13351=13367 REVISION

D5654: tests: make filenames bytes for Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4ef28d7e22ae: tests: make filenames bytes for Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5654?vs=13350=13366

D5652: tests: add setsockopt() output on Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf790a4e78e97: tests: add setsockopt() output on Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5653: tests: use assertEqual()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG724b4606528e: tests: use assertEqual() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5653?vs=13349=13365 REVISION DETAIL

D5651: hgweb: don't use raw string for session vars

This revision was automatically updated to reflect the committed changes. Closed by commit rHG46781c1b5049: hgweb: dont use raw string for session vars (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5650: tests: normalize to bytes in test-install.t

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6e54caaed08d: tests: normalize to bytes in test-install.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5647: httppeer: use %s for formatting

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa9b609fbe39c: httppeer: use %s for formatting (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5647?vs=13343=13359 REVISION

D5648: tests: add size and hash for Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8df3471931cc: tests: add size and hash for Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5648?vs=13344=13360

D5649: config: reject str sections and keys on Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4ad002b2584d: config: reject str sections and keys on Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5645: tests: add b'' to test-missing-capability.t

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd3cc9a8df63a: tests: add b to test-missing-capability.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5645?vs=13341=13357

D5646: tests: add b'' to notcapable

This revision was automatically updated to reflect the committed changes. Closed by commit rHG15fd3069caa6: tests: add b to notcapable (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5646?vs=13342=13358 REVISION

D5643: fuzz: exercise more of the lazymanifest code

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd60bd5c71cbb: fuzz: exercise more of the lazymanifest code (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5642: fuzz: restrict manifest input size

This revision was automatically updated to reflect the committed changes. Closed by commit rHG44cd432aed9f: fuzz: restrict manifest input size (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5642?vs=13338=13355

D5641: fuzz: exercise more of the revlog API

This revision was automatically updated to reflect the committed changes. Closed by commit rHGebe51a2e75be: fuzz: exercise more of the revlog API (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5641?vs=13337=13354

D5640: fuzz: don't allow enormous revlog inputs either

This revision was automatically updated to reflect the committed changes. Closed by commit rHGafc33a5705b9: fuzz: dont allow enormous revlog inputs either (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5641: fuzz: exercise more of the revlog API

martinvonz added inline comments. INLINE COMMENTS > revlog.cc:22 > index, cache = parse_index2(data, inline) > +index.slicechunktodensity(list(range(len(index))), 0.5, 262144) > +for rev in range(len(index)): nit: could have relied on `revlog.__iter__` and used just

D5656: remotefilelog: use %d to format an int

indygreg 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/D5656 AFFECTED FILES hgext/remotefilelog/basepack.py CHANGE DETAILS diff --git

D5655: tests: use bytes for file I/O

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise we get various type mismatches. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5655 AFFECTED FILES

D5652: tests: add setsockopt() output on Python 3

indygreg created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Python 3 appears to call setsockopt() where Python 2 did not. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5652

D5654: tests: make filenames bytes for Python 3

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I also snuck a %s -> %d in there to appease Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5654 AFFECTED FILES

D5653: tests: use assertEqual()

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This avoids a deprecation warning under at least Python 3.7. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5653 AFFECTED FILES

D5650: tests: normalize to bytes in test-install.t

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY directory() was returning str and hgdirectory() was returning bytes. This made the set compare fail. Let's normalize the types on Python 3 so the test passes.

D5651: hgweb: don't use raw string for session vars

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This r'' is leaking into the templating layer and causing an assertion failure. The r'' was added in

D5647: httppeer: use %s for formatting

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This prevents a b'' from appearing in Python 3 output. We keep the single quotes for backwards compatibility. REPOSITORY rHG Mercurial REVISION DETAIL

D5648: tests: add size and hash for Python 3

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY test-archive.t now passes on Python 3.7.1. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5648 AFFECTED FILES

D5649: config: reject str sections and keys on Python 3

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise we could end up with a dict having both the str and bytes versions of a particular config item. This may cause some tests to regress. I haven't

D5646: tests: add b'' to notcapable

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This fixes some exceptions in a few tests. 1. skip-blame just b'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5646

D5645: tests: add b'' to test-missing-capability.t

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test now passes on Python 3. 1. skip-blame just b'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5645 AFFECTED

D5644: largefiles: avoid walking full manifest

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When using treemanifest, diffs between two manifests can often be much cheaper than iterating the full manifests (because common subtrees are skipped).

D5496: revset: add "samebranch" keyword argument to the merge revset

mharbison72 added a comment. In https://phab.mercurial-scm.org/D5496#82908, @angel.ezquerra wrote: > In https://phab.mercurial-scm.org/D5496#82671, @yuja wrote: > > > > > > Do you mean that the flag should only indicate whether you want to hide the same branch merges? I guess

D5643: fuzz: exercise more of the lazymanifest code

durin42 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/D5643 AFFECTED FILES contrib/fuzz/manifest.cc CHANGE DETAILS diff --git a/contrib/fuzz/manifest.cc

D5642: fuzz: restrict manifest input size

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Again, let's keep the fuzzer from getting excited about huge inputs. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5642 AFFECTED

D5641: fuzz: exercise more of the revlog API

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I noticed in the coverage report that we didn't have much coverage in revlog.py. Let's try and get some of the more interesting bits tested by the fuzzer. I ran

D5640: fuzz: don't allow enormous revlog inputs either

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm about to make the fuzzer do more, and without this it was getting enthusiastic about large (and therefore slow) inputs that I don't think buy us much.

mercurial@41301: 4 new changesets (4 on stable)

4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/88a7c211b21e changeset: 41298:88a7c211b21e branch: stable user:Martin von Zweigbergk date:Fri Jan 18 23:32:26 2019 -0800 summary: narrow: fix crash when restoring backup in legacy

Re: D5496: revset: add "samebranch" keyword argument to the merge revset

My suggestion is to have it default to True. That is, by default merge() would include self merges, but it would be possible to hide them by using: merge(selfmerge=False) What do you think? Angel El El mar, 22 ene 2019 a las 14:34, Yuya Nishihara escribió: > > What about “selfmerge”? > >

Re: D5496: revset: add "samebranch" keyword argument to the merge revset

> What about “selfmerge”? IIUC, we need the opposite word to turn `samebranch=False` into `=True` or `=`. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[Bug 6057] New: Server side exceptions after upgrade of evolve from 8.0.3 to 8.3.3

https://bz.mercurial-scm.org/show_bug.cgi?id=6057 Bug ID: 6057 Summary: Server side exceptions after upgrade of evolve from 8.0.3 to 8.3.3 Product: Mercurial Version: unspecified Hardware: PC OS: Mac OS