D4292: pure: fix pure-Python revlog to support [0] lookups on empty log

2018-08-15 Thread durin42 (Augie Fackler)
durin42 added a comment. In https://phab.mercurial-scm.org/D4292#66116, @martinvonz wrote: > I think the correct behavior should be what it is before this patch. I > think that matches the native code I think we should fix the callers > instead. There might be some callers in pure

Re: D4292: pure: fix pure-Python revlog to support [0] lookups on empty log

2018-08-15 Thread Martin von Zweigbergk via Mercurial-devel
I think the correct behavior should be what it is before this patch. I think that matches the native code I think we should fix the callers instead. There might be some callers in pure code that I forgot to update. Can you check where it's called from with [0] on an empty log? Otherwise I can

D4296: tests: un-glob patchbomb test lines that were only globbing a hostname

2018-08-15 Thread durin42 (Augie Fackler)
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/D4296 AFFECTED FILES tests/test-patchbomb-bookmark.t tests/test-patchbomb.t CHANGE DETAILS diff

D4295: tests: force a stable hostname in patchbomb tests

2018-08-15 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY No visible output changes in this commit because everything is globbed away, but on Python 3 the stable hostname will mean that the headers don't trigger

D4294: patchbomb: allow using HGHOSTNAME to force a hostname

2018-08-15 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'll update run-tests.py to set this globally to stabilize some tests. The variable name is intentionally generic because I suspect we should generalize this to

D4293: patchbomb: extract function for generating message-id

2018-08-15 Thread durin42 (Augie Fackler)
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/D4293 AFFECTED FILES hgext/patchbomb.py CHANGE DETAILS diff --git a/hgext/patchbomb.py

D4286: tests: add conditional output when simplestore extensions is loaded

