D2711: rebase: collapse two nested if-conditions

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also change the order since it feel to me like it's more about --collapse than it is about --keep. REPOSITORY rHG Mercurial REVISION DETAIL

D2712: rebase: only store collapse message once

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The message is determined by the user passing --message or --log when the rebase is started. There's no need to write it to a file for each rebased commit;

D2710: rebase: reduce scope of "dsguard" variables a bit

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
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/D2710 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D2713: tests: .hg/merge is a directory, so use `test -d`

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This part of test-rebase-interrupts.t would have passed before the fix in https://phab.mercurial-scm.org/rHGa580b2d65ded988da1b06e4300d05dcb0b95b352 (rebase:

D2708: rebase: delete obsolete internal "keepopen" option

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf7e3fe95b663: rebase: delete obsolete internal keepopen option (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2712: rebase: only store collapse message once

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6dab3bdb1f00: rebase: only store collapse message once (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2712?vs=6700=6707

D2709: rebase: remove unused argument "state" from rebasenode()

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0f3116c08e65: rebase: remove unused argument state from rebasenode() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2711: rebase: collapse two nested if-conditions

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa835bf3fe40a: rebase: collapse two nested if-conditions (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2711?vs=6699=6706

D2710: rebase: reduce scope of "dsguard" variables a bit

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1004fd71810f: rebase: reduce scope of dsguard variables a bit (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2708: rebase: delete obsolete internal "keepopen" option

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The option was apparently introduced for use by the "pbranch", see https://phab.mercurial-scm.org/rHGf2558a8228be7dc016f03f08593c7c010cac1608 (rebase: add

D2709: rebase: remove unused argument "state" from rebasenode()

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
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/D2709 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D2714: tests: add test for issue 5494 but with --collapse

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was not fixed, so the test case currently demonstrates the breakage. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2714

Re: [PATCH] Fix for Bug #5807

2018-03-07 Thread Sascha Nemecek
Am 2018-03-02 um 05:14 schrieb Yuya Nishihara: > On Thu, 1 Mar 2018 11:06:59 +0100, Sascha Nemecek wrote: >> # HG changeset patch >> # User Sascha Nemecek >> # Date 1519831479 -3600 >> # Wed Feb 28 16:24:39 2018 +0100 >> # Node ID

D2686: xdiff: add a preprocessing step that trims files

2018-03-07 Thread quark (Jun Wu)
quark updated this revision to Diff 6708. quark edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2686?vs=6664=6708 REVISION DETAIL https://phab.mercurial-scm.org/D2686 AFFECTED FILES

D2718: wireproto: declare permissions requirements in @wireprotocommand (API)

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY With the security patches from 4.5.2 merged into default, we now have a per-command attribute defining what permissions are needed to run that command. We now

D2719: wireproto: formalize permissions checking as part of protocol interface

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Per the inline comment desiring to formalize permissions checking in the protocol interface, we do that. I'm not convinced this is the best way to go about

D2720: debugcommands: introduce actions to perform deterministic reads

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY "readavailable" is useful as a debugging device to see what data is available on a pipe. But the mechanism isn't deterministic because what's available on a

D2717: wireprotoserver: check permissions in main dispatch function

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The permissions checking code merged from stable is out of place in the refactored hgweb_mod module. This commit moves the main call to wireprotoserver. We

D2716: wireprotoserver: check if command available before calling it

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The previous behavior was just plain wrong. I have no clue how it landed. My guess is a merge conflict resolution gone wrong on my end a few weeks ago.

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

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, we passed a bunch of arguments to httppeer.__init__, validated them, then possibly constructed a valid instance. A short while ago, we

D2721: util: observable proxy objects for sockets

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We previously introduced proxy objects and observers for file objects to help implement low-level tests for the SSH wire protocol. In this commit, we do the

D2723: httppeer: remove _requestbuilder attribute

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was a glorified alias to a function in another module. I have no clue why it existed. REPOSITORY rHG Mercurial REVISION DETAIL

D2724: httppeer: alias url as urlmod

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY "url" is a common variable name. We do this aliasing elsewhere to avoid shadowing. REPOSITORY rHG Mercurial REVISION DETAIL

D2676: tests: stop over-specifying tempfile name

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg added a comment. I'm -0 on this. I'd prefer to change the temp file code to be consistent between Python versions. Preferably standardizing on the Python 3 version. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2676 To: durin42, pulkit, #hg-reviewers

[PATCH 2 of 2 V2] hgweb: add a hook for processing LFS file transfer requests

2018-03-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1519275362 18000 # Wed Feb 21 23:56:02 2018 -0500 # Node ID 5544688dec388a7c8a988c074aab659f059f549f # Parent 89382cb20bb19e089513b2ce69ef8acfa1f523fd hgweb: add a hook for processing LFS file transfer requests As

[PATCH 1 of 2 V2] hgweb: add a hook for processing LFS Batch API requests

2018-03-07 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1519274700 18000 # Wed Feb 21 23:45:00 2018 -0500 # Node ID 89382cb20bb19e089513b2ce69ef8acfa1f523fd # Parent 6dab3bdb1f00932a80ffa07f80ba240c3a4b48df hgweb: add a hook for processing LFS Batch API requests There

D2713: tests: .hg/merge is a directory, so use `test -d`

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc164a3a282c1: tests: .hg/merge is a directory, so use `test -d` (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2714: tests: add test for issue 5494 but with --collapse

2018-03-07 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG66c569e57c70: tests: add test for issue 5494 but with --collapse (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2395: stack: add a new module for stack-related commands

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. I assume this stack will get a post-sprint refresh. So I'm going to wait on that before reviewing. REPOSITORY rHG Mercurial REVISION DETAIL

D2722: url: add HTTP handler that uses a proxied socket

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now that we have a socket proxy that can log I/O, we need to teach mechanisms that open URLs how to use. We invent a custom HTTP handler class that knows

D2726: debugcommands: support connecting to HTTP peers

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now that we have the plumbing for logging socket activity, let's hook it up to `hg debugwireproto` so we can collect low-level activity on sockets. The

D2686: xdiff: add a preprocessing step that trims files

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. I'm overall pretty happy with this. I'm requesting just a few minor fixups. Also, if you (or anyone else for that matter) wanted to spend time to use better variable

Re: [PATCH 1 of 2 V2] hgweb: add a hook for processing LFS Batch API requests

2018-03-07 Thread Gregory Szorc
On Wed, Mar 7, 2018 at 8:49 PM, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1519274700 18000 > # Wed Feb 21 23:45:00 2018 -0500 > # Node ID 89382cb20bb19e089513b2ce69ef8acfa1f523fd > # Parent

D2057: translate base85.c into rust code

2018-03-07 Thread Ivzhh (Sheng Mao)
Ivzhh updated this revision to Diff 6724. Ivzhh added a comment. - merge with stable - translate base85.c into rust code - move hgbase85 into independent module - add hgstorage crate - hg status implementation in rust REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2675: debugcommands: fix some %r output with bytestr() wrappers

2018-03-07 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7aae39d03139: debugcommands: fix some %r output with bytestr() wrappers (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH 2 of 2 V2] hgweb: add a hook for processing LFS file transfer requests

2018-03-07 Thread Gregory Szorc
On Wed, Mar 7, 2018 at 8:49 PM, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1519275362 18000 > # Wed Feb 21 23:56:02 2018 -0500 > # Node ID 5544688dec388a7c8a988c074aab659f059f549f > # Parent

D2057: rust implementation of hg status

2018-03-07 Thread Ivzhh (Sheng Mao)
Ivzhh added a comment. Hi all, Based on the discussion a few weeks ago, I come up with a solution for review and discussion. After reading the Oxidation plan, the first thought is to bypass python engine and current plugin system IFF on request. If user (maybe background checker of

D2057: rust implementation of hg status

2018-03-07 Thread indygreg (Gregory Szorc)
indygreg added a comment. First of all - wow! Thanks for writing all this code. There's definitely a lot to work with. And work with it we will! This is definitely too big to review as one commit. If you could do *any* work to split it up, it would be greatly appreciated. I'd focus on

D2057: rust implementation of hg status

2018-03-07 Thread glandium (Mike Hommey)
glandium added a comment. Doesn't mononoke have code to read revlogs already? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2057 To: Ivzhh, #hg-reviewers Cc: glandium, krbullock, indygreg, durin42, kevincox, mercurial-devel

[PATCH evolve-ext resend] obsdiscovery: include units in ui.progress() calls (issue5773)

2018-03-07 Thread Anton Shestakov
# HG changeset patch # User Anton Shestakov # Date 1519388837 -28800 # Fri Feb 23 20:27:17 2018 +0800 # Node ID 7ce1b90dbc7d6bce36398f0fab6f6db708beee0c # Parent 1f0c88a9dd1cdf11d9eb8db48cc5e6e70022230b obsdiscovery: include units in ui.progress() calls (issue5773) diff

D2588: commit: adds multiline commit message support(issue5616)

2018-03-07 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 added a comment. @pulkit Yeah, this rather a not so elegant hack. How can it be parsed in hg commit? As the first message passed is overwritten by the second one at this step only. :/ @yuja I think maybe subclassing the customopt may be a fair choice. REPOSITORY rHG

D2394: histedit: make histedit's commands accept revsets (issue5746)

2018-03-07 Thread durin42 (Augie Fackler)
durin42 added a comment. In https://phab.mercurial-scm.org/D2394#43612, @sangeet259 wrote: > @durin42 Even I thought of this construct before as it appears more elegant. But it is failing some tests! > Specifically, the error messages are changed in this one. > > Failed

D2394: histedit: make histedit's commands accept revsets (issue5746)

2018-03-07 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 added a comment. @durin42 Even I thought of this construct before as it appears more elegant. But it is failing some tests! Specifically, the error messages are changed in this one. Failed test-histedit-arguments.t: output changed Failed test-histedit-edit.t: output

D2588: commit: adds multiline commit message support(issue5616)

2018-03-07 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > pulkit wrote in test-commit.t:847 > starting with a newline seems awkward. agreed REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2588 To: sangeet259, #hg-reviewers Cc: durin42, tom.prince, yuja, pulkit, jeffpc,

D2394: histedit: make histedit's commands accept revsets (issue5746)

2018-03-07 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 added a comment. @durin42 Here is the output! https://bpaste.net/show/7ccf4a9fea50 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2394 To: sangeet259, durin42, #hg-reviewers Cc: tom.prince, krbullock, rishabhmadan96, mercurial-devel

D2704: archival: fileit should not use atomictemp, causes major performance regression

2018-03-07 Thread vincent.parrett (Vincent Parrett)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa148c67d8b09: archival: fileit should not use atomictemp, causes performance regression (authored by vincent.parrett, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2624: perf: teach perfbdiff to call blocks() and to use xdiff

2018-03-07 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd382344c69aa: perf: teach perfbdiff to call blocks() and to use xdiff (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2253: releasenotes: mention changeset with warning and abort

2018-03-07 Thread rishabhmadan96 (Rishabh Madan)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3fff6f30bd7f: releasenotes: mention changeset with warning and abort (authored by rishabhmadan96, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2255: releasenotes: replace abort with warning while parsing (issue5775)

2018-03-07 Thread rishabhmadan96 (Rishabh Madan)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG658ed9c7442b: releasenotes: replace abort with warning while parsing (issue5775) (authored by rishabhmadan96, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2254: releasenotes: allow notes for multiple directives in a single changeset

2018-03-07 Thread rishabhmadan96 (Rishabh Madan)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa5891e94bfe1: releasenotes: allow notes for multiple directives in a single changeset (authored by rishabhmadan96, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE