D5779: copyright: update to 2019

2019-01-30 Thread av6 (Anton Shestakov)
av6 added a comment. Intended for stable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5779 To: av6, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D5744: commit: ignore diff whitespace settings when doing `commit -i` (issue5839)

2019-01-30 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. Sorry for bumping this up. I worked on a similar issue on https://phab.mercurial-scm.org/D5490. My initial revision was similar to this one. @spectral Don't you think it'll affect record extension which was written with zero test coverage? Please don't feel

D5779: copyright: update to 2019

2019-01-30 Thread av6 (Anton Shestakov)
av6 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/D5779 AFFECTED FILES contrib/packaging/debian/copyright contrib/win32/ReadMe.html

[PATCH 2 of 2 STABLE V2 STABLE] revlog: make sure we never use sparserevlog without general delta (issue6056)

2019-01-30 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1548372167 18000 # Thu Jan 24 18:22:47 2019 -0500 # Branch stable # Node ID 8e4137a7d6715c554f3689d48fd1c4b3101985ff # Parent cf5421ca2bea707ce52fc96f5ca68cf8f4894e8c # EXP-Topic issue6056 # Available At

[PATCH 1 of 2 STABLE V2 STABLE] sparserevlog: document the config option

2019-01-30 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1548868538 -3600 # Wed Jan 30 18:15:38 2019 +0100 # Branch stable # Node ID cf5421ca2bea707ce52fc96f5ca68cf8f4894e8c # Parent ab0d762d89ef6e2fdcf2a4cc31e9889ea04bc13b # EXP-Topic issue6056 # Available At

[PATCH] run-tests: sort the skip, failure and error lists in the final output

2019-01-30 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1548894031 18000 # Wed Jan 30 19:20:31 2019 -0500 # Node ID 5380290f1f11face5e58428cdb389eb7245969ba # Parent 4a2c8ec90a28542cbccc155fc6ddf60fe0a8d1dc run-tests: sort the skip, failure and error lists in the final output This will help keep

D5778: svnurlof: fix check-code errors I introduced

2019-01-30 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/D5778 AFFECTED FILES tests/svnurlof.py CHANGE DETAILS diff --git a/tests/svnurlof.py

D5774: subrepo: clean up lingering bytes/str issues in svn support

2019-01-30 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 13636. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5774?vs=13629=13636 REVISION DETAIL https://phab.mercurial-scm.org/D5774 AFFECTED FILES mercurial/subrepo.py CHANGE DETAILS diff --git

