D2758: transaction: add a name and a __str__ implementation (API)

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This has been useful for me for debugging. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2758 AFFECTED FILES

D2686: xdiff: add a preprocessing step that trims files

2018-03-09 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > indygreg wrote in xprepare.c:169 > Bonus points if you resubmit this with more expressive variable names. Just > because xdiff's code is almost impossible to read doesn't mean we should > follow suit :) The style guide in git community recommends

D2760: rebase: also restore "ui.allowemptycommit" value

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It looks like this was lost when the code was converted to the ui.configoverride() context manager in

D2759: rebase: fix issue 5494 also with --collapse

2018-03-09 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/D2759 AFFECTED FILES hgext/rebase.py tests/test-rebase-interruptions.t CHANGE DETAILS diff --git

D2761: rebase: use configoverride context manager for ui.forcemerge

2018-03-09 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/D2761 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

mercurial@36786: 8 new changesets

2018-03-09 Thread Mercurial Commits
8 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/bf9a04d78084 changeset: 36779:bf9a04d78084 user:Augie Fackler date:Sun Mar 04 21:14:24 2018 -0500 summary: hgweb: adapt to socket._fileobject changes in Python 3

D2743: wireprotoserver: access headers through parsed request

2018-03-09 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > wireprotoserver.py:97 > else: > length = int(self._wsgireq.env[r'CONTENT_LENGTH']) > # If httppostargs is used, we need to read Content-Length Missed one? REPOSITORY rHG Mercurial REVISION DETAIL

D2720: debugcommands: introduce actions to perform deterministic reads

2018-03-09 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. In https://phab.mercurial-scm.org/D2720#44396, @indygreg wrote: > My only explanation is this is stdout output buffering and things are really hanging on the next read operation. > > Maybe try sprinkling some `ui.fout.flush()` and/or `util.stdout.flush()`

D2755: phabricator: update doc string for deprecated token argument

2018-03-09 Thread joerg.sonnenberger (Joerg Sonnenberger)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0bebd4608ce3: phabricator: update doc string for deprecated token argument (authored by joerg.sonnenberger, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2758: transaction: add a name and a __str__ implementation (API)

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 6791. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2758?vs=6790=6791 REVISION DETAIL https://phab.mercurial-scm.org/D2758 AFFECTED FILES mercurial/localrepo.py mercurial/transaction.py CHANGE DETAILS

D2754: phabricator: print deprecation warning only once

2018-03-09 Thread joerg.sonnenberger (Joerg Sonnenberger)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6490b0915881: phabricator: print deprecation warning only once (authored by joerg.sonnenberger, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2757: tests: add a few tests involving --collapse and rebase.singletransaction=1

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5b84bdd511eb: tests: add a few tests involving --collapse and rebase.singletransaction=1 (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2756: tests: simplify test-rebase-transaction.t

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG28ea00cd817e: tests: simplify test-rebase-transaction.t (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2756?vs=6766=6792

D2758: transaction: add a name and a __str__ implementation (API)

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. Done REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2758 To: martinvonz, #hg-reviewers Cc: durin42, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D2758: transaction: add a name and a __str__ implementation (API)

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 6790. martinvonz marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2758?vs=6769=6790 REVISION DETAIL https://phab.mercurial-scm.org/D2758 AFFECTED FILES mercurial/localrepo.py

D2735: hgweb: use computed base URL from parsed request

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG56154c4626b9: hgweb: use computed base URL from parsed request (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2730: hgweb: ensure all wsgi environment values are str

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7fc80c982656: hgweb: ensure all wsgi environment values are str (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0b18604db95e: wireproto: declare permissions requirements in @wireprotocommand (API) (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2732: hgweb: rename req to wsgireq

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb9b968e21f78: hgweb: rename req to wsgireq (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2732?vs=6738=6776 REVISION

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

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG66de4555cefd: wireproto: formalize permissions checking as part of protocol interface (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2739: hgweb: use parsed request to construct query parameters

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0c1de2e87c6e: hgweb: use parsed request to construct query parameters (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2738: hgweb: only recognize wire protocol commands from query string (BC)

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGad13301e6479: hgweb: only recognize wire protocol commands from query string (BC) (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2740: wireprotoserver: move all wire protocol handling logic out of hgweb

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG09b9a9d4612b: wireprotoserver: move all wire protocol handling logic out of hgweb (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2741: wireprotoserver: remove broken optimization for non-httplib client

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9a6216c18ffd: wireprotoserver: remove broken optimization for non-httplib client (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2742: hgweb: parse and store HTTP request headers

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG29b477d7f334: hgweb: parse and store HTTP request headers (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2742?vs=6748=6786

D2736: hgweb: use the parsed application path directly

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG328d665ef23d: hgweb: use the parsed application path directly (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2734: hgweb: parse WSGI request into a data structure

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3e13a21ce6b5: hgweb: parse WSGI request into a data structure (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2737: hgweb: teach WSGI parser about query strings

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb48ac58ea4f6: hgweb: teach WSGI parser about query strings (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2731: hgweb: validate WSGI environment dict

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8e1556ac01bb: hgweb: validate WSGI environment dict (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2731?vs=6737=6775

D2720: debugcommands: introduce actions to perform deterministic reads

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg added a comment. In https://phab.mercurial-scm.org/D2720#44293, @mharbison72 wrote: > i> write(4) -> 4: > i> 426\n > i> write(426) -> 426: > i> HG10UN\x00\x00\x00\x9eh\x98b\x13\xbdD\x85\xeaQS55\xe3\xfc\x9ex\x00zq\x1f\x00\x00\x00\x00\x00\x00\x00\x0 >

Re: [PATCH] xdiff: fix trivial build warnings on Windows

2018-03-09 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2018-03-08 21:33:42 +0900: > On Tue, 6 Mar 2018 19:12:26 -0800, Jun Wu wrote: > > Yeah, xdiff needs a migration from using "long", "int"s to "size_t" etc. > > The git community has chosen to disallow diff >1GB files because of the > > overflow concern [1].

D2758: transaction: add a name and a __str__ implementation (API)

2018-03-09 Thread durin42 (Augie Fackler)
durin42 added a comment. Either way, you should make sure this always returns a sysstr, otherwise you'll cause pretty terrible python3 breakage. Look around for other __repr__ instances for examples. INLINE COMMENTS > transaction.py:191 > > +def __str__(self): > +name =

D2728: rebase: also include commit of collapsed commits in single transaction

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. This is now ready for review again REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2728 To: martinvonz, #hg-reviewers, durham, quark Cc: mercurial-devel ___ Mercurial-devel mailing list

D2720: debugcommands: introduce actions to perform deterministic reads

2018-03-09 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. In https://phab.mercurial-scm.org/D2720#44350, @indygreg wrote: > In https://phab.mercurial-scm.org/D2720#44293, @mharbison72 wrote: > > > i> write(4) -> 4: > > i> 426\n > > i> write(426) -> 426: > > i>

[Bug 5811] New: fsmonitor returns bogus stat tuples, breaking after cleanup in ffa3026d4196

2018-03-09 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5811 Bug ID: 5811 Summary: fsmonitor returns bogus stat tuples, breaking after cleanup in ffa3026d4196 Product: Mercurial Version: default branch Hardware: All

D2720: debugcommands: introduce actions to perform deterministic reads

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg added a comment. My only explanation is this is stdout output buffering and things are really hanging on the next read operation. Maybe try sprinkling some `ui.fout.flush()` and/or `util.stdout.flush()` and/or `sys.stdout.flush()` calls throughout the debug command? Maybe at

D2744: hgweb: handle CONTENT_LENGTH

2018-03-09 Thread durin42 (Augie Fackler)
durin42 accepted this revision. durin42 added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > wireprotoserver.py:94 > def forwardpayload(self, fp): > -if b'Content-Length' in self._req.headers: > -length =

D2716: wireprotoserver: check if command available before calling it

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7574c8173d5e: wireprotoserver: check if command available before calling it (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2717: wireprotoserver: check permissions in main dispatch function

2018-03-09 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc638a13093cf: wireprotoserver: check permissions in main dispatch function (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2757: tests: add a few tests involving --collapse and rebase.singletransaction=1

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm about to change the rebase code quite a bit and this was poorly tested. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2757

D2756: tests: simplify test-rebase-transaction.t

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The file was extracted from test-rebase-base.t in https://phab.mercurial-scm.org/rHG8cef8f7d51d0f1e99889779ec1320d5c9c3b91de (test-rebase-base: clarify it is

D2728: rebase: also include commit of collapsed commits in single transaction

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 6768. martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2728?vs=6734=6768 REVISION DETAIL https://phab.mercurial-scm.org/D2728 AFFECTED FILES hgext/rebase.py

D2764: xdiff: remove unused xpp and xecfg parameters

2018-03-09 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY They are unused. Thus removed. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2764 AFFECTED FILES

D2772: hgweb: parse and store POST form data

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg abandoned this revision. indygreg added a subscriber: durin42. indygreg added a comment. @durin42 thinks we don't need this feature. So I'll submit a patch to remove it instead. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2772 To: indygreg,

Re: [PATCH 6 of 8] ui: do not use rawinput() when we have to replace sys.stdin/stdout

2018-03-09 Thread Matt Harbison
On Fri, 09 Mar 2018 07:35:39 -0500, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1520325533 21600 # Tue Mar 06 02:38:53 2018 -0600 # Node ID ad7ff97565b261d82952acc9f941e5dd99f11374 # Parent

D2758: transaction: add a name and a __repr__ implementation (API)

2018-03-09 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG49e2ca27c10e: transaction: add a name and a __str__ implementation (API) (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2720: debugcommands: introduce actions to perform deterministic reads

2018-03-09 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. > IDK if this means anything, but when it is stuck and I hit Ctrl+C, instead of terminating the test, the test simply continues with the script, and then hangs on the next 'remote output:' line. Typically, Ctrl+C ends the test runner. A couple of

D2743: wireprotoserver: access headers through parsed request

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg added inline comments. INLINE COMMENTS > durin42 wrote in wireprotoserver.py:97 > Missed one? No. This preserves the behavior since HTTP_CONTENT_LENGTH != CONTENT_LENGTH. I fix this in a later commit by teaching the request object about both keys. REPOSITORY rHG Mercurial REVISION

D2686: xdiff: add a preprocessing step that trims files

2018-03-09 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG665958f30789: xdiff: add a preprocessing step that trims files (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2764: xdiff: remove unused xpp and xecfg parameters

2018-03-09 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2e2b48cca761: xdiff: remove unused xpp and xecfg parameters (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2764?vs=6801=6807

D2685: xdiff: add comments for fields in xdfile_t

2018-03-09 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG58028f6d1fb8: xdiff: add comments for fields in xdfile_t (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2685?vs=6798=6805

D2763: xdiff: remove unused flags parameter

2018-03-09 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4c8ffc67bac2: xdiff: remove unused flags parameter (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2763?vs=6800=6808 REVISION

D2765: xdiff: use int64 for hash table size

2018-03-09 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG71fbceb58746: xdiff: use int64 for hash table size (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2765?vs=6802=6809 REVISION

D2762: xdiff: replace {unsigned ,}long with {u,}int64_t

2018-03-09 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe882437cc082: xdiff: replace {unsigned ,}long with {u,}int64_t (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2685: xdiff: add comments for fields in xdfile_t

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. So. Much. Better. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2685 To: quark, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel

D2769: hgweb: refactor the request draining code

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The previous code for draining was only invoked in a few places in the wire protocol. Behavior wasn't consist. Furthermore, it was difficult to reason about.

D2771: hgweb: expose input stream on parsed WSGI request object

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Our next step towards moving away from wsgirequest to our newer, friendlier parsedrequest type is input stream access. This commit exposes the input stream

D2773: hgweb: remove support for short query string based aliases (BC)

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Form data exposed by hgweb is post-processed to expand certain shortcuts. For example, URLs with "?cs=@" is essentially expanded to "?cmd=changeset=@". And the

D2770: hgweb: make parsedrequest part of wsgirequest

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is kind of ugly. But upcoming commits will teach our parsedrequest instances about how to read from the input stream and how to parse form variables which

D2772: hgweb: parse and store POST form data

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is essentially a port of what wsgirequest.__init__ was doing inline via cgi.parse(). Our version is better because - unlike cgi.parse() - we keep the

D2767: hgweb: document continuereader

2018-03-09 Thread indygreg (Gregory Szorc)
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/D2767 AFFECTED FILES mercurial/hgweb/common.py CHANGE DETAILS diff --git a/mercurial/hgweb/common.py

D2768: hgweb: use a capped reader for WSGI input stream

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Per PEP-, the input stream from WSGI should respect EOF and prevent reads past the end of the request body. However, not all WSGI servers guarantee this.

D2763: xdiff: remove unused flags parameter

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Strictly speaking, we might want to bump the C extension version number because of the ABI change. But I'm not sure if these functions are exported or even used by our C extension. So

D2773: hgweb: remove support for short query string based aliases (BC)

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 6818. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2773?vs=6817=6818 REVISION DETAIL https://phab.mercurial-scm.org/D2773 AFFECTED FILES mercurial/hgweb/request.py tests/test-hgweb-raw.t CHANGE DETAILS

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

2018-03-09 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 added a comment. Since the current code just overwrites message each time with the newer. What can be done to avoid losing the earlier message values? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2588 To: sangeet259, #hg-reviewers Cc: durin42,

D2765: xdiff: use int64 for hash table size

2018-03-09 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Follow-up of the previous "long" -> "int64" change. Now xdiff only uses int for return values and small integers (ex. booleans, shifting score, bits in hash table

D2762: xdiff: replace {unsigned ,}long with {u,}int64_t

2018-03-09 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY MSVC treats "long" as 4-byte. That could cause overflows since the xdiff code uses "long" in places where "size_t" or "ssize_t" should be used. Let's use explicit

D2763: xdiff: remove unused flags parameter

2018-03-09 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY After https://phab.mercurial-scm.org/D2683, the flags parameter in some functions is no longer needed. Thus removed. REPOSITORY rHG Mercurial REVISION DETAIL

D2685: xdiff: add comments for fields in xdfile_t

2018-03-09 Thread quark (Jun Wu)
quark updated this revision to Diff 6798. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2685?vs=6643=6798 REVISION DETAIL https://phab.mercurial-scm.org/D2685 AFFECTED FILES mercurial/thirdparty/xdiff/xtypes.h CHANGE DETAILS diff --git

D2686: xdiff: add a preprocessing step that trims files

2018-03-09 Thread quark (Jun Wu)
quark updated this revision to Diff 6797. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2686?vs=6708=6797 REVISION DETAIL https://phab.mercurial-scm.org/D2686 AFFECTED FILES mercurial/thirdparty/xdiff/xdiffi.c mercurial/thirdparty/xdiff/xprepare.c

D2766: xdiff: resolve signed unsigned comparison warning

2018-03-09 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since the value won't be changed inside the code (because context lines feature was removed by https://phab.mercurial-scm.org/D2705), let's just remove the

[PATCH 3 of 3] bdiff: convert more longs to int64_t

2018-03-09 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1520650747 18000 # Fri Mar 09 21:59:07 2018 -0500 # Node ID 09be2aeb8f5a364fab574ed3cf00bddbb7b9728a # Parent 1f313a913f4356f272ef275061d5d169d9c1690e bdiff: convert more longs to int64_t MSVC previously flagged

[PATCH 2 of 3] xdiff: silence a 32-bit shift warning on Windows

2018-03-09 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1520649753 18000 # Fri Mar 09 21:42:33 2018 -0500 # Node ID 1f313a913f4356f272ef275061d5d169d9c1690e # Parent d3b978ff5c3fc50b33b3ca8f6c371df23d46404b xdiff: silence a 32-bit shift warning on Windows It's probably

D2686: xdiff: add a preprocessing step that trims files

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I almost accepted the last version and this one is mostly cosmetic changes. So LGTM! Your work here is very much appreciated. Thank you for doing the thorough performance

D2763: xdiff: remove unused flags parameter

2018-03-09 Thread quark (Jun Wu)
quark added a comment. I don't think the Python ".so"s should be consumed by non-Python "dlopen". So "version" doesn't change since Python API remains the same. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2763 To: quark, #hg-reviewers, indygreg Cc:

D2774: hgweb: remove support for retrieving parameters from POST form data

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, we called out to cgi.parse(), which for POST requests parsed multipart/form-data and application/x-www-form-urlencoded Content-Type requests for

D2775: hgweb: create dedicated type for WSGI responses

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have refactored the request side of WSGI processing into a dedicated type. Now let's do the same thing for the response side. We invent a

D2773: hgweb: remove support for short query string based aliases (BC)

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 6820. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2773?vs=6818=6820 REVISION DETAIL https://phab.mercurial-scm.org/D2773 AFFECTED FILES mercurial/hgweb/request.py tests/test-hgweb-raw.t CHANGE DETAILS

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

2018-03-09 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY My intention with refactoring the WSGI code was to make it easier to read. I initially wanted to vendor and use WebOb, because it seems to be a pretty

[PATCH] forget: add --dry-run mode

2018-03-09 Thread Sushil khanchi
# HG changeset patch # User Sushil khanchi # Date 1520665399 -19800 # Sat Mar 10 12:33:19 2018 +0530 # Node ID 430c6b5123ee72d3a209882495302e43b26cc988 # Parent 4c71a26a4009d88590c9ae3d64a5912fd556d82e forget: add --dry-run mode diff -r 4c71a26a4009 -r

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

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D2588#44645, @sangeet259 wrote: > Since the current code just overwrites message each time with the newer. What can be done to avoid losing the earlier message values? You should look how we handle multiple `--rev` flags.

Re: [PATCH] forget: add --dry-run mode

2018-03-09 Thread Anton Shestakov
On Sat, 10 Mar 2018 15:42:04 +0800 Anton Shestakov wrote: > On Sat, 10 Mar 2018 12:46:41 +0530 > Sushil khanchi wrote: > > > # HG changeset patch > > # User Sushil khanchi > > # Date 1520665399 -19800 > > # Sat Mar

Re: [PATCH 1 of 8] hgk: stop using util.bytesinput() to read a single line from stdin

2018-03-09 Thread Yuya Nishihara
On Fri, 9 Mar 2018 09:25:10 -0800, Gregory Szorc wrote: > If you have this stdio stuff paged into your brain, you may want to look at > hook.py and what it is doing with stdio. Essentially, it is doing dup() and > dup2() to temporarily redirect stdout to stderr such that the wire protocol > can

[PATCH] ui: remove any combinations of CR|LF from prompt response

2018-03-09 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520664609 -32400 # Sat Mar 10 15:50:09 2018 +0900 # Node ID c38b2b364df79a9defc3520f19207ce47abcc7d8 # Parent 9ddc9aa26801bac571bd3413a8aed900c2d2efb8 ui: remove any combinations of CR|LF from prompt response On Windows, we

Re: [PATCH 6 of 8] ui: do not use rawinput() when we have to replace sys.stdin/stdout

2018-03-09 Thread Yuya Nishihara
On Fri, 09 Mar 2018 23:52:16 -0500, Matt Harbison wrote: > On Fri, 09 Mar 2018 07:35:39 -0500, Yuya Nishihara wrote: > > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1520325533 21600 > > # Tue Mar 06 02:38:53 2018 -0600 > > # Node ID

Re: [PATCH] forget: add --dry-run mode

2018-03-09 Thread Anton Shestakov
On Sat, 10 Mar 2018 12:46:41 +0530 Sushil khanchi wrote: > # HG changeset patch > # User Sushil khanchi > # Date 1520665399 -19800 > # Sat Mar 10 12:33:19 2018 +0530 > # Node ID 430c6b5123ee72d3a209882495302e43b26cc988 > # Parent

D2751: cbor: remove unrequired files and fix core test-check*

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch removes the unrequired files from the cbor library which are docs/, tests/, setup.py, setup.cfg, tox.ini. Also, this patch fixes couple of

D2750: thirdparty: start vendoring cbor python library

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY CBOR stands for Concise Binary Object Representation, which is a data format which is very compact and extensible. This patch moves the python library which

D2752: cbor: add a __init__.py to top level cbor module

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch also fixes import in cbor2/ to make them relative. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2752 AFFECTED FILES

D2593: state: add logic to parse the state file in old way if cbor fails

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6759. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2593?vs=6618=6759 REVISION DETAIL https://phab.mercurial-scm.org/D2593 AFFECTED FILES mercurial/state.py CHANGE DETAILS diff --git a/mercurial/state.py

D2595: graft: start using the new state file

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6761. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2595?vs=6620=6761 REVISION DETAIL https://phab.mercurial-scm.org/D2595 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D2594: graft: move logic to read current graft state file in state.py

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 6760. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2594?vs=6619=6760 REVISION DETAIL https://phab.mercurial-scm.org/D2594 AFFECTED FILES mercurial/commands.py mercurial/state.py CHANGE DETAILS diff --git

D2590: cbor: add a __init__.py to top level cbor module

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Superseded by https://phab.mercurial-scm.org/D2752. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2590 To: pulkit, #hg-reviewers Cc: durin42, mercurial-devel

D2640: cbor: remove tests files and fix core's test-check*

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Superseded by https://phab.mercurial-scm.org/D2751. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2640 To: pulkit, #hg-reviewers Cc: durin42, mercurial-devel

D2639: thirdparty: start vendoring cbor python library

2018-03-09 Thread pulkit (Pulkit Goyal)
pulkit added a comment. The library imported in this patch has known bugs and can result in segfaults when given nested structures. Also this library is unmaintained and does not supports sets. Therefore, we import a better maintained library which handles all the cases pretty well. This is

[PATCH 7 of 8] ui: adjust Windows workaround to new _readline() code

2018-03-09 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520325757 21600 # Tue Mar 06 02:42:37 2018 -0600 # Node ID 5ee522c20bc23701248014fa18e90f691f00aec8 # Parent ad7ff97565b261d82952acc9f941e5dd99f11374 ui: adjust Windows workaround to new _readline() code It's only needed

[PATCH 2 of 8] ui: inline util.bytesinput() into ui._readline()

2018-03-09 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520324051 21600 # Tue Mar 06 02:14:11 2018 -0600 # Node ID 0fc636a6f20d51e813b9117961ad18f0eb5f83fb # Parent f7d9876d750e048b4c0e0ec0682928e86a8e8ecb ui: inline util.bytesinput() into ui._readline() Prepares for rework of

[PATCH 5 of 8] ui: do not try readline support if fin/fout aren't standard streams

2018-03-09 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520325146 21600 # Tue Mar 06 02:32:26 2018 -0600 # Node ID 63a13b91e1ab4d9fa0a713935be58794b9cadab5 # Parent 10e3ea3d8b1dc671f6302ebed4489773c7d79458 ui: do not try readline support if fin/fout aren't standard streams It's

[PATCH 3 of 8] ui: add debug commands to test interactive prompt

2018-03-09 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520327149 21600 # Tue Mar 06 03:05:49 2018 -0600 # Node ID c9ac3a3b0a31abc37a76e5ae3be1b5f14a206cf3 # Parent 0fc636a6f20d51e813b9117961ad18f0eb5f83fb ui: add debug commands to test interactive prompt Interactive operations

[PATCH 6 of 8] ui: do not use rawinput() when we have to replace sys.stdin/stdout

2018-03-09 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520325533 21600 # Tue Mar 06 02:38:53 2018 -0600 # Node ID ad7ff97565b261d82952acc9f941e5dd99f11374 # Parent 63a13b91e1ab4d9fa0a713935be58794b9cadab5 ui: do not use rawinput() when we have to replace sys.stdin/stdout See the

  1   2   >