D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread quark (Jun Wu)
quark added a comment. Yeah, if only there is a `json.loadb` function. That could replace `json.loads` at line 211. I guess it could be done by using a function that recursively convert strings. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3980 To: ced, #hg-

[Bug 5946] New: `hg evolve -aA` with splits and merges can produce KeyError: 2

2018-07-25 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5946 Bug ID: 5946 Summary: `hg evolve -aA` with splits and merges can produce KeyError: 2 Product: Mercurial Version: 4.6 Hardware: PC OS: Linux Statu

D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D3980#61930, @yuja wrote: > > getdescfromdrev is also used in readpatch which call encoding.unitolocal after. > > So it looks like it is designed to be converted after the call. > > Can you fix them all? A general gui

[Bug 5945] New: `hg evolve` can result in AttributeError: cmdstate instance has no attribute 'get'"

2018-07-25 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5945 Bug ID: 5945 Summary: `hg evolve` can result in AttributeError: cmdstate instance has no attribute 'get'" Product: Mercurial Version: 4.6 Hardware: PC OS: Li

[Bug 5944] New: `hg evolve` of merge commit runs into merge conflicts in unaffected file

2018-07-25 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5944 Bug ID: 5944 Summary: `hg evolve` of merge commit runs into merge conflicts in unaffected file Product: Mercurial Version: 4.6 Hardware: PC OS: Linux

D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread Cédric Krier
ced added a comment. I do not know enough the internal of the extensions to know if all other strings in readpatch need to be converted or not. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3980 To: ced, #hg-reviewers Cc: yuja, mercurial-devel

D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread yuja (Yuya Nishihara)
yuja added a comment. > getdescfromdrev is also used in readpatch which call encoding.unitolocal after. > So it looks like it is designed to be converted after the call. Can you fix them all? A general guideline for Mercurial codebase is converting unicodes to byte strings as earl

Re: D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread Yuya Nishihara
> getdescfromdrev is also used in readpatch which call encoding.unitolocal > after. > So it looks like it is designed to be converted after the call. Can you fix them all? A general guideline for Mercurial codebase is converting unicodes to byte strings as early as possible. _

mercurial@38744: new changeset (1 on stable)

2018-07-25 Thread Mercurial Commits
New changeset (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ae17555ef93f changeset: 38744:ae17555ef93f branch: stable bookmark:@ tag: tip user:Boris Feld date:Fri Jul 20 09:08:20 2018 +0200 summary: config: rename `revlog` section int

D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread Cédric Krier
ced added a comment. getdescfromdrev is also used in readpatch which call encoding.unitolocal after. So it looks like it is designed to be converted after the call. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3980 To: ced, #hg-reviewers Cc: yuja, mercurial

D3978: hgweb: strip trailing '/' in apppath before appending '/static/'

2018-07-25 Thread Cédric Krier
This revision was automatically updated to reflect the committed changes. Closed by commit rHG258d90f69076: hgweb: strip trailing '/' in apppath before appending '/static/' (issue5943) (authored by ced, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercuria

Re: D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread Yuya Nishihara
> newdesc = getdescfromdrev(drev) > +newdesc = encoding.unitolocal(newdesc) Perhaps encoding stuff should be handled in getdescfromdrev() before concatenating received data with bytes. ___ Mercurial-devel mailing list Mer

Re: D3978: hgweb: strip trailing '/' in apppath before appending '/static/'

2018-07-25 Thread Yuya Nishihara
Queued for stable, thanks. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread yuja (Yuya Nishihara)
yuja added a comment. > newdesc = getdescfromdrev(drev) > > +newdesc = encoding.unitolocal(newdesc) Perhaps encoding stuff should be handled in getdescfromdrev() before concatenating received data with bytes. REPOSITORY rHG Mercurial REVISION DETAIL https://p

D3978: hgweb: strip trailing '/' in apppath before appending '/static/'

2018-07-25 Thread yuja (Yuya Nishihara)
yuja added a comment. Queued for stable, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3978 To: ced, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org h

D3976: grep: add MULTIREV support to --all-files flag

2018-07-25 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 updated this revision to Diff 9664. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3976?vs=9663&id=9664 REVISION DETAIL https://phab.mercurial-scm.org/D3976 AFFECTED FILES mercurial/cmdutil.py tests/test-grep.t CHANGE DETAILS diff --git

D3981: grep: add MULTIREV support to --all-files flag

2018-07-25 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 abandoned this revision. sangeet259 added a comment. I created a new revision instead of updating the https://phab.mercurial-scm.org/D3976, ignore this one. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3981 To: sangeet259, #hg-reviewers Cc: mercuri

D3976: grep: add MULTIREV support to --all-files flag

2018-07-25 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 updated this revision to Diff 9663. sangeet259 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3976?vs=9657&id=9663 REVISION DETAIL https://phab.mercurial-scm.org/D3976 AFFECTED FILES mercurial/cmdutil.py

D3981: grep: add MULTIREV support to --all-files flag

2018-07-25 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 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/D3981 AFFECTED FILES mercurial/cmdutil.py tests/test-grep.t CHANGE DETAILS diff --git a/tests/tes

D3980: contrib/phabricator: Convert description into local

2018-07-25 Thread Cédric Krier
ced created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The description from conduit is a unicode. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3980 AFFECTED FILES contrib/phabricator.py

D3979: contrib/phabricator: Convert description into local

2018-07-25 Thread Cédric Krier
ced created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The description from conduit is a unicode. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3979 AFFECTED FILES contrib/phabricator.py

D3978: hgweb: strip trailing '/' in apppath before appending '/static/'

2018-07-25 Thread Cédric Krier
ced added a comment. For https://bz.mercurial-scm.org/show_bug.cgi?id=5943 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3978 To: ced, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel

D3978: hgweb: strip trailing '/' in apppath before appending '/static/'

2018-07-25 Thread Cédric Krier
ced 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/D3978 AFFECTED FILES mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py CHANGE DETAILS diff --

D3977: hgweb: strip trailing '/' in apppath before appending '/static/'

2018-07-25 Thread Cédric Krier
ced 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/D3977 AFFECTED FILES mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py CHANGE DETAILS diff --

D3976: grep: add MULTIREV support to --all-files flag

2018-07-25 Thread sangeet259 (Sangeet Kumar Mishra)
sangeet259 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/D3976 AFFECTED FILES mercurial/cmdutil.py tests/test-grep.t CHANGE DETAILS diff --git a/tests/tes