D2887: filemerge: move temp file unlinks to _maketempfiles

spectral 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/D2887 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D2886: filemerge: give some variables in _xmerge more descriptive names

spectral 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/D2886 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D2888: filemerge: use a single temp dir instead of temp files

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This can help to remove the clutter from UIs that display just the filenames; instead of seeing foo~local.C9ru9r.txt and foo~base.2DMV22.txt (in the /tmp

D2889: filemerge: make the 'local' path match the format that 'base' and 'other' use

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If we pass a separate '$output' arg to the merge tool, we produce four files: local, base, other, and output. In this situation, 'output' will be the original

[Bug 5823] New: hg evolve should return 0 status code when it doesn't find any problems to fix

https://bz.mercurial-scm.org/show_bug.cgi?id=5823 Bug ID: 5823 Summary: hg evolve should return 0 status code when it doesn't find any problems to fix Product: Mercurial Version: 4.5 Hardware: PC OS: Linux

D2856: wireproto: nominally don't expose "batch" to version 2 wire transports

indygreg updated this revision to Diff 7083. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2856?vs=7049=7083 REVISION DETAIL https://phab.mercurial-scm.org/D2856 AFFECTED FILES mercurial/wireproto.py mercurial/wireprotoserver.py

D2885: RFC: use Redis to cache file data

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This [very hacky] commit implements a new files store that uses Redis to cache files data. It services requests from Redis (if available) and falls back to a

D2883: revlogstore: create and implement an interface for repo files storage

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In order to better support partial clones, we will need to overhaul local repository storage. This will be a major effort, as many parts of the code assume

D2884: wireproto: experimental command to emit file data

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Partial clones will require new wire protocol functionality to retrieve repository data. The remotefilelog extensions - which implements various aspects of

D2882: hgweb: convert an assert to a ProgrammingError

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Because assert may get optimized away. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2882 AFFECTED FILES

mercurial@36885: 10 new changesets

10 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/97f44b0720e2 changeset: 36876:97f44b0720e2 user:Gregory Szorc date:Sat Mar 10 20:16:20 2018 -0800 summary: hgweb: port archive command to modern response API

D2880: bundle: add the possibility to bundle bookmarks (issue5792)

martinvonz added inline comments. INLINE COMMENTS > test-bundle-bookmarks.t:37-63 > +Bookmarks are restored when unbundling > + $ hg bundle --all bundle > + 5 changesets found > + $ hg debugbundle bundle > + Stream params: {Compression: BZ} > + changegroup -- {nbchanges: 5, version: 02} > +

D2881: hgweb: refactor multirequest to be a dict of lists

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY ... instead of a list of 2-tuples. This makes key lookups faster. The only downside is we lose total ordering of all entries. But we weren't relying on that

D2792: hgweb: port archive command to modern response API

yuja added inline comments. INLINE COMMENTS > webcommands.py:1220 > +web.res.setbodywillwrite() > +assert list(web.res.sendresponse()) == [] > + `assert` may be deleted by `-O`, but this one is important. Can you send a followup? REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH 1 of 7 V4] revbranchcache: add a public function to update the data

On Fri, Mar 16, 2018 at 8:20 AM, Yuya Nishihara wrote: > On Fri, 16 Mar 2018 12:29:33 +0100, Boris Feld wrote: > > # HG changeset patch > > # User Boris Feld > > # Date 1516281665 -3600 > > # Thu Jan 18 14:21:05 2018 +0100 > > # Node ID

[PATCH 3 of 4 V2] formatter: unblock storing fctx as a template resource

# HG changeset patch # User Yuya Nishihara # Date 1520771175 -32400 # Sun Mar 11 21:26:15 2018 +0900 # Node ID f810d481d55c0573912058c68c615bfa30e20805 # Parent 5d94efb75658163ab7db01acbefeb6469bc97739 formatter: unblock storing fctx as a template resource To keep

[PATCH 4 of 4 V2] annotate: add support for template keywords and functions depending on ctx

# HG changeset patch # User Yuya Nishihara # Date 1520771788 -32400 # Sun Mar 11 21:36:28 2018 +0900 # Node ID 654506d13eb9df1cd358266a3fc180dabcd1db52 # Parent f810d481d55c0573912058c68c615bfa30e20805 annotate: add support for template keywords and functions depending on ctx

[PATCH 1 of 4 V2] templater: convert resources to a table of callables for future extension

# HG changeset patch # User Yuya Nishihara # Date 1520769929 -32400 # Sun Mar 11 21:05:29 2018 +0900 # Node ID 5def08d8870b1a9b4f0d88a80ac8f4696a199ea6 # Parent c1f88589ddc9885b39025f3d4b19a5cf3cfe3251 templater: convert resources to a table of callables for future extension

[PATCH 2 of 4 V2] templater: process mapping dict by resource callables

# HG changeset patch # User Yuya Nishihara # Date 1520770322 -32400 # Sun Mar 11 21:12:02 2018 +0900 # Node ID 5d94efb75658163ab7db01acbefeb6469bc97739 # Parent 5def08d8870b1a9b4f0d88a80ac8f4696a199ea6 templater: process mapping dict by resource callables A resource item is

[PATCH 1 of 3] test-template-engine: deduplicate methods of custom template engine

