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

2018-03-03 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 updated this revision to Diff 6537. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2588?vs=6536=6537 REVISION DETAIL https://phab.mercurial-scm.org/D2588 AFFECTED FILES mercurial/fancyopts.py tests/test-commit.t CHANGE DETAILS diff

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

2018-03-03 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 added a comment. @jeffpc That means two new line. Shall I edit this then? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2588 To: sangeet259, #hg-reviewers Cc: jeffpc, mercurial-devel ___ Mercurial-devel

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

2018-03-03 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 updated this revision to Diff 6536. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2588?vs=6438=6536 REVISION DETAIL https://phab.mercurial-scm.org/D2588 AFFECTED FILES mercurial/fancyopts.py tests/test-commit.t CHANGE DETAILS diff

[PATCH] bdiff: avoid pointer arithmetic on void*

2018-03-03 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1520137780 18000 # Sat Mar 03 23:29:40 2018 -0500 # Node ID 8b9334b59784246d5a09bad537d6e15a0f190c97 # Parent 3f829cbdfe3a89c28c8807d3a933159fb2d93992 bdiff: avoid pointer arithmetic on void* MSVC 2008 complains:

D2634: [DRAFT] xdiff: avoid hashing trimmed lines

2018-03-03 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Things are a bit faster now: hg perfbdiff --count 3000 --blocks --xdiff .hg/store/data/mercurial/commands.py.i 1 # before ! wall 1.510821 comb

[PATCH 3 of 4 STABLE] subrepo: activate clone pooling to enable sharing with remote URLs

2018-03-03 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 151990 18000 # Thu Mar 01 11:37:00 2018 -0500 # Branch stable # Node ID f8882513decb64848575894d21b2829c5d1c8f7c # Parent e070bffa43b8dcfad366a4941a69f0d34805d548 subrepo: activate clone pooling to enable sharing

[PATCH 1 of 4 STABLE] test-subrepo: demonstrate problems with subrepo sharing and absolute paths

2018-03-03 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1519795767 18000 # Wed Feb 28 00:29:27 2018 -0500 # Branch stable # Node ID eca5075fdd5ec15e1a4917c0cadeb23e00feb2fe # Parent 0a7c59a4c8352b9277a9676708cf6a30d3e2e306 test-subrepo: demonstrate problems with subrepo

[PATCH 4 of 4 STABLE] test-subrepo: glob away an unstable hash

2018-03-03 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1520134164 18000 # Sat Mar 03 22:29:24 2018 -0500 # Branch stable # Node ID 564d66c2f7babd694a7c1da296574910763cd8b0 # Parent f8882513decb64848575894d21b2829c5d1c8f7c test-subrepo: glob away an unstable hash This is

[PATCH 2 of 4 STABLE] subrepo: don't attempt to share remote sources (issue5793)

2018-03-03 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1519920780 18000 # Thu Mar 01 11:13:00 2018 -0500 # Branch stable # Node ID e070bffa43b8dcfad366a4941a69f0d34805d548 # Parent eca5075fdd5ec15e1a4917c0cadeb23e00feb2fe subrepo: don't attempt to share remote sources

Re: [PATCH STABLE] annotate: do not poorly split lines at CR (issue5798)

2018-03-03 Thread Matt Harbison
On Wed, 21 Feb 2018 07:49:41 -0500, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1519215245 -32400 # Wed Feb 21 21:14:05 2018 +0900 # Branch stable # Node ID 24b17a714a92c8fe860db5f6d0d49c23293deec6 # Parent