2018-08-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe8532d00b729: tests: add conditional output when simplestore extensions is loaded (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4280: perf: time loading branchmap caches

2018-08-15 Thread mjpieters (Martijn Pieters)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf16c3efe35e3: perf: time loading branchmap caches (authored by mjpieters, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4280?vs=10352=10373

D4281: branchmap: load branchmap as an iterable

2018-08-15 Thread mjpieters (Martijn Pieters)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9a800691f075: branchmap: load branchmap as an iterable (authored by mjpieters, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4281?vs=10353=10374

D4285: tests: conditionalize extension tests for extra extensions

2018-08-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf2e645dc6a67: tests: conditionalize extension tests for extra extensions (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D4241: pure: don't allow index[len(index)] to mean nullid

2018-08-15 Thread durin42 (Augie Fackler)
durin42 abandoned this revision. durin42 added a comment. My identical patch was landed from https://phab.mercurial-scm.org/D4183. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4241 To: durin42, #hg-reviewers, martinvonz Cc: mercurial-devel

D4292: pure: fix pure-Python revlog to support [0] lookups on empty log

2018-08-15 Thread durin42 (Augie Fackler)
durin42 added a subscriber: martinvonz. durin42 added a comment. FYI @martinvonz REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4292 To: durin42, #hg-reviewers Cc: martinvonz, mercurial-devel ___ Mercurial-devel

D4292: pure: fix pure-Python revlog to support [0] lookups on empty log

2018-08-15 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This fixes many many test failures in pure mode, but it appears to be a material behavior difference from the cext version. I tried adding this test: def

mercurial@39111: 90 new changesets

2018-08-15 Thread Mercurial Commits
90 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b95538a21613 changeset: 39022:b95538a21613 parent: 39020:0b5f534df82a user:Augie Fackler date:Mon Jul 16 14:14:27 2018 -0400 summary: patchbomb: work around email module really wanting to write

D4291: contrib: import the relnotes script from the release-tools repo

2018-08-15 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I figure this makes more sense to keep in the main repo, as it's a guide of sorts on how to use the releasenotes extension in the presence of commits

D4289: tests: update test-check-py3-compat.t output in the py3exe branch

2018-08-15 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This hasn't been maintained in a while, it looks like. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4289 AFFECTED FILES

D4290: hghave: move from requiring the PYTHON3 env var to looking for `python3`

2018-08-15 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We're starting to write new utility scripts in Python 3, and I think it's reasonable to expect `python3` to be something we should use if it's

D4288: tests: remove test-py3-commands.t

2018-08-15 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was a smoke test for early in the Python 3 porting effort, before anything actually worked. Now that we've got over half the testsuite passing,

D4287: overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)

2018-08-15 Thread phillco (Phil Cohen)
phillco accepted this revision. phillco added a comment. lgtm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4287 To: spectral, phillco, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D4287: overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)

2018-08-15 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 10365. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4287?vs=10364=10365 REVISION DETAIL https://phab.mercurial-scm.org/D4287 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS

D4287: overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)

2018-08-15 Thread spectral (Kyle Lippincott)
spectral created this revision. spectral added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If there was a metadata-only mutation, such as +x or -x on a file, we would create a cache entry with None for data, and this

D4286: tests: add conditional output when simplestore extensions is loaded

2018-08-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This drops the number of failures with this extension to 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4286 AFFECTED FILES

D4285: tests: conditionalize extension tests for extra extensions

2018-08-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If extra extensions are loaded (e.g. via --extra-config-opt), the tests conditionalized in this commit fail in ways that are dependent on the extensions that

D4283: webcommands: fix `@webcommand` decorator

2018-08-15 Thread indygreg (Gregory Szorc)
indygreg added a comment. This seems like a strict improvement. But the proper way to register web commands from extensions would be to go through the `registrar` API and have the extension loader look for a well-named symbol in each extension module that is loaded and hgweb would

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

2018-08-15 Thread spectral (Kyle Lippincott)
spectral added a comment. Any updates on this? I'm poking at updating this function in core, and not too excited to have to also modify the copy in evolve that seems to have spawned :/ REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3896 To: pulkit,

D4284: copies: correctly skip directories that have already been considered

2018-08-15 Thread spectral (Kyle Lippincott)
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, `if dsrc in invalid` would never be true, since we added `dsrc + "/"` to invalid, not `dsrc` itself. Since it's much more common for individual

mercurial@39021: new changeset (1 on stable)

2018-08-15 Thread Mercurial Commits
New changeset (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/7e023ce26c7f changeset: 39021:7e023ce26c7f branch: stable tag: tip parent: 38931:5caee9f923ae user:Matt Harbison date:Tue Aug 14 14:00:35 2018 -0400 summary: convert: don't

Re: [PATCH 3 of 3] commit: try hard to reuse p1 manifest if nothing changed

2018-08-15 Thread Augie Fackler
> On Aug 14, 2018, at 8:47 PM, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1530970839 -32400 > # Sat Jul 07 22:40:39 2018 +0900 > # Node ID ed903661203305cb8c0d44f420aa3ace06c4f46e > # Parent 242bf65ae76ad839d89dbae348eec5f28990b663 > commit: try hard

D4283: webcommands: fix `@webcommand` decorator

2018-08-15 Thread sheehan (Connor Sheehan)
sheehan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This commit fixes the `@webcommand` decorator used to define webcommands. Although webcommands are currently using this decorator, it does not behave as

[PATCH 5 of 6] filemerge: add config knob to check capabilities of internal merge tools

2018-08-15 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534339490 -32400 # Wed Aug 15 22:24:50 2018 +0900 # Node ID 813cc2cf9c0cae1928584518afb4558c443b77b7 # Parent 48c9d0cb2afe7692324e1fa7872bc577db6496af # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

[PATCH 6 of 6] filemerge: show actual capabilities of internal merge tools

2018-08-15 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534252828 -32400 # Tue Aug 14 22:20:28 2018 +0900 # Node ID f65c2eed9d606cbe7c5c76a8787f2db710abc445 # Parent 813cc2cf9c0cae1928584518afb4558c443b77b7 # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

[PATCH 3 of 6] filemerge: add the function to examine a capability of a internal tool

2018-08-15 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534245351 -32400 # Tue Aug 14 20:15:51 2018 +0900 # Node ID 1d16378efeb91e435d520b081a7a34b78d7fa7e2 # Parent ca968875ed9869cbfa464af05c2a217219f298ed # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

[PATCH 1 of 6] help: describe more detail about capabilities while deciding merge tool

2018-08-15 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534244736 -32400 # Tue Aug 14 20:05:36 2018 +0900 # Node ID cffd12b0d927a859e99c8b5e3f451512c85999d1 # Parent 18cbe2d872d3184c4504094a6fd070ca96f48181 # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

[PATCH 2 of 6] filemerge: set actual capabilities of internal merge tools

2018-08-15 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1534244907 -32400 # Tue Aug 14 20:08:27 2018 +0900 # Node ID ca968875ed9869cbfa464af05c2a217219f298ed # Parent cffd12b0d927a859e99c8b5e3f451512c85999d1 # Available At https://bitbucket.org/foozy/mercurial-wip # hg pull

Re: [PATCH 1 of 5] rebase: do not set internal dryrun flag by --confirm

2018-08-15 Thread Pulkit Goyal
On Wed, Aug 15, 2018 at 5:06 AM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1534296730 -32400 > # Wed Aug 15 10:32:10 2018 +0900 > # Node ID c1a1fb389b4dda254ae5d7af56a9b11de0c5e288 > # Parent 33f5cffe725fc649d4cfffb02f4370ce9b348d95 > rebase: do not set

D4053: [RFC]hgweb: garbage collect on every request in hgweb_mod too

2018-08-15 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D4053#62855, @av6 wrote: > Are you sure you're not just using hgwebdir_mod? hgweb_mod is for cases when you don't use --web-conf flag, at least that seems to be the logic that `hgweb.createapp()` uses to pick one of the two

D4282: rebase: cover restorestatus() by lock to prevent it from being updated

2018-08-15 Thread khanchi97 (Sushil khanchi)
khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY To prevent it from being updated by another process `restorestatus()` is moved under lock. REPOSITORY rHG Mercurial REVISION DETAIL