# HG changeset patch # User Yuya Nishihara # Date 1521112254 -32400 # Thu Mar 15 20:10:54 2018 +0900 # Node ID a305e7f025b030a74ca178f722e7502d6c012d6a # Parent 451f4ada3589ebf0074f0a882c5b6b03b2c70bdf test-template-engine: deduplicate methods of custom template engine diff

[PATCH 2 of 3] py3: make test-template-engine.t bytes-safe

# HG changeset patch # User Yuya Nishihara # Date 1521212353 -32400 # Fri Mar 16 23:59:13 2018 +0900 # Node ID 7977db549515436936f56befb1b065d0b956996e # Parent a305e7f025b030a74ca178f722e7502d6c012d6a py3: make test-template-engine.t bytes-safe diff --git

[PATCH 3 of 3] test-template-engine: do not evaluate unused keywords by custom engine

# HG changeset patch # User Yuya Nishihara # Date 1521212774 -32400 # Sat Mar 17 00:06:14 2018 +0900 # Node ID c1f88589ddc9885b39025f3d4b19a5cf3cfe3251 # Parent 7977db549515436936f56befb1b065d0b956996e test-template-engine: do not evaluate unused keywords by custom engine If

Re: [PATCH 1 of 7 V4] revbranchcache: add a public function to update the data

On Fri, 16 Mar 2018 12:29:33 +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1516281665 -3600 > # Thu Jan 18 14:21:05 2018 +0100 > # Node ID 695dfd0f5d9849a7f0b81e623dbdb1befdca63c9 > # Parent c978ffef167e8c5d343c3cca1ebf23f1082c3c09 > #

D2873: remotenames: add functionality to override -B flag of push

pulkit added a comment. I am not sure the functionality and config names should go to core or not, so I have introduced them in this extension. Also suggestions for better config names are welcome. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2873 To:

D2880: bundle: add the possibility to bundle bookmarks (issue5792)

lothiraldan added a subscriber: indygreg. lothiraldan added inline comments. INLINE COMMENTS > pulkit wrote in configitems.py:422 > Any reason why we have all these config option as experimental? We talked at > sprint about moving things out of experimental and we agreed on >

D2880: bundle: add the possibility to bundle bookmarks (issue5792)

pulkit added inline comments. INLINE COMMENTS > configitems.py:422 > ) > +coreconfigitem('experimental', 'bundle-bookmarks', > +default=False, Any reason why we have all these config option as experimental? We talked at sprint about moving things out of experimental and we agreed on

D2880: bundle: add the possibility to bundle bookmarks (issue5792)

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also take the wlock when unbundling. It shouldn't have a big impact on performance. REPOSITORY rHG Mercurial REVISION DETAIL

[PATCH 1 of 7 V4] revbranchcache: add a public function to update the data

# HG changeset patch # User Boris Feld # Date 1516281665 -3600 # Thu Jan 18 14:21:05 2018 +0100 # Node ID 695dfd0f5d9849a7f0b81e623dbdb1befdca63c9 # Parent c978ffef167e8c5d343c3cca1ebf23f1082c3c09 # EXP-Topic wire-rbc # Available At

[PATCH 6 of 7 V4] revbranchcache: disable the new part for narrow hg bundle

# HG changeset patch # User Boris Feld # Date 1519237601 -3600 # Wed Feb 21 19:26:41 2018 +0100 # Node ID bb1dcdcff788fbeabd761d5de67db1b8e17561c0 # Parent 6355ab0513a089c60a59f76039bea39d07f9e80c # EXP-Topic wire-rbc # Available At

[PATCH 4 of 7 V4] bundle: include advisory rev branch cache part in bundle2 bundle

# HG changeset patch # User Boris Feld # Date 1519230780 -3600 # Wed Feb 21 17:33:00 2018 +0100 # Node ID d0daa9803d599b7b6fd4f80a773b08a32cc2ccb3 # Parent fa45b38924bec627efbd1ff270e68943211a9c8d # EXP-Topic wire-rbc # Available At

[PATCH 3 of 7 V4] rev-branch-cache: add a function to generate a part

# HG changeset patch # User Boris Feld # Date 1519230382 -3600 # Wed Feb 21 17:26:22 2018 +0100 # Node ID fa45b38924bec627efbd1ff270e68943211a9c8d # Parent 1eb0f8075f0d33fe0aebf7243eaf50db2b33496d # EXP-Topic wire-rbc # Available At

[PATCH 5 of 7 V4] revbranchcache: add the necessary bit to send 'rbc' data over bundle2

# HG changeset patch # User Boris Feld # Date 1516283882 -3600 # Thu Jan 18 14:58:02 2018 +0100 # Node ID 6355ab0513a089c60a59f76039bea39d07f9e80c # Parent d0daa9803d599b7b6fd4f80a773b08a32cc2ccb3 # EXP-Topic wire-rbc # Available At

[PATCH 2 of 7 V4] revbranchcache: add a bundle2 handler for a rbc part

# HG changeset patch # User Boris Feld # Date 1519230904 -3600 # Wed Feb 21 17:35:04 2018 +0100 # Node ID 1eb0f8075f0d33fe0aebf7243eaf50db2b33496d # Parent 695dfd0f5d9849a7f0b81e623dbdb1befdca63c9 # EXP-Topic wire-rbc # Available At