D1063: rebase: enable multidest by default

2017-10-17 Thread dlax (Denis Laxalde)
dlax added a comment. In https://phab.mercurial-scm.org/D1063#18725, @durin42 wrote: > (Note that I'd still welcome feedback from non-BigCo contributors here - is this something we should make permanent? Have people been testing this? Etc.) I have never tested this but it seems

Re: [PATCH] tests: update output for no-symlink platforms

2017-10-17 Thread Denis Laxalde
Matt Harbison a écrit : # HG changeset patch # User Matt Harbison # Date 1508101054 14400 # Sun Oct 15 16:57:34 2017 -0400 # Node ID 22d774b9dbab4689b186afc8acbca3165cd2a660 # Parent cfb054a7ecc45bcaac95f1e64b644dd0411ffe41 tests: update output for no-symlink

D952: merge: additional test cases to show changing behavior

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. > https://phab.mercurial-scm.org/D953 is abandoned- should this be as well? No, but it should probably be retitled. I'll do that now. It turns out that the behavior did change, but only slightly, and not in a useful way, with the

D1138: webcommands: replace str(ctx) etc with pycompat.bytestr(ctx) etc

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

D1117: config: simplify aliasing commands.update.check

2017-10-17 Thread lothiraldan (Boris Feld)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc4a0480d1951: config: simplify aliasing commands.update.check (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1143: revset: update repo.pinnedrevs with hidden commits from the tree

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds functionality to update the pinnedrevs set with the hidden commits whose hashes are passed if the command allow accessing them and showing

D1144: directaccess: add support to export and tests to demonstrate things

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds the cmdtype attribute to export command which is a read only command and adds test for accessing hidden commits using the same command. REPOSITORY

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. Hm, check-code is failing here. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1122 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list

D1132: mpatch: switch alignment of wrapped line from tab to spaces with clang-format

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1132 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D1117: config: simplify aliasing commands.update.check

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1117 To: lothiraldan, #hg-reviewers, durin42, ryanmce Cc: ryanmce, durin42, mercurial-devel ___ Mercurial-devel mailing list

D1136: templatefilters: defend against evil unicode strs in json filter

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I'm not a python 3 expert by any means, but I'm not sold on this change. I think we need perhaps a programming error so it's clear its a bug and not something the user needs to fix in their command inputs. INLINE COMMENTS > templatefilters.py:241-242 > +

D1013: dispatch: filter the repository depending on func.cmdtype

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Resend the series as https://phab.mercurial-scm.org/D1140 - https://phab.mercurial-scm.org/D1144. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1013 To: pulkit, #hg-reviewers, durin42 Cc: durin42,

D1012: repoview: add two new filternames to be used for accessing hidden commits

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Resend the series as https://phab.mercurial-scm.org/D1140 - https://phab.mercurial-scm.org/D1144. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1012 To: pulkit, #hg-reviewers, dlax Cc: dlax,

D738: directaccess: add support to export and tests to demonstrate things

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Resend the series as https://phab.mercurial-scm.org/D1140 - https://phab.mercurial-scm.org/D1144. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D738 To: pulkit, #hg-reviewers, durham, ryanmce Cc: ryanmce,

D947: run-tests: move bisect logic to a separate method

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I think I request revision because the series needed to change, and I wanted to take it out of other people's queues. Will look again at the whole series now. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D947 To: quark,

D949: run-tests: set HGPLAIN=1 when bisecting

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D949 To: quark, #hg-reviewers, ryanmce Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D947: run-tests: move bisect logic to a separate method

2017-10-17 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9c7548eb7d1c: run-tests: move bisect logic to a separate method (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D948: run-tests: extract Popen logic to a single method

2017-10-17 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd817bf1fc675: run-tests: extract Popen logic to a single method (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D949: run-tests: set HGPLAIN=1 when bisecting

2017-10-17 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG149109c96904: run-tests: set HGPLAIN=1 when bisecting (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D949?vs=2890=2901

D1014: revset: update repo._pinnedrevs with hidden commits from the tree

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Resend the series as https://phab.mercurial-scm.org/D1140 - https://phab.mercurial-scm.org/D1144. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1014 To: pulkit, #hg-reviewers Cc: mercurial-devel

D1135: webutil: use pycompat.bytestr() instead of str()

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > webutil.py:593-596 > +yield {'name': key, > + 'value': pycompat.bytestr(value), > + 'separator': separator, > +} Buh, this looks ugly as sin. Can we drop 'name' to the next line

D1131: mpatch: reformat function prototypes with clang-format

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG761355833867: mpatch: reformat function prototypes with clang-format (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1132: mpatch: switch alignment of wrapped line from tab to spaces with clang-format

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1f4249c764f1: mpatch: switch alignment of wrapped line from tab to spaces with clang-format (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I'm dropping this from hg-committed for now. Please re-submit with the check-code issues fixed. @hg-reviewers: If I'm doing this wrong by dropping the patch, please let me know so I can correct my behavior in the future. INLINE COMMENTS >

D1130: contrib: remove check-code rule about indentation

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0b46352384a0: contrib: remove check-code rule about indentation (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1129: clang-format: configuration for the clang-format source formatter

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe33381d95930: clang-format: configuration for the clang-format source formatter (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1117: config: simplify aliasing commands.update.check

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan updated this revision to Diff 2898. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1117?vs=2826=2898 REVISION DETAIL https://phab.mercurial-scm.org/D1117 AFFECTED FILES mercurial/configitems.py mercurial/hg.py CHANGE DETAILS diff

D1117: config: simplify aliasing commands.update.check

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan marked an inline comment as done. lothiraldan added a comment. I've added the comment, but I think we should keep the alias until we have a way to warn people they use deprecated config aliases. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1117

D948: run-tests: extract Popen logic to a single method

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D948 To: quark, #hg-reviewers, ryanmce Cc: ryanmce, dlax, mercurial-devel

D1141: repoview: add two new filternames to be used for accessing hidden commits

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds two new filternames 'visible-hidden' and 'visible-warnhidden' which will be used to access hidden commits. 'visible-hidden' will allow access of

D1142: dispatch: filter the repository depending on func.cmdtype

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds support for filtering the repository on the basis of func.cmdtype. After this patch, repo.filtername will be used to decide what level of access

D1140: localrepo: add a pinnedrevs attribute

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have repoview.pinnedrevs() which take a repository object and returns the hidden revisions which should not be filtered. To add more hidden revisions to

D1133: test-clang-format: new test to verify that files stay clang-formatted

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > test-check-clang-format.t:1 > +#require clang-format test-repo > + $ cd "$TESTDIR"/.. This test fails for me with errors about lz4revlog. It feels like

D1117: config: simplify aliasing commands.update.check

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. I agree with @lothiraldan that there's no pressing need to remove aliases, and we should have a mechanism to work before we do this for sure. This seems like exactly one of the reasons the config registration system was built in

D1011: localrepo: add a _pinnedrevs attribute

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Resend the series as https://phab.mercurial-scm.org/D1140 - https://phab.mercurial-scm.org/D1144. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1011 To: pulkit, #hg-reviewers Cc: dlax, mercurial-devel

Re: [PATCH] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-17 Thread Yuya Nishihara
On Mon, 16 Oct 2017 22:40:21 -0400, Matt Harbison wrote: > On Mon, 16 Oct 2017 10:36:22 -0400, Yuya Nishihara wrote: > > On Mon, 16 Oct 2017 09:21:24 -0400, Matt Harbison wrote: > >> +shared = hg.share(self._repo._subparent.baseui, > >> +

D1074: branch: add a --rev flag to change branch name of given revisions

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > ryanmce wrote in cmdutil.py:791-792 > Seems like we need a refactor? (out of scope for this change though) Yeah, I will be happy to do that in next cycle. Can you suggest a name for file in which we can split cmdutil.py. > ryanmce wrote in

D1121: releasenotes: show a warning if fuzzywuzzy is not present

2017-10-17 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > releasenotes.py:104 > +ui.warn(_("module 'fuzzywuzzy' not found, merging of similar" > + " releasenotes is disbaled")) > + Fixed missing \n and typo. REPOSITORY rHG Mercurial REVISION DETAIL

D1097: releasenotes: don't abort is there is a bad formatted entry for releasenotes

2017-10-17 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa542ad320adb: releasenotes: dont abort is there is a bad formatted entry for releasenotes (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1121: releasenotes: show a warning if fuzzywuzzy is not present

2017-10-17 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG288fad8c55f9: releasenotes: show a warning if fuzzywuzzy is not present (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D1121?vs=2832=2915#toc REPOSITORY

D1096: releasenotes: make the import of fuzzywuzzy optional

2017-10-17 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG44bd29168d14: releasenotes: make the import of fuzzywuzzy optional (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1120: releasenotes: move import of fuzzywuzzy to import level

2017-10-17 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbc2caa4b4480: releasenotes: move import of fuzzywuzzy to import level (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1133: test-clang-format: new test to verify that files stay clang-formatted

2017-10-17 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 2916. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1133?vs=2883=2916 REVISION DETAIL https://phab.mercurial-scm.org/D1133 AFFECTED FILES contrib/clang-format-blacklist tests/test-check-clang-format.t CHANGE

D1133: test-clang-format: new test to verify that files stay clang-formatted

2017-10-17 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > ryanmce wrote in test-check-clang-format.t:1 > This test fails for me with errors about lz4revlog. > > It feels like what we need here is a change similar to > https://phab.mercurial-scm.org/rHG6c113a7dec52be38927b16962282ea660de0b03c, > where

D1136: templatefilters: defend against evil unicode strs in json filter

2017-10-17 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 2917. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1136?vs=2886=2917 REVISION DETAIL https://phab.mercurial-scm.org/D1136 AFFECTED FILES mercurial/templatefilters.py CHANGE DETAILS diff --git

D1099: dagutil: use a listcomp instead of a map()

2017-10-17 Thread yuja (Yuya Nishihara)
yuja added a comment. I have no preference, but pycompat.maplist() could be used. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1099 To: durin42, #hg-reviewers, ryanmce Cc: yuja, ryanmce, mercurial-devel ___

D1099: dagutil: use a listcomp instead of a map()

2017-10-17 Thread durin42 (Augie Fackler)
durin42 added a comment. Oh, I always forget maplist() exists. Probably doesn't matter for this case. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1099 To: durin42, #hg-reviewers, ryanmce Cc: yuja, ryanmce, mercurial-devel

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

2017-10-17 Thread durin42 (Augie Fackler)
durin42 added a comment. No, that sounds fair, Phil should resend (as a new differential ID) when the issue is sorted. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1122 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel

D1145: templater: use pycompat.sysbytes to bytes-ify some __name__ attrs

2017-10-17 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Spotted by yuya in review of https://phab.mercurial-scm.org/rHGe87e62b7fc0bf6debd4db89e3a902eafb97dcb98. REPOSITORY rHG Mercurial REVISION DETAIL

D1137: templater: don't blow up when trying to build an abort message

2017-10-17 Thread yuja (Yuya Nishihara)
yuja added a comment. pycompat.sysbytes() can be used here. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1137 To: durin42, #hg-reviewers, ryanmce Cc: yuja, ryanmce, mercurial-devel ___ Mercurial-devel mailing list

Re: [PATCH 4 of 4 v3] log: add -L/--line-range option to follow file history by line range

2017-10-17 Thread Yuya Nishihara
On Mon, 16 Oct 2017 20:56:29 +0200, Denis Laxalde wrote: > Augie Fackler a écrit : > > (+jordigh, themystic, indygreg in case one of them has an opinion or > > inspiration) > > > >> On Oct 13, 2017, at 10:24 AM, Yuya Nishihara wrote: > >> > >> On Fri, 13 Oct 2017 10:02:07 +0200,

Re: [PATCH] tests: update output for no-symlink platforms

2017-10-17 Thread Yuya Nishihara
On Tue, 17 Oct 2017 09:42:30 +0200, Denis Laxalde wrote: > Matt Harbison a écrit : > > # HG changeset patch > > # User Matt Harbison > > # Date 1508101054 14400 > > # Sun Oct 15 16:57:34 2017 -0400 > > # Node ID 22d774b9dbab4689b186afc8acbca3165cd2a660 > > # Parent

Re: [PATCH V2] subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)

2017-10-17 Thread Yuya Nishihara
On Tue, 17 Oct 2017 00:27:33 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1508122082 14400 > # Sun Oct 15 22:48:02 2017 -0400 > # Node ID 7f5dd96256997c9ada54c969919abe8c6f3f970f > # Parent

D1138: webcommands: replace str(ctx) etc with pycompat.bytestr(ctx) etc

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3a65012be661: webcommands: replace str(ctx) etc with pycompat.bytestr(ctx) etc (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1134: hgweb: correct an earlier error of mine - `start` should be bytes

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGafd7fd950f6e: hgweb: correct an earlier error of mine - `start` should be bytes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1137: templater: don't blow up when trying to build an abort message

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe87e62b7fc0b: templater: dont blow up when trying to build an abort message (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1136: templatefilters: defend against evil unicode strs in json filter

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I'll queue this series except this patch so we can have more discussion on what we should do here. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1136 To: durin42, #hg-reviewers Cc: ryanmce, mercurial-devel

D1135: webutil: use pycompat.bytestr() instead of str()

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1135 To: durin42, #hg-reviewers, pulkit, ryanmce Cc: ryanmce, mercurial-devel

D1134: hgweb: correct an earlier error of mine - `start` should be bytes

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1134 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D1135: webutil: use pycompat.bytestr() instead of str()

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3caec3c032c8: webutil: use pycompat.bytestr() instead of str() (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1138: webcommands: replace str(ctx) etc with pycompat.bytestr(ctx) etc

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1138 To: durin42, #hg-reviewers, pulkit, ryanmce Cc: ryanmce, pulkit, mercurial-devel

D1137: templater: don't blow up when trying to build an abort message

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1137 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D1124: test-hgweb-annotate-whitespace: make test compatible with chg

2017-10-17 Thread yuja (Yuya Nishihara)
yuja added a comment. In https://phab.mercurial-scm.org/D1124#18881, @singhsrb wrote: > @durin42: That's a valid concern and I am planning to look at the pattern handling code at some point. Maybe we should instead make `hg serve --daemon` work under commandserver. Argument

D1119: releasenotes: fix documentation of similaritycheck()

2017-10-17 Thread yuja (Yuya Nishihara)
yuja added a comment. I guess the original intent was s/merged to/included in/. The return value is named "merge", which is set to False if similarity is high. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1119 To: pulkit, #hg-reviewers, durin42 Cc: yuja,

D1136: templatefilters: defend against evil unicode strs in json filter

2017-10-17 Thread yuja (Yuya Nishihara)
yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > ryanmce wrote in templatefilters.py:241-242 > I fear that this is is an non-actionable error. How might I see it as a user? > If I see it, what do I do? > >

Re: [PATCH 8 of 8 V2] phase: use a binary phase part to push through bundle2 (BC)

2017-10-17 Thread Boris Feld
We think that having this series in 4.4 release is quite important. We added the new 'phases' bundle2 capability and associated pull support in the 4.4 cycle. Not having push support in the same release (4.4) means push support will not be covered by the new capability and we'll have to distinct

D1074: branch: add a --rev flag to change branch name of given revisions

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > cmdutil.py:722-731 > +revs = scmutil.revrange(repo, revs) > +roots = repo.revs('roots(%ld)', revs) > +if len(roots) > 1: > +raise

Re: [PATCH 05 of 11 V2] templatekw: introduce obsfate keyword

2017-10-17 Thread Yuya Nishihara
On Mon, 16 Oct 2017 18:50:29 +0200, Boris Feld wrote: > On Sat, 2017-10-14 at 14:58 +0900, Yuya Nishihara wrote: > > On Fri, 13 Oct 2017 20:00:32 +0200, Boris Feld wrote: > > > On Thu, 2017-10-12 at 22:51 +0900, Yuya Nishihara wrote: > > > > On Thu, 12 Oct 2017 15:29:31 +0200, Boris Feld wrote: >

Re: [PATCH 4 of 4 v3] log: add -L/--line-range option to follow file history by line range

2017-10-17 Thread Augie Fackler
> On Oct 17, 2017, at 09:28, Yuya Nishihara wrote: > If we take the latter, a plain file pattern can be used to select all lines. hg log --follow -L file.c,13-23 main.c >>> >>> I feel like the -L file.c,13-23 is the least ambiguous option in terms of >>>

D1152: config: rename stabilization.bundle-obsmarker

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We want to get rid of stabilization.* configuration, back out to the old configuration 'evolution.bundle-obsmarker'. REPOSITORY rHG Mercurial REVISION

D1146: config: invert evolution-related configuration aliases

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We want to split the evolution-related configuration and back-out the renaming from evolution.* to stabilization.*. First invert the configuration and

D1151: config: use 'experimental.evolution.exchange'

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Extract 'experimental.evolution' = exchange as 'experimental.evolution.exchange'. We keep the new option in the 'experimental.evolution' namespace in

D1149: config: use 'experimental.evolution.create-markers'

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Extract 'experimental.evolution' = createmarkers as 'experimental.evolution.createmarkers'. We keep the new option in

Re: [PATCH 8 of 8 V2] phase: use a binary phase part to push through bundle2 (BC)

2017-10-17 Thread Augie Fackler
On Mon, Oct 16, 2017 at 08:23:49PM +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1505929086 -7200 > # Wed Sep 20 19:38:06 2017 +0200 > # Node ID 76e192debcd8036c6695b56681ca096690322880 > # Parent

Re: [PATCH 8 of 8 V2] phase: use a binary phase part to push through bundle2 (BC)

2017-10-17 Thread Augie Fackler
On Tue, Oct 17, 2017 at 03:52:42PM +0200, Boris Feld wrote: > We think that having this series in 4.4 release is quite important. We > added the new 'phases' bundle2 capability and associated pull support > in the 4.4 cycle. Not having push support in the same release (4.4) > means push support

Re: [PATCH 3 of 3] revlog-sparse-read: add a lower-threshold for read block size

2017-10-17 Thread Augie Fackler
On Mon, Oct 16, 2017 at 06:35:50PM +0200, Paul Morelle wrote: > # HG changeset patch > # User Paul Morelle > # Date 1507993541 -7200 > # Sat Oct 14 17:05:41 2017 +0200 > # Node ID cac7666538643b087500c09c757a1b5f28421fbb > # Parent

Re: [PATCH 7 of 7] configitems: adds a developer warning when accessing undeclared configuration

2017-10-17 Thread Augie Fackler
On Mon, Oct 16, 2017 at 06:53:32PM +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1508168487 -7200 > # Mon Oct 16 17:41:27 2017 +0200 > # Node ID 7a2c3832349499f8b00b9db64e6b87ff644faa9d > # Parent

D1147: config: update evolution-related config

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Update the evolution helpers function to support both old-style configuration and new-style configuration: experimental.evolution=all is renamed into

D1155: config: gather allowdivergence under the evolution namespace

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Grouping all evolution related-config under the experimental.evolution namespace would helps the future migration outside [experimental]. REPOSITORY rHG

D1150: config: use 'experimental.evolution.allowunstable'

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Extract 'experimental.evolution' = allowunstable as 'experimental.evolution.allowunstable'. We keep the new option in

D1148: config: replace experimental.stabilization by experimental.evolution

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We replace 'experimental.stabilization=all' by 'experimental.evolution=true' as we will extract individual config in their own config in later patches.

D1154: config: remove stabilization.* aliases

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Stabilization config items were never part of a release, remove them now that we cleaned up the evolution related configuration. REPOSITORY rHG Mercurial

D762: config: backout rename evolution config into stabilization

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan abandoned this revision. lothiraldan added a comment. I've resend as https://phab.mercurial-scm.org/D1146. I didn't put config directly under experimental but under experimental.evolution. Also I used the exact same configuration option names to make the series easier and

Re: [PATCH 08 of 11] configitems: register the full 'merge-tools' config and sub-options

2017-10-17 Thread Yuya Nishihara
On Mon, 16 Oct 2017 16:00:26 +0200, Boris Feld wrote: > On Fri, 2017-10-13 at 15:37 -0400, Augie Fackler wrote: > > On Fri, Oct 13, 2017 at 07:55:14PM +0200, Boris Feld wrote: > > > # HG changeset patch > > > # User Boris Feld > > > # Date 1507487833 -7200 > > > #  Sun

[PATCH 5 of 7 V3] obsfate: only display date in verbose mode

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507556066 -7200 # Mon Oct 09 15:34:26 2017 +0200 # Node ID a2bbc21a142b192bde003f8df3adb71e13242ea1 # Parent b74d99227666d315c4eb34645f5362e6395ee5e5 # EXP-Topic obsfatekeyword # Available At

[PATCH 4 of 7 V3] obsfate: filter out current user if not in verbose

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507556052 -7200 # Mon Oct 09 15:34:12 2017 +0200 # Node ID b74d99227666d315c4eb34645f5362e6395ee5e5 # Parent fc484d70e64944dc3e918efdca08ec0ca8466c4d # EXP-Topic obsfatekeyword # Available At

D1156: tests: add test demonstrating regression in path audit

2017-10-17 Thread mbthomas (Mark Thomas)
mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/D785 regressed behavior in path auditing: files can be deleted if they have a path that conflicts with a filename from a

[PATCH 1 of 7 V3] templatekw: introduce obsfate keyword

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507218176 -7200 # Thu Oct 05 17:42:56 2017 +0200 # Node ID fc6e8b2484a3eaedd9e4b8ec10f3728b57bfbebe # Parent 68e0bcb903572cb3641c1b1ac11bdcf47d4ff5ac # EXP-Topic obsfatekeyword # Available At

[PATCH 7 of 7 V3] obsfate: add obsfate to default mapfile

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507305216 -7200 # Fri Oct 06 17:53:36 2017 +0200 # Node ID b4e71a220342f65b3c75b534670137e836e3f7b9 # Parent f3a67648b948d83038f4b0fe351a81ee042f814f # EXP-Topic obsfatekeyword # Available At

[PATCH 3 of 7 V3] ui: add the possibility to returns None as username in ui

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507299827 -7200 # Fri Oct 06 16:23:47 2017 +0200 # Node ID fc484d70e64944dc3e918efdca08ec0ca8466c4d # Parent 89093dd3ab72c2b2e3b95f6a69414ab2a174c910 # EXP-Topic obsfatekeyword # Available At

[PATCH 2 of 7 V3] test: test obfate template keyword in test-obsmarker-template.t

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507302949 -7200 # Fri Oct 06 17:15:49 2017 +0200 # Node ID 89093dd3ab72c2b2e3b95f6a69414ab2a174c910 # Parent fc6e8b2484a3eaedd9e4b8ec10f3728b57bfbebe # EXP-Topic obsfatekeyword # Available At

[PATCH 6 of 7 V3] log: add obsfate by default in changeset printer

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1507209918 -7200 # Thu Oct 05 15:25:18 2017 +0200 # Node ID f3a67648b948d83038f4b0fe351a81ee042f814f # Parent a2bbc21a142b192bde003f8df3adb71e13242ea1 # EXP-Topic obsfatekeyword # Available At

D785: context: also consider path conflicts when clearing unknown files

2017-10-17 Thread mbthomas (Mark Thomas)
mbthomas added inline comments. INLINE COMMENTS > swhitaker wrote in context.py:1941 > This breaks test-audit-path.t on macOS. In the test "attack /tmp/test", we > call this codepath with f == '/tmp/test'. util.finddirs finds '/tmp', which > on macOS is a symlink to /private/tmp, so L1940 is

D1157: context: audit paths before clearing unknown files and dirs

2017-10-17 Thread mbthomas (Mark Thomas)
mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fix regression introduced in https://phab.mercurial-scm.org/D785. In some circumstances, context.clearunknown can be called before the path is audited.

Re: [PATCH 7 of 7] configitems: adds a developer warning when accessing undeclared configuration

2017-10-17 Thread Ryan McElroy
On 10/17/17 4:27 PM, Augie Fackler wrote: On Mon, Oct 16, 2017 at 06:53:32PM +0200, Boris Feld wrote: # HG changeset patch # User Boris Feld # Date 1508168487 -7200 # Mon Oct 16 17:41:27 2017 +0200 # Node ID 7a2c3832349499f8b00b9db64e6b87ff644faa9d # Parent

Re: [PATCH 8 of 8 V2] phase: use a binary phase part to push through bundle2 (BC)

2017-10-17 Thread Boris Feld
On Tue, 2017-10-17 at 11:17 -0400, Augie Fackler wrote: > On Mon, Oct 16, 2017 at 08:23:49PM +0200, Boris Feld wrote: > > # HG changeset patch > > # User Boris Feld > > # Date 1505929086 -7200 > > #  Wed Sep 20 19:38:06 2017 +0200 > > # Node ID

[PATCH V3] phase: use a binary phase part to push through bundle2 (BC)

2017-10-17 Thread Boris Feld
# HG changeset patch # User Boris Feld # Date 1505929086 -7200 # Wed Sep 20 19:38:06 2017 +0200 # Node ID 0505e8dfaf0f62b3532699958ce0d6d62bf1bb0c # Parent 44c4ed4ad0326c6a8ab09b7a27c40a45e67ec1f3 # EXP-Topic b2.phases.push # Available At

D1144: directaccess: add support to export and tests to demonstrate things

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan requested changes to this revision. lothiraldan added a comment. This revision now requires changes to proceed. I'm +1 on the feature. But I have several concerns with the current implementation: - Marking a whole command as readonly or not is too simplistic I'm afraid,

[PATCH] show: use labelcset() template alias for work (and stack) views

2017-10-17 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1508264743 -7200 # Tue Oct 17 20:25:43 2017 +0200 # Node ID 9af9aa26a601cf26aca9320d0384857fe09fa28b # Parent 68e0bcb903572cb3641c1b1ac11bdcf47d4ff5ac # EXP-Topic show-obs-info show: use labelcset() template alias for work

D1160: test-extension: make the test compatible with chg

2017-10-17 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This test fails when run with chg. This commit just makes the test chg aware by fixing the output of some of the tests. TEST PLAN Ran the test

  1   2   >