D2877: tests: demonstrate aborted rebase strips commits that didn't need rebasing

martinvonz added a comment. I'm not sure if you can tell in the Phabricator UI, but this series is meant for stable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2877 To: martinvonz, #hg-reviewers Cc: mercurial-devel

D2878: rebase: avoid defining two lists with the same contents

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In abort(), there's "dstates" and "rebased" that are identical, which they seem to have been since

D2877: tests: demonstrate aborted rebase strips commits that didn't need rebasing

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I haven't verified, but this has probably been broken ever since I added the feature in

D2879: rebase: on abort, don't strip commits that didn't need rebased (issue5822)

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I clearly missed adding this condition in https://phab.mercurial-scm.org/rHG78496ac300255e9996b3e282086661afc08af37c (rebase: allow rebase even if some

[Bug 5822] New: rebase --abort loses commits that didn't need to be rebased

https://bz.mercurial-scm.org/show_bug.cgi?id=5822 Bug ID: 5822 Summary: rebase --abort loses commits that didn't need to be rebased Product: Mercurial Version: 4.5.2 Hardware: PC OS: Mac OS

mercurial@36875: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/98baf8dea553 changeset: 36873:98baf8dea553 user:Gregory Szorc date:Sat Mar 10 15:46:29 2018 -0800 summary: hgweb: port static file handling to new response API

D2791: hgweb: refactor fake file object proxy for archiving

martinvonz added inline comments. INLINE COMMENTS > request.py:294 > +class offsettrackingwriter(object): > +"""A file object like object that is append only and tracks write count. > + s/file object like object/file-like object/ ? s/append only/append-only/ ? > request.py:319 > +def

D2876: rebase: allow in-memory merge of the working copy parent

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch and when the rebase involved the working copy parent (and thus the working copy too), we would not do in-memory rebase even if requested

D2288: pvec: delete module

pulkit abandoned this revision. pulkit added a comment. This is not required as @durin42 will like to use pvec. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2288 To: pulkit, #hg-reviewers, martinvonz Cc: durin42, mercurial-devel

mercurial@36872: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/1f42d621f090 changeset: 36870:1f42d621f090 user:Gregory Szorc date:Sat Mar 10 17:02:57 2018 -0800 summary: hgweb: support using new response object for web commands

D2723: httppeer: consolidate _requestbuilder assignments and document

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2d5d3033ff4e: httppeer: consolidate _requestbuilder assignments and document (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2776: hgweb: use a multidict for holding query string parameters

indygreg added a comment. I may have a shot at rewriting this class today. I do want to prioritize on adding missing components to the new wire protocol so reviewers have better context, however. So if someone else wants to do the work, I'd happily review it. Otherwise, I should get around

D2725: httppeer: refactor how httppeer is created (API)

indygreg updated this revision to Diff 7071. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2725?vs=6975=7071 REVISION DETAIL https://phab.mercurial-scm.org/D2725 AFFECTED FILES mercurial/httppeer.py tests/test-check-interfaces.py CHANGE DETAILS

[Bug 5821] New: conflict between evolve and notify, cannot push hidden extension.

https://bz.mercurial-scm.org/show_bug.cgi?id=5821 Bug ID: 5821 Summary: conflict between evolve and notify, cannot push hidden extension. Product: Mercurial Version: earlier Hardware: PC OS: Linux

D2723: httppeer: consolidate _requestbuilder assignments and document

indygreg updated this revision to Diff 7070. indygreg edited the summary of this revision. indygreg retitled this revision from "httppeer: remove _requestbuilder attribute" to "httppeer: consolidate _requestbuilder assignments and document". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

mercurial@36869: 8 new changesets

8 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ec0af9c59270 changeset: 36862:ec0af9c59270 user:Gregory Szorc date:Sat Mar 10 12:35:38 2018 -0800 summary: hgweb: use a multidict for holding query string parameters

Re: evolve amend and push problem

>>> "Feld" == Feld Boris writes: > Hi Uwe, > It's likely an incompatibility between the evolution way of doing > amend and the notify hook, could you open a ticket here: > https://bz.mercurial-scm.org/ so we can track it? Sure, thanks.

D2691: commands: don't check for merge.update() truthiness

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2d29e976366a: commands: dont check for merge.update() truthiness (authored by indygreg, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2691?vs=6968=7069#toc REPOSITORY rHG

D2724: httppeer: alias url as urlmod

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb70256e6cffa: httppeer: alias url as urlmod (authored by indygreg, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2724?vs=6974=7068#toc REPOSITORY rHG Mercurial CHANGES

D2868: util: prefer "bytesio" to "stringio"

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6619acb2fcbc: util: prefer bytesio to stringio (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2868?vs=7046=7067 REVISION

[Bug 5820] New: hg push fails with ValueError: 20-byte hash required

https://bz.mercurial-scm.org/show_bug.cgi?id=5820 Bug ID: 5820 Summary: hg push fails with ValueError: 20-byte hash required Product: Mercurial Version: 4.3.1 Hardware: PC OS: Windows Status: UNCONFIRMED

D2723: httppeer: remove _requestbuilder attribute

martinvonz added a comment. In https://phab.mercurial-scm.org/D2723#46187, @pulkit wrote: > Looks like this was added so that extensions can replace using urllib2.Request. https://www.mercurial-scm.org/repo/hg/rev/00ecc894138d Thanks for looking that up. We still depend on it, so

D2723: httppeer: remove _requestbuilder attribute

pulkit added a comment. Looks like this was added so that extensions can replace using urllib2.Request. https://www.mercurial-scm.org/repo/hg/rev/00ecc894138d REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2723 To: indygreg, #hg-reviewers Cc: pulkit,

D2776: hgweb: use a multidict for holding query string parameters

yuja added inline comments. INLINE COMMENTS > indygreg wrote in request.py:31 > I agree with the sentiment about this being a list in disguise. One reason I > didn't bother to optimize it is because I don't think we do any `qsparams` > lookups in loops and I don't believe we have any more than

Re: evolve amend and push problem

Hi Uwe, It's likely an incompatibility between the evolution way of doing amend and the notify hook, could you open a ticket here: https://bz.mercurial-scm.org/ so we can track it? Thanks, Boris Feld On 14/03/2018 11:04, Uwe Brauer wrote: Hi I have the evolve extension enabled and

D2866: contrib: fix a subtle bug in check-code's regex rewriting

This revision was automatically updated to reflect the committed changes. Closed by commit rHGac635637ed2f: contrib: fix a subtle bug in check-codes regex rewriting (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2847: remotenames: work around move of ABCs in collections

This revision was automatically updated to reflect the committed changes. Closed by commit rHG623193ef691b: remotenames: work around move of ABCs in collections (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

I just sent a V3, I didn't saw your email sorry. On 03/03/2018 01:22, Yuya Nishihara wrote: On Thu, 01 Mar 2018 15:44:16 -0500, Boris Feld wrote: # HG changeset patch # User Boris Feld # Date 1516281665 -3600 # Thu Jan 18 14:21:05 2018 +0100 # Node ID

[PATCH 6 of 7 V3] 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 de3ebe1992b795f0be17c922b1bc6c8c7373d06e # Parent e4e572bef19bde11ac42e68f3acaad02f83b0fbb # EXP-Topic wire-rbc # Available At

[PATCH 3 of 7 V3] 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 778415f0a8869c88f0f7b96882ed07aa56b4c930 # Parent c66ccb6f6ec80d539f2bed0724cca125624d2807 # EXP-Topic wire-rbc # Available At

[PATCH 1 of 7 V3] 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 ec581b3db32120b39cd7c4b9019955c0b0374d60 # Parent 3f3418a4a7743c7019cd4ec5fc1ac1ce7c1b61ab # EXP-Topic wire-rbc # Available At

[PATCH 5 of 7 V3] 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 e4e572bef19bde11ac42e68f3acaad02f83b0fbb # Parent 1c52141b19cb805877b648d5ae4320a4f76f50ba # EXP-Topic wire-rbc # Available At

[PATCH 4 of 7 V3] 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 1c52141b19cb805877b648d5ae4320a4f76f50ba # Parent 778415f0a8869c88f0f7b96882ed07aa56b4c930 # EXP-Topic wire-rbc # Available At

[PATCH 2 of 7 V3] 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 c66ccb6f6ec80d539f2bed0724cca125624d2807 # Parent ec581b3db32120b39cd7c4b9019955c0b0374d60 # EXP-Topic wire-rbc # Available At

D2867: tests: fix test-wireproto.py to work around serverrepo() not having a ui

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbe623af5d242: tests: fix test-wireproto.py to work around serverrepo() not having a ui (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1957: streamclonebundle: make sure we accept new stream clone bundle spec

lothiraldan added a comment. @indygreg I'm  on having this discussion. When do you want to have it? What would be the best medium for it, a video-call? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1957 To: lothiraldan, #hg-reviewers Cc: indygreg,

[Bug 5819] New: hg-stable's @ bookmark is out-of-date

https://bz.mercurial-scm.org/show_bug.cgi?id=5819 Bug ID: 5819 Summary: hg-stable's @ bookmark is out-of-date Product: Mercurial project Version: unspecified Hardware: PC OS: Other Status: UNCONFIRMED

Re: [PATCH 1 of 3 V4] obsolete: move marker flags to obsutil

On Thu, 15 Mar 2018 11:58:51 +0800, Anton Shestakov wrote: > # HG changeset patch > # User Anton Shestakov > # Date 1520944478 -28800 > # Tue Mar 13 20:34:38 2018 +0800 > # Node ID b7b0c187d6aef20b63d48e1c98fcc923353fc707 > # Parent

Re: [PATCH 2 of 2] debugupdatecache: also warm rev branch cache

On Wed, 14 Mar 2018 16:37:25 +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1519230070 -3600 > # Wed Feb 21 17:21:10 2018 +0100 > # Node ID c76963db79b393830c8f460baec7efcb39049d86 > # Parent 894cf14ad5d770100eecf112cff94c7a7b19679b > #

Re: [PATCH 5 of 5] templater: hide resources by naming rule (API)

On Wed, 14 Mar 2018 23:27:38 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1521029431 -32400 > # Wed Mar 14 21:10:31 2018 +0900 > # Node ID 2a9f0d2579cdabe0c94725c52c567e26701479ad > # Parent 94780b04daec618e289ac7bffac170d89330f94d >

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

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds a new config option which can be used to override the `-B` flag of push command. If config is set to true, changesets will be pushed to that

D2875: remotenames: introduce a config option to allow creation of remote bookmarks

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch introduces another config option which if set to true, we can create new bookmarks on the server using push command. An earlier patch added

D2874: remotenames: synchronise remotenames after push also

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Earlier we use to pull remotenames information from the server in case of pull and clone only. This patch adds logic to push also command to pull remotenames

D2864: contrib: open a hole in the open().read() ban for open().close()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1190449c807d: contrib: open a hole in the open().read() ban for open().close() (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2865: tests: clean up two wayward `python` invocations

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3f3418a4a774: tests: clean up two wayward `python` invocations (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2863: cleanup: fix some latent open(path).read() et al calls we previously missed

This revision was automatically updated to reflect the committed changes. Closed by commit rHG76c594af8ec8: cleanup: fix some latent open(path).read() et al calls we previously missed (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2866: contrib: fix a subtle bug in check-code's regex rewriting

pulkit accepted this revision. pulkit added a comment. Looks good to me but I am not feeling confident enough to push this. Queued the first three. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2866 To: durin42, #hg-reviewers, pulkit Cc: pulkit,

Re: How to debug merge algorithm for binary files?

On Thu, Mar 15, 2018 at 5:25 PM, Лежанкин Иван wrote: > Hi, > > I have a problem with merging of binary files. When I try to merge default > into my feature-branch the Hg for some reason thinks that some binary files > have conflicts. By default internal:merge3 can't handle

How to debug merge algorithm for binary files?

Hi, I have a problem with merging of binary files. When I try to merge default into my feature-branch the Hg for some reason thinks that some binary files have conflicts. By default internal:merge3 can't handle binary files, so Hg leaves them unresolved. But the main point is that I never