D5772: hg: raise Abort on invalid path

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2fe2f1ba596d: hg: raise Abort on invalid path (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5772?vs=13627=13637 REVISION

[Bug 6067] New: zsh tab completions for `hg resolve -m` don't work in a subdir

2019-01-30 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6067 Bug ID: 6067 Summary: zsh tab completions for `hg resolve -m` don't work in a subdir Product: Mercurial Version: unspecified Hardware: PC OS: Linux

D5773: tests: add Python 3 output for test-remotefilelog-gc.t

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG161d3c0d7dbc: tests: add Python 3 output for test-remotefilelog-gc.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5777: grep: respect ui.relative-paths

2019-01-30 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/D5777 AFFECTED FILES mercurial/commands.py tests/test-grep.t CHANGE DETAILS diff --git

D5748: resolve: respect ui.relative-paths

2019-01-30 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13633. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5748?vs=13577=13633 REVISION DETAIL https://phab.mercurial-scm.org/D5748 AFFECTED FILES mercurial/commands.py tests/test-resolve.t CHANGE DETAILS diff

D5776: grep: move writing of path outside of column loop

2019-01-30 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will make the next patch simpler. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5776 AFFECTED FILES

D5747: merge: respect ui.relative-paths

2019-01-30 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13632. martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5747?vs=13576=13632 REVISION DETAIL https://phab.mercurial-scm.org/D5747 AFFECTED FILES

D5775: tweakdefaults: set ui.relative-paths instead of command.status.relative

2019-01-30 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/D5775 AFFECTED FILES mercurial/ui.py CHANGE DETAILS diff --git a/mercurial/ui.py b/mercurial/ui.py

D5769: tests: alter email `From` line to a value that's consistently parsed

2019-01-30 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 13630. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5769?vs=13624=13630 REVISION DETAIL https://phab.mercurial-scm.org/D5769 AFFECTED FILES contrib/python3-whitelist tests/test-import-git.t CHANGE DETAILS

D5774: subrepo: clean up lingering bytes/str issues in svn support

2019-01-30 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Path encoding is a little suspect in here, but it's not worse than it was when we were on Python 2 only. Subversion subrepo tests now pass in Python 3.

D5749: hgweb: log error before attempting I/O

2019-01-30 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. In https://phab.mercurial-scm.org/D5749#84640, @indygreg wrote: > @durin42 and I were both able to produce intermittent failures with this change. Why, I'm not sure. > > Does the Windows regression occur with this patch or with

D5772: hg: raise Abort on invalid path

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Currently, some os.path functions when opening repositories may raise an uncaught TypeError or ValueError if the path is invalid. Let's catch these

D5773: tests: add Python 3 output for test-remotefilelog-gc.t

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Python 3 raises a slightly different error on invalid paths. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5773

D5768: subrepo: bytes/str cleanups on Git support

2019-01-30 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8b6a9ae832f1: subrepo: bytes/str cleanups on Git support (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5768?vs=13623=13626

D5767: subrepo: clean up lingering bytes/str issues in svn support

2019-01-30 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0a322005f8a0: subrepo: clean up lingering bytes/str issues in svn support (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5771: tests: compare against a bytes in test-lock.py

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb535062c91bd: tests: compare against a bytes in test-lock.py (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5767: subrepo: clean up lingering bytes/str issues in svn support

2019-01-30 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 13622. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5767?vs=13614=13622 REVISION DETAIL https://phab.mercurial-scm.org/D5767 AFFECTED FILES contrib/python3-whitelist mercurial/subrepo.py CHANGE DETAILS diff

D5768: subrepo: bytes/str cleanups on Git support

2019-01-30 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 13623. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5768?vs=13615=13623 REVISION DETAIL https://phab.mercurial-scm.org/D5768 AFFECTED FILES contrib/python3-whitelist mercurial/subrepo.py CHANGE DETAILS diff

D5769: tests: alter email `From` line to a value that's consistently parsed

2019-01-30 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 13624. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5769?vs=13619=13624 REVISION DETAIL https://phab.mercurial-scm.org/D5769 AFFECTED FILES contrib/python3-whitelist tests/test-import-git.t CHANGE DETAILS

D5770: tests: perform a shallow copy instead of a deep copy

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9701bac56c46: tests: perform a shallow copy instead of a deep copy (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5771: tests: compare against a bytes in test-lock.py

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY skip-blame: just b'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5771 AFFECTED FILES

D5770: tests: perform a shallow copy instead of a deep copy

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Python 3 can't perform a deep copy because it looks like symbols in the locals() namespace are not deep-copyable. For the curious, somehow the deepcopy() is

D5769: tests: alter email `From` line to a value that's consistently parsed

2019-01-30 Thread durin42 (Augie Fackler)
durin42 planned changes to this revision. durin42 added a comment. Oops. I'll be back to this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5769 To: durin42, pulkit, #hg-reviewers Cc: mercurial-devel ___

D5769: tests: alter email `From` line to a value that's consistently parsed

2019-01-30 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 Python2: >>> email.header.decode_header('=?UTF-8?q?Rapha=C3=ABl=20Hertzog?= ') [('Rapha\xc3\xabl Hertzog', 'utf-8'),

D5768: subrepo: bytes/str cleanups on Git support

2019-01-30 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 Git subrepo tests now pass on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5768

D5767: subrepo: clean up lingering bytes/str issues in svn support

2019-01-30 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 I've decided to use fsencode instead of utf8 for turning Subversion paths into native paths. I don't really know which one is

D5766: tests: make and use a new `svnurlof.py` helper for constructing svn urls

2019-01-30 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG41bd254b6de4: tests: make and use a new `svnurlof.py` helper for constructing svn urls (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5764: server: skip logging of ECONNRESET

2019-01-30 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG39bac0bdcddf: server: skip logging of ECONNRESET (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5764?vs=13608=13612

D5765: git: a little pycompat.bytestring() love to make this code work in py3

2019-01-30 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1c8943653458: git: a little pycompat.bytestring() love to make this code work in py3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5749: hgweb: log error before attempting I/O

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg added a subscriber: durin42. indygreg added a comment. @durin42 and I were both able to produce intermittent failures with this change. Why, I'm not sure. Does the Windows regression occur with this patch or with https://phab.mercurial-scm.org/D5751? I ask because the behavior

D5749: hgweb: log error before attempting I/O

2019-01-30 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. While this is better, it triggers a few failures on Windows. I've seen these connection resets with `hg serve` outside of the test harness. Any ideas? It almost seems like the client is closing the socket before all of the data is sent. (This failure occurs

D5766: tests: make and use a new `svnurlof.py` helper for constructing svn urls

2019-01-30 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The previous trick of a Python oneliner and some subshells is too hard to make portable, and this lets us consolidate some Windows-specific logic down

D5765: git: a little pycompat.bytestring() love to make this code work in py3

2019-01-30 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/D5765 AFFECTED FILES contrib/python3-whitelist hgext/convert/git.py

mercurial@41445: 54 new changesets

2019-01-30 Thread Mercurial Commits
54 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b80af0707066 changeset: 41392:b80af0707066 user:Martin von Zweigbergk date:Tue Jan 15 11:16:42 2019 -0800 summary: copies: consider nullrev a common ancestor

D5764: server: skip logging of ECONNRESET

2019-01-30 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I believe this was exposed by https://phab.mercurial-scm.org/rHG5492dc207cb5f1bdc2f2faa26bee65cb72cf1d93, because the sending of the 500 would have already

Re: [PATCH] py3: use codecs.decode() to decode a hex string in wireprotov1server

2019-01-30 Thread Yuya Nishihara
On Wed, 30 Jan 2019 15:46:29 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1548875230 18000 > # Wed Jan 30 14:07:10 2019 -0500 > # Node ID 22b3fe02a9646329df57ede04abaa23490970131 > # Parent 1a4a41d39dfc154a2df8accdf1760e04244628e4 > py3: use

Re: [PATCH STABLE] revlog: make sure we never use sparserevlog without general delta (issue6056)

2019-01-30 Thread Yuya Nishihara
On Wed, 30 Jan 2019 14:18:29 -0500, Boris FELD wrote: > On 29/01/2019 07:11, Yuya Nishihara wrote: > > On Tue, 29 Jan 2019 09:25:34 +0100, Mathias De Maré wrote: > >> On Mon, Jan 28, 2019 at 1:21 PM Yuya Nishihara wrote: > >>> On Fri, 25 Jan 2019 15:00:52 -0500, Boris Feld wrote: > # HG

D5761: py3: fix up test-remotefilelog-cacheprocess.t to not depend on a repr

2019-01-30 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGee51cde26714: py3: fix up test-remotefilelog-cacheprocess.t to not depend on a repr (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[Bug 6066] New: rebase can lead to AttributeError

2019-01-30 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6066 Bug ID: 6066 Summary: rebase can lead to AttributeError Product: Mercurial Version: 4.9rc0 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature

D5763: py3: have test-revset2.t write test scripts in a more portable way

2019-01-30 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: pulkit. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes the test on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5763 AFFECTED

D5760: remotefilelog: cast division result to an int

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG46d9f248303d: remotefilelog: cast division result to an int (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5759: tests: cast division result to int

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa3916dc2b37a: tests: cast division result to int (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5759?vs=13596=13603

D5757: tests: use items() in test-remotefilelog-datapack.py

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG59854e657999: tests: use items() in test-remotefilelog-datapack.py (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5756: tests: use bytes and %d formatting in test-remotefilelog-datapack.py

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5aa3fe343042: tests: use bytes and %d formatting in test-remotefilelog-datapack.py (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5762: tests: give up and make setsockopt() calls optional in the output

2019-01-30 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I can't figure out what causes these calls to happen or not, and I weary of dealing with them. End the madness for now by marking them all as optional

D5761: py3: fix up test-remotefilelog-cacheprocess.t to not depend on a repr

2019-01-30 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It looks like the repr() of Exceptions is different from Python 2 to Python 3.7 (but not 3.5?), but the str() is still stable. Sigh. REPOSITORY rHG Mercurial

D5760: remotefilelog: cast division result to an int

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise mid is a float and this confuses __slice__ on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL

D5759: tests: cast division result to int

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise it is a float on Python 3 and code later compares about casting a float to an int. REPOSITORY rHG Mercurial REVISION DETAIL

D5758: tests: various Python 3 ports for test-remotefilelog-datapack.py

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Use bytes I/O. Use byteschr(). Convert temporary path to bytes. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5758 AFFECTED FILES

D5757: tests: use items() in test-remotefilelog-datapack.py

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Performance doesn't matter in tests. iteritems() doesn't exist in Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5757

D5756: tests: use bytes and %d formatting in test-remotefilelog-datapack.py

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There were numerous failures on Python 3 due to str/bytes mismatch and '%s' not working for ints. REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH 2 of 2 V2] perf: add a --[no-]clear-caches option to `perfnodemap`

2019-01-30 Thread Augie Fackler
queued, thanks > On Jan 29, 2019, at 10:47, Boris Feld wrote: > > # HG changeset patch > # User Boris Feld > # Date 1548664893 18000 > # Mon Jan 28 03:41:33 2019 -0500 > # Node ID 4ecd8c3fa0df874dcae358025c160b0bbbaf57d1 > # Parent 3414a69b2e99e8fa605f63f9973894c80dd144b3 > # EXP-Topic

D5755: wireprotov1server: use binascii.unhexlify

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfb28dc97e38f: wireprotov1server: use binascii.unhexlify (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5755?vs=13584=13592

D5754: tests: conditionalize test-http-bad-server.t for Python 3.5

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb13280f7fead: tests: conditionalize test-http-bad-server.t for Python 3.5 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5753: tests: log sendall() operations and port test-http-bad-server.t

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb51bfea22923: tests: log sendall() operations and port test-http-bad-server.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5752: tests: glob away readline(-1)

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3d755e360736: tests: glob away readline(-1) (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5752?vs=13581=13589 REVISION

D5751: tests: change how sockets are closed

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG889d115db0de: tests: change how sockets are closed (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5751?vs=13585=13588

D5749: hgweb: log error before attempting I/O

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5492dc207cb5: hgweb: log error before attempting I/O (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5749?vs=13578=13586

D5750: tests: add b'' prefixes to badserverext.py

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGdd659113ca1c: tests: add b prefixes to badserverext.py (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5750?vs=13579=13587

D5751: tests: change how sockets are closed

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 13585. Herald added a subscriber: mjpieters. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5751?vs=13580=13585 REVISION DETAIL https://phab.mercurial-scm.org/D5751 AFFECTED FILES tests/badserverext.py CHANGE

D5751: tests: change how sockets are closed

2019-01-30 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > badserverext.py:140 > +# object wrapper. > +if sys.version_info[0] >= 3: > +orig = object.__getattribute__(self, '_orig') pycompat.ispy3 REPOSITORY rHG Mercurial REVISION DETAIL

D5755: wireprotov1server: use binascii.unhexlify

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The "hex" codec doesn't exist in Python 3. We could use `codecs.decode(h, 'hex_codec')`. But `binascii.unhexlify()` exists and

D5753: tests: log sendall() operations and port test-http-bad-server.t

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Python 3's HTTP server layer buffers output and uses sendall() instead of write(). In order to make test-http-bad-server.t pass on Python 3, we

D5754: tests: conditionalize test-http-bad-server.t for Python 3.5

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: pulkit. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It appears that Python 3 introduced output buffering in the HTTP response stack. And Python 3.6 switched from

D5751: tests: change how sockets are closed

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Python 3 uses a different type to represent a socket file object than Python 2. We need to conditionalize how the socket is closed accordingly. While

D5752: tests: glob away readline(-1)

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Most of these are readline(65537) on Python 3. I don't think it is worth the readability hit to use (re), as it would require escaping parenthesis. REPOSITORY

D5749: hgweb: log error before attempting I/O

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, an uncaught exception during HTTP request serving would attempt to send an error response then log the exception. If an exception occurred

D5750: tests: add b'' prefixes to badserverext.py

2019-01-30 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This avoids a handful of failures due to missing str and bytes. 1. skip-blame: just a bunch of b'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL

[PATCH] py3: use codecs.decode() to decode a hex string in wireprotov1server

2019-01-30 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1548875230 18000 # Wed Jan 30 14:07:10 2019 -0500 # Node ID 22b3fe02a9646329df57ede04abaa23490970131 # Parent 1a4a41d39dfc154a2df8accdf1760e04244628e4 py3: use codecs.decode() to decode a hex string in wireprotov1server Previously, a clone

D5746: status: introduce higher-level ui.relative-paths

2019-01-30 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/D5746 AFFECTED FILES mercurial/commands.py mercurial/configitems.py mercurial/help/config.txt

D5747: merge: respect ui.relative-paths

2019-01-30 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. I'll add some tests to this soon. I created the review early just so I can get feedback. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5747 To: martinvonz, #hg-reviewers Cc: mercurial-devel

D5748: resolve: respect ui.relative-paths

2019-01-30 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/D5748 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D5745: status: extract helper for producing relative or absolute path for UI

2019-01-30 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I put the helper in scmutil so it can be used by most modules. I would have put it in utils.pathutil, but I think that's supposed to be unaware of repos.

D5747: merge: respect ui.relative-paths

2019-01-30 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/D5747 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

Re: [PATCH STABLE] revlog: make sure we never use sparserevlog without general delta (issue6056)

2019-01-30 Thread Boris FELD
On 29/01/2019 07:11, Yuya Nishihara wrote: > On Tue, 29 Jan 2019 09:25:34 +0100, Mathias De Maré wrote: >> On Mon, Jan 28, 2019 at 1:21 PM Yuya Nishihara wrote: >>> On Fri, 25 Jan 2019 15:00:52 -0500, Boris Feld wrote: # HG changeset patch # User Boris Feld # Date 1548372167 18000

D5741: tests: write commit message using file I/O

2019-01-30 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8dd0680d16cf: tests: write commit message using file I/O (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH STABLE] revlog: make sure we never use sparserevlog without general delta (issue6056)

2019-01-30 Thread Boris FELD
On 29/01/2019 13:41, Gregory Szorc wrote: > On Tue, Jan 29, 2019 at 3:44 AM Yuya Nishihara > wrote: > > On Mon, 28 Jan 2019 21:20:07 +0900, Yuya Nishihara wrote: > > On Fri, 25 Jan 2019 15:00:52 -0500, Boris Feld wrote: > > > # HG changeset patch > > > #

D5538: hgweb: add /obsgraph page that shows obsolescence history of a changeset (PoC)

2019-01-30 Thread av6 (Anton Shestakov)
av6 abandoned this revision. av6 added a comment. Okay then, I'll work on a non-PoC version of this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5538 To: av6, #hg-reviewers Cc: durin42, mjpieters, mercurial-devel

D5742: histedit: add templating support to histedit's rule file generation

2019-01-30 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 13570. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5742?vs=13565=13570 REVISION DETAIL https://phab.mercurial-scm.org/D5742 AFFECTED FILES hgext/histedit.py mercurial/help.py tests/test-histedit-commute.t

D5740: py3: pass str into RuntimeError() to prevent b'' in output

2019-01-30 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1a4a41d39dfc: py3: pass str into RuntimeError() to prevent b in output (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5738: py3: use '%d' instead of '%s' for integers

2019-01-30 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa03d20e36194: py3: use %d instead of %s for integers (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5738?vs=13560=13568

D5739: py3: use pycompat.bytestr() so that slicing does not result in ascii values

2019-01-30 Thread yuja (Yuya Nishihara)
yuja added a comment. > command.append('l') > for arg in args: > > - command += "%d:%s" % (len(arg), arg) +command += pycompat.bytestr("%d:%s" % (len(arg), arg)) It's okay, but I think the original code would mean to do `command.append(...)`. >

Re: D5739: py3: use pycompat.bytestr() so that slicing does not result in ascii values

2019-01-30 Thread Yuya Nishihara
> command.append('l') > for arg in args: > -command += "%d:%s" % (len(arg), arg) > +command += pycompat.bytestr("%d:%s" % (len(arg), arg)) It's okay, but I think the original code would mean to do `command.append(...)`. > command.append('e') >

D5737: py3: convert info.name to bytes in subrepo.py

2019-01-30 Thread yuja (Yuya Nishihara)
yuja added a comment. > for info in tar: > > +infoname = pycompat.bytestr(info.name) So `info.name` would come from environment. It's probably better to use `encoding.strtolocal()`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5737

Re: D5737: py3: convert info.name to bytes in subrepo.py

2019-01-30 Thread Yuya Nishihara
> for info in tar: > +infoname = pycompat.bytestr(info.name) So `info.name` would come from environment. It's probably better to use `encoding.strtolocal()`. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D5742: histedit: add templating support to histedit's rule file generation

2019-01-30 Thread yuja (Yuya Nishihara)
yuja added a comment. > + [histedit] > + summary-format = '{rev} {bookmarks} {desc|firstline}' Perhaps, "summary-template" is more consistent with the other config keys. > ctx = self.repo[self.node] > > - summary = _getsummary(ctx) > - line = '%s %s %d %s' % (self.verb,

Re: D5742: histedit: add templating support to histedit's rule file generation

2019-01-30 Thread Yuya Nishihara
> + [histedit] > + summary-format = '{rev} {bookmarks} {desc|firstline}' Perhaps, "summary-template" is more consistent with the other config keys. > ctx = self.repo[self.node] > -summary = _getsummary(ctx) > -line = '%s %s %d %s' % (self.verb, ctx, ctx.rev(), summary)