D2632: fuzz: add a fuzzer for xdiff

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG38a81b88688b: fuzz: add a fuzzer for xdiff (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2632?vs=6531=6533 REVISION

D2633: fuzz: add a quick README to try and document how to test new fuzzers

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3f829cbdfe3a: fuzz: add a quick README to try and document how to test new fuzzers (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2632: fuzz: add a fuzzer for xdiff

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Based entirely on the fuzzer for bdiff. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2632 AFFECTED FILES contrib/fuzz/Makefile

D2633: fuzz: add a quick README to try and document how to test new fuzzers

2018-03-03 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/D2633 AFFECTED FILES contrib/fuzz/README.rst CHANGE DETAILS diff --git a/contrib/fuzz/README.rst

D2631: [RFC] xdiff: skip trimmed lines when preparing the hashtable

2018-03-03 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY NOTE: I'm still reading xdiffi.c to understand whether this is a safe optimization or not. xdiff has a "xdl_trim_ends" function that removes common prefix and

D2630: xdiff: move hashtable calculation to a separate function

2018-03-03 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before running the main diff algorithm, xdiff will "prepare" the contexts for both files. That includes splitting, hashing all the lines, and building hash tables

D2628: xdiff: expand xdl_optimize_ctxs

2018-03-03 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The function has 2 steps: trim_ends, and cleanup_records. We'll be inserting something in-between that is not "optimize", but "initialize". So expand the function

D2629: xdiff: do not rely on hashtable in xdl_trim_ends

2018-03-03 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Upcoming changes will narrow down the hashtable content to not include trimmed lines. So let's just compare line contents in `xdl_trim_ends`. It's still cheaper

D2626: xdiff: use xxhash in xdiff

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg added a comment. I can reproduce the results. xxhash needs more than 4-8 bytes to outperform the old hasher. I also suspect more hash collisions are present with xxhash. Although I haven't verified. The input showing the regression effectively turns the code into a hash table

D2626: xdiff: use xxhash in xdiff

2018-03-03 Thread quark (Jun Wu)
quark requested changes to this revision. quark added a comment. This revision now requires changes to proceed. It seems xxhash can make things slower if the line is short. ## test case open('a','w').write(''.join('%s\n' % (i % 10) for i in xrange(1000)))

D2626: xdiff: use xxhash in xdiff

2018-03-03 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. I think the perf win comes from less hash collisions. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2626 To: indygreg, #hg-reviewers, quark Cc: quark, mercurial-devel

D2627: xdiff: use memchr instead of character scanning

2018-03-03 Thread quark (Jun Wu)
quark added a comment. It seems `mdiff.textdiff` used by `perfbdiff` won't actually use xdiff. Maybe `perfunidiff --config experimental.xdiff=1` should be used instead? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2627 To: indygreg, #hg-reviewers, quark Cc:

D2625: xxhash: vendor external library

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY xxhash is a pretty fast non-cryptographically strong hashing function. We vendor the C library from Git commit 921182349a87760bfc016dcd54fa3136d4c8150d

D2627: xdiff: use memchr instead of character scanning

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Compilers (at least in the configuration used to build Mercurial) don't seem to be able to optimize a loop to look for a byte in a buffer very well. After

D2626: xdiff: use xxhash in xdiff

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Diffing functions split inputs into blocks, typically lines. When inspecting each block, the diffing function needs to see if two blocks are identical. Because

mercurial@36658: 2 new changesets

2018-03-03 Thread Mercurial Commits
2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/214f61abd865 changeset: 36657:214f61abd865 user:Yuya Nishihara date:Sat Mar 03 15:33:52 2018 -0500 summary: py3: back out c77c925987d7 to store bytes filename in IOError

D2608: templater: add hint to template parse errors to help locate issues

2018-03-03 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > templater.py:148 > elif c == term: > yield ('end', None, pos + 1) > return Perhaps this `pos + 1` is the reason why the error location is sometimes wrong. I'll send a follow up. REPOSITORY rHG Mercurial

mercurial@36656: 49 new changesets

2018-03-03 Thread Mercurial Commits
49 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/1151c731686e changeset: 36608:1151c731686e user:Gregory Szorc date:Fri Mar 02 18:50:49 2018 -0500 summary: sshpeer: don't read from stderr when that behavior is disabled

[PATCH] py3: make gettext domain a system string

2018-03-03 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520122367 18000 # Sat Mar 03 19:12:47 2018 -0500 # Node ID de317419d5babc9b88aa17664eed96e8d7f8dbe8 # Parent 1880fc2cbfc27c8b2fb0073f8aa9c0fa54937969 py3: make gettext domain a system string diff --git a/mercurial/i18n.py

D2623: dispatch: adding config items for overriding flag defaults

2018-03-03 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio added a comment. FYI this is a change I had previously sent to the list as 60b3222e01f96f91ece7eda9681a89bf3bb930a6, and Yuya reviewed . I just had never followed up on it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2623 To: rdamazio,

[PATCH] dispatch: don't clamp the range of the exit code twice

2018-03-03 Thread Kevin Bullock
# HG changeset patch # User Kevin Bullock # Date 1520121770 18000 # Sat Mar 03 19:02:50 2018 -0500 # Node ID 53daf5db6dada7eade4de6d4c328b78feb0425cf # Parent c1af0dc644d4c109efee03786aca819a8ac7775c dispatch: don't clamp the range of the exit code twice

[Bug 5810] New: warning about overridden commands when both evolve and serveronly are enabled

2018-03-03 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5810 Bug ID: 5810 Summary: warning about overridden commands when both evolve and serveronly are enabled Product: Mercurial Version: 4.4.2 Hardware: PC OS: Mac

D2623: dispatch: adding config items for overriding flag defaults

2018-03-03 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 6523. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2623?vs=6521=6523 REVISION DETAIL https://phab.mercurial-scm.org/D2623 AFFECTED FILES mercurial/configitems.py mercurial/dispatch.py mercurial/ui.py

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

2018-03-03 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/D2624 AFFECTED FILES contrib/perf.py CHANGE DETAILS diff --git a/contrib/perf.py b/contrib/perf.py

D2623: dispatch: adding config items for overriding flag defaults

2018-03-03 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This introduces the new defaults format "commandname.default.optionname" which directly overrides the default of the option, instead of prepending the

D2622: ui: adding a generic method to read config items with an arbitrary type

2018-03-03 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This can be used for reading many config options of various types where the type of each is known in some other structure (e.g. options matching command

D2621: tests: port test-log to Python 3

2018-03-03 Thread pulkit (Pulkit Goyal)
pulkit requested changes to this revision. pulkit added a comment. This revision now requires changes to proceed. Sorry, but this does not passes for me on Python 3.5 Do we consider supporting that? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2621 To:

D2068: revlog: do not use delta for lfs revisions

2018-03-03 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > ryanmce wrote in revlog.py:2110 > Then why is this `REVIDX_KNOWN_FLAGS` and not `REVIDX_RAWTEXT_CHANGING_FLAGS`? > > Given the number of questions here from me and others, I think the comment > could use extension at least so future readers

D2603: mdiff: add a config option to use xdiff algorithm

2018-03-03 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9b51ac874d90: mdiff: add a config option to use xdiff algorithm (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2604: tests: add tests about diff quality

2018-03-03 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc1af0dc644d4: tests: add tests about diff quality (authored by quark, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2604?vs=6481=6519#toc REPOSITORY rHG Mercurial CHANGES

D2605: run-tests: allow #require inside #if

2018-03-03 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4e82b6f33e10: run-tests: allow #require inside #if (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2605?vs=6478=6518 REVISION

D2573: xdiff: remove patience and histogram diff algorithms

2018-03-03 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3ee9ca23dad0: xdiff: remove patience and histogram diff algorithms (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2601: xdiff: reduce indent heuristic overhead

2018-03-03 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9f2597a6620e: xdiff: reduce indent heuristic overhead (authored by quark, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2601?vs=6475=6515#toc REPOSITORY rHG Mercurial

D2602: bdiff: add a xdiffblocks method

2018-03-03 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd74589c85f5e: bdiff: add a xdiffblocks method (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2602?vs=6480=6516 REVISION

D2621: tests: port test-log to Python 3

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Required some porting to >>> inline Python instead of using heredocs into $PYTHON. REPOSITORY rHG Mercurial REVISION DETAIL

D2575: xdiff: add a bdiff hunk mode

2018-03-03 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3c56c4d26527: xdiff: add a bdiff hunk mode (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2575?vs=6474=6514 REVISION DETAIL

D2608: templater: add hint to template parse errors to help locate issues

2018-03-03 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8df20b7a39d2: templater: add hint to template parse errors to help locate issues (authored by ryanmce, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2608?vs=6485=6509#toc

D2609: templater: provide hint for multi-line templates with parse errors

2018-03-03 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5d1bae328b7d: templater: provide hint for multi-line templates with parse errors (authored by ryanmce, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2609?vs=6487=6510#toc

Re: [PATCH v2] fancyopts: making config defaults actually override defaults

2018-03-03 Thread Rodrigo Damazio via Mercurial-devel
FYI I'm getting back to this old patch, but I'll send it through phabricator this time. On Sat, Apr 1, 2017 at 11:07 AM, Yuya Nishihara wrote: > On Fri, 24 Mar 2017 00:32:00 -0700, Rodrigo Damazio Bovendorp via > Mercurial-devel wrote: > > # HG changeset patch > > # User Rodrigo

D2619: revsetlang: add a hint for more useful parse errors

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This logic is largely based on the similar logic added to template error messages in https://phab.mercurial-scm.org/D2608 and

D2618: py3: use b"%d" to covert integer to bytes instead of str

2018-03-03 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe73e1f76b253: py3: use b%d to covert integer to bytes instead of str (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2617: py3: use bytes() instead of str()

2018-03-03 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9d8ac10da5ce: py3: use bytes() instead of str() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2617?vs=6501=6505 REVISION

D2616: py3: replace __str__ to __bytes__ in hgext/journal.py

2018-03-03 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG148f64bcb6de: py3: replace __str__ to __bytes__ in hgext/journal.py (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2615: testrunner: add option to sort tests by previous run time

2018-03-03 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3f502b22ba1d: testrunner: add option to sort tests by previous run time (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2618: py3: use b"%d" to covert integer to bytes instead of str

2018-03-03 Thread pulkit (Pulkit Goyal)
pulkit 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/D2618 AFFECTED FILES hgext/journal.py hgext/mq.py hgext/patchbomb.py hgext/schemes.py CHANGE

D2616: py3: replace __str__ to __bytes__ in hgext/journal.py

2018-03-03 Thread pulkit (Pulkit Goyal)
pulkit 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/D2616 AFFECTED FILES hgext/journal.py CHANGE DETAILS diff --git a/hgext/journal.py b/hgext/journal.py

D2617: py3: use bytes() instead of str()

2018-03-03 Thread pulkit (Pulkit Goyal)
pulkit 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/D2617 AFFECTED FILES hgext/eol.py hgext/journal.py hgext/mq.py CHANGE DETAILS diff --git

D2613: cmdutil: ensure PatchError messages are coerded to bytes, not str

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2dce0049176c: cmdutil: ensure PatchError messages are coerded to bytes, not str (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2612: tests: fix bytes literals in test-fncache.t

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3715a5ffcf92: tests: fix bytes literals in test-fncache.t (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2612?vs=6490=6496

D2614: py3: whitelist another 15 passing tests

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6f9442c6b404: py3: whitelist another 15 passing tests (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2614?vs=6492=6497

D2611: scmutil: avoid using basestring and add explicit handling of unicodes

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb76248e51605: scmutil: avoid using basestring and add explicit handling of unicodes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2610: tests: fix inline extension bytes in test-ssh-proto-unbundle.t

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG11b279a75bf1: tests: fix inline extension bytes in test-ssh-proto-unbundle.t (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2607: hghave: fix up clang-libfuzzer regex to be bytes

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGdc11f257ad1d: hghave: fix up clang-libfuzzer regex to be bytes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2614: py3: whitelist another 15 passing tests

2018-03-03 Thread pulkit (Pulkit Goyal)
pulkit added a comment. yayay REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2614 To: durin42, pulkit, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel

D2611: scmutil: avoid using basestring and add explicit handling of unicodes

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This resolves some Python 3 defects, and I don't think it is a meaningful behavior change in Python 2. REPOSITORY rHG Mercurial REVISION DETAIL

D2610: tests: fix inline extension bytes in test-ssh-proto-unbundle.t

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame just b prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2610 AFFECTED FILES tests/test-ssh-proto-unbundle.t

D2613: cmdutil: ensure PatchError messages are coerded to bytes, not str

2018-03-03 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/D2613 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py

D2614: py3: whitelist another 15 passing tests

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2614 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff

D2612: tests: fix bytes literals in test-fncache.t

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame just b prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2612 AFFECTED FILES tests/test-fncache.t CHANGE

D2609: templater: provide hint for multi-line templates with parse errors

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce updated this revision to Diff 6487. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2609?vs=6486=6487 REVISION DETAIL https://phab.mercurial-scm.org/D2609 AFFECTED FILES mercurial/templater.py tests/test-parse-errors.t CHANGE DETAILS diff

D2608: templater: add hint to template parse errors to help locate issues

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce updated this revision to Diff 6485. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2608?vs=6484=6485 REVISION DETAIL https://phab.mercurial-scm.org/D2608 AFFECTED FILES mercurial/templater.py tests/test-command-template.t

D2609: templater: provide hint for multi-line templates with parse errors

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, we punted. Now we "rewrite" the template's newlines to r'\n' and offset the hint appropriately. REPOSITORY rHG Mercurial REVISION DETAIL

D2608: templater: add hint to template parse errors to help locate issues

2018-03-03 Thread pulkit (Pulkit Goyal)
pulkit added a comment. I like similar things in rust too. I am +1 on this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2608 To: ryanmce, #hg-reviewers, durin42 Cc: pulkit, durin42, mercurial-devel ___

D2607: hghave: fix up clang-libfuzzer regex to be bytes

2018-03-03 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > hghave.py:265 > return True > return matchoutput('hg --version --quiet 2>&1', 'Mercurial Distributed > SCM') > Since you are here, can you get this one and next call to matchoutput fixed too? REPOSITORY rHG Mercurial REVISION

D2608: templater: add hint to template parse errors to help locate issues

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce updated this revision to Diff 6484. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2608?vs=6483=6484 REVISION DETAIL https://phab.mercurial-scm.org/D2608 AFFECTED FILES mercurial/templater.py tests/test-command-template.t

D2608: templater: add hint to template parse errors to help locate issues

2018-03-03 Thread durin42 (Augie Fackler)
durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. We should add a test about templates that contain newlines - it's probably Hard, so feel free to just not be helpful with newline-containing templates for now? INLINE COMMENTS

D2608: templater: add hint to template parse errors to help locate issues

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, we would print the error name and location, but this isn't as helpful as we can be. Let's add a hint that shows the location where we encountered

D2607: hghave: fix up clang-libfuzzer regex to be bytes

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes this check on Python 3. 1. skip-blame just a b prefix REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2607 AFFECTED FILES

D2604: tests: add tests about diff quality

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6481. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2604?vs=6468=6481 REVISION DETAIL https://phab.mercurial-scm.org/D2604 AFFECTED FILES tests/hghave.py tests/test-diff-antipatience.t

D2602: bdiff: add a xdiffblocks method

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6480. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2602?vs=6476=6480 REVISION DETAIL https://phab.mercurial-scm.org/D2602 AFFECTED FILES mercurial/cext/bdiff.c mercurial/policy.py setup.py CHANGE DETAILS

D2602: bdiff: add a xdiffblocks method

2018-03-03 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > indygreg wrote in bdiff.c:239 > Calling `PyList_Append()` in tight loops can be a bit slow. It is faster to > allocate an array of `PyObject` and then allocate a `PyList` of final size > and call `PyList_SET_ITEM` to populate it. But we can

D2602: bdiff: add a xdiffblocks method

2018-03-03 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > indygreg wrote in bdiff.c:263 > Does our C standard level allow to declare variables after non-declarations > in blocks? Not sure. But the rest is C89. So I'll move this up. > indygreg wrote in bdiff.c:283 > This exception type is nonsensical.

D2604: tests: add tests about diff quality

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. Can you please fix the Python 3 compatibility issues? If you want to push back, we can do it as a follow-up. INLINE COMMENTS > test-diff-antipatience.t:14 > + $ hg init > +

Re: [PATCH 2 of 2] py3: accept both unicode and byte strings as filename carried by IOError

2018-03-03 Thread Augie Fackler
On Sat, Mar 03, 2018 at 03:52:41PM -0500, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1520109672 18000 > # Sat Mar 03 15:41:12 2018 -0500 > # Node ID 1880fc2cbfc27c8b2fb0073f8aa9c0fa54937969 > # Parent 8e3fd6529bad7f4d524f160761c766a7f5267a0f

D2573: xdiff: remove patience and histogram diff algorithms

2018-03-03 Thread quark (Jun Wu)
quark added a comment. Googling "patience diff", most results will say it is slower but has better diff quality sometimes. That is very misleading - the algorithm adds greediness (i.e. incorrectness) and is in theory faster in some cases. The "better" quality is also untrue comparing

D2602: bdiff: add a xdiffblocks method

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > bdiff.c:239 > + return -1; > + if (PyList_Append(rl, m) != 0) { > + Py_DECREF(m); Calling `PyList_Append()` in tight loops can be a bit

mercurial@36607: 28 new changesets

2018-03-03 Thread Mercurial Commits
28 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/04e50037d957 changeset: 36580:04e50037d957 user:Augie Fackler date:Fri Mar 02 11:37:21 2018 -0500 summary: revset: use {force,}bytestr to fix some %r formatting issues

D2606: largefiles: headers and values need to be sysstrs, add r prefixes

2018-03-03 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5c4c9eb1feb6: largefiles: headers and values need to be sysstrs, add r prefixes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH 1 of 2] py3: back out c77c925987d7 to store bytes filename in IOError

2018-03-03 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520109232 18000 # Sat Mar 03 15:33:52 2018 -0500 # Node ID 8e3fd6529bad7f4d524f160761c766a7f5267a0f # Parent 68026dd7c4f9bf1462c15a2a307d4bb253a0959f py3: back out c77c925987d7 to store bytes filename in IOError Appears that

[PATCH 2 of 2] py3: accept both unicode and byte strings as filename carried by IOError

2018-03-03 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520109672 18000 # Sat Mar 03 15:41:12 2018 -0500 # Node ID 1880fc2cbfc27c8b2fb0073f8aa9c0fa54937969 # Parent 8e3fd6529bad7f4d524f160761c766a7f5267a0f py3: accept both unicode and byte strings as filename carried by IOError

D2573: xdiff: remove patience and histogram diff algorithms

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg accepted this revision as: indygreg. indygreg added a comment. I'm leaning towards keeping these algorithms so we can expose them as alternate implementations in the future. It will also making syncing code from upstream easier. But removing the unused-by-us code is fine.

D2572: xdiff: vendor xdiff library from git

2018-03-03 Thread indygreg (Gregory Szorc)
indygreg accepted this revision as: indygreg. indygreg added a comment. I'm OK taking this provided we set up fuzzers in contrib/fuzz. We can do that post landing though. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2572 To: ryanmce, #hg-reviewers, indygreg

D2605: run-tests: allow #require inside #if

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6478. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2605?vs=6467=6478 REVISION DETAIL https://phab.mercurial-scm.org/D2605 AFFECTED FILES tests/run-tests.py tests/test-run-tests.t CHANGE DETAILS diff --git

D2606: largefiles: headers and values need to be sysstrs, add r prefixes

2018-03-03 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame just some r prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2606 AFFECTED FILES hgext/largefiles/proto.py

D2601: xdiff: reduce indent heuristic overhead

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6475. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2601?vs=6458=6475 REVISION DETAIL https://phab.mercurial-scm.org/D2601 AFFECTED FILES mercurial/thirdparty/xdiff/xdiffi.c CHANGE DETAILS diff --git

D2602: bdiff: add a xdiffblocks method

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6476. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2602?vs=6459=6476 REVISION DETAIL https://phab.mercurial-scm.org/D2602 AFFECTED FILES mercurial/cext/bdiff.c mercurial/policy.py setup.py CHANGE DETAILS

D2573: xdiff: remove patience and histogram diff algorithms

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

D2575: xdiff: add a bdiff hunk mode

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

D2068: revlog: do not use delta for lfs revisions

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6470. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2068?vs=5651=6470 REVISION DETAIL https://phab.mercurial-scm.org/D2068 AFFECTED FILES mercurial/revlog.py tests/test-lfs-bundle.t tests/test-revlog-raw.py

D2067: changegroup: do not delta lfs revisions

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6469. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2067?vs=5650=6469 REVISION DETAIL https://phab.mercurial-scm.org/D2067 AFFECTED FILES mercurial/changegroup.py mercurial/revlog.py tests/test-lfs-bundle.t

  1   2   3   >