[PATCH 1 of 2] share: move the implementation of 'unshare' to the 'hg' module

2017-10-17 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1508291336 14400 # Tue Oct 17 21:48:56 2017 -0400 # Node ID a6b470f15cc5f902afd54f29b0e53e5c03f6eec6 # Parent 14c87708f4328fa46938be99d6deba678f3455aa share: move the implementation of 'unshare' to the 'hg' module

[PATCH 2 of 2] subrepo: implement 'unshare' for Mercurial subrepos

2017-10-17 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1508295333 14400 # Tue Oct 17 22:55:33 2017 -0400 # Node ID 609c60c0b706f9b6402d275a57b8255b142e8ba7 # Parent a6b470f15cc5f902afd54f29b0e53e5c03f6eec6 subrepo: implement 'unshare' for Mercurial subrepos I think

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

2017-10-17 Thread Augie Fackler
> On Oct 17, 2017, at 13:10, Boris Feld wrote: > > # HG changeset patch > # User Boris Feld > # Date 1505929086 -7200 > # Wed Sep 20 19:38:06 2017 +0200 > # Node ID 0505e8dfaf0f62b3532699958ce0d6d62bf1bb0c > # Parent

D894: fsmonitor: warn when fsmonitor could be used

2017-10-17 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > krbullock wrote in test-fsmonitor-warning.t:9 > We can't squeeze these into a test that's already set up? Brand-new test > cases are discouraged, since so much time in our test suite is already burned > on initializing repos. There was no

D1081: tests: add check in test-check-commit.t to verify releasenotes directives

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit requested changes to this revision. pulkit added a comment. I have tweaked releasenotes to not error out in this case, rather show a warning only. So this patch is no longer applicable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1081 To: durin42,

D940: remotenames: add functions to read remotenames data from .hg/remotenames/

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Will revisit after the freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D940 To: pulkit, #hg-reviewers, dlax Cc: dlax, mercurial-devel ___ Mercurial-devel

D939: remotenames: add functionality to store remotenames under .hg/hgremotenames/

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Will revisit after the freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D939 To: pulkit, #hg-reviewers, dlax, ryanmce Cc: ryanmce, dlax, mercurial-devel ___

D941: remotenames: add a function to return the vfs object

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Will revisit after the freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D941 To: pulkit, #hg-reviewers, dlax, ryanmce Cc: ryanmce, mercurial-devel ___

D938: remotenames: move utility functions to join and split names to core

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Will revisit after the freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D938 To: pulkit, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___

D974: py3: handle keyword arguments correctly in hgext/patchbomb.py

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Will revisit after the freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D974 To: pulkit, #hg-reviewers, yuja Cc: yuja, mercurial-devel ___ Mercurial-devel

D933: scmutil: add a new function to show changes after a command

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Abandoning in favor of https://phab.mercurial-scm.org/D1173. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D933 To: pulkit, #hg-reviewers, dlax Cc: dlax, quark, yuja, mercurial-devel

D934: rebase: add an experimental.showhashchanges config to show hash changes

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Abandoning in favor of https://phab.mercurial-scm.org/D1173. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D934 To: pulkit, #hg-reviewers Cc: quark, dlax, durin42, mercurial-devel

D934: rebase: add an experimental.showhashchanges config to show hash changes

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D934#15996, @durin42 wrote: > In https://phab.mercurial-scm.org/D934#15995, @pulkit wrote: > > > In https://phab.mercurial-scm.org/D934#15939, @durin42 wrote: > > > > > I see what it does, but why? What's the motivation for

D1173: rebase: add support to output nodechanges

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 to rebase to show the changes in node once the rebase is complete. This will be extremely helpful for automation purposes and editors

D1155: config: gather allowdivergence under the evolution namespace

2017-10-17 Thread quark (Jun Wu)
quark added a comment. I'm not a big fan of inserting `evolution` everywhere. It confuses people. I'd prefer things like `experimental.obsstore=bool`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1155 To: lothiraldan, #hg-reviewers Cc: quark, ryanmce,

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

2017-10-17 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > phillco wrote in test-arbitraryfilectx.t:4-5 > hm, something might be up with my setup, definitely got a green on > everything. I'll look into it. Ah, mea culpa. I had exempted those from my test system while on the long-lived in-memory merge

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

2017-10-17 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > ryanmce wrote in context.py:2578 > I will remove the backticks in-flight; I think this are discouraged in > comments still > > Excellent comment overall, nonetheless Is there one standard for indicating code snippets? I've seen backticks,

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

2017-10-17 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > ryanmce wrote in test-arbitraryfilectx.t:4-5 > --- /data/users/rmcelroy/mercurial/hg/tests/test-check-module-imports.t > +++ /data/users/rmcelroy/mercurial/hg/tests/test-check-module-imports.t.err > @@ -42,3 +42,6 @@ > > -X

D1155: config: gather allowdivergence under the evolution namespace

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I think this series overall cleans up the namespaces. I don't really love that evolution is still "hiding" under experimental but currently we don't have a way of marking non-"experimental" configs as experimental still so I guess this will have to suffice for now.

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

2017-10-17 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG14c87708f432: arbitraryfilecontext: skip the cmp fast path if any side is a symlink (authored by phillco, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D1165?vs=2942=2954#toc

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

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 INLINE COMMENTS > context.py:2578 > +# Note that filecmp uses the opposite return values (True if > same) > +# as our ``cmp`` functions (True if

D1170: parsers: allow clang-format here

2017-10-17 Thread durin42 (Augie Fackler)
durin42 added a comment. To review this, I suggest removing parsers.c from the blacklist and running `make format-c` (see https://phab.mercurial-scm.org/D1167) to observe that the resulting diff matches what's in this commit, rather than hand-inspecting the entire diff. REPOSITORY rHG

D1169: cext: add /* header */ comment to all PyVarObject_HEAD_INIT() calls

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 This gives clang-format the right notion about formatting these struct initializers, therefore allowing us to automatically format several additional files.

D1170: parsers: allow clang-format here

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 skip-blame because parsers.c is mechanically rewritten by = clang-format with no semantic change.

D1168: parsers: protect some case-folding tables from clang-format

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 We want a slightly weird format here so that it's easier to read, but in order to preserve that we need to disable clang-format. REPOSITORY rHG Mercurial

D1167: makefile: add target to apply clang-format in-place

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 This makes it easy to reformat files after you finish editing them. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1167 AFFECTED

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

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > test-check-commit.t:22 > > - Please avoid unrelated changes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1150 To: lothiraldan, durin42, #hg-reviewers Cc: ryanmce, mercurial-devel

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

2017-10-17 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2e8477059d4f: test-clang-format: new test to verify that files stay clang-formatted (authored by durin42, 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 ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. Yeah, I was running the wrong run-tests.py. Thanks for the help @durin42. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1133 To: durin42,

D987: copies: add a config to limit the number of candidates to check in heuristics

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 2947. pulkit edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D987?vs=2539=2947 REVISION DETAIL https://phab.mercurial-scm.org/D987 AFFECTED FILES mercurial/configitems.py

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

2017-10-17 Thread quark (Jun Wu)
quark added a comment. In https://phab.mercurial-scm.org/D1133#19539, @ryanmce wrote: > I get `skipped: unknown feature: clang-format` when running `test-check-clang-format.t` now. What am I doing wrong? Are you using `run-tests.py` from this repo and running it in the `tests/`

D1156: tests: add test demonstrating regression in path audit

2017-10-17 Thread mbthomas (Mark Thomas)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd6009d1488e8: tests: add test demonstrating regression in path audit (authored by mbthomas, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

2017-10-17 Thread mbthomas (Mark Thomas)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG07bbb208a924: context: audit paths before clearing unknown files and dirs (authored by mbthomas, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1166: ui: move request exit handlers to global state

2017-10-17 Thread quark (Jun Wu)
quark accepted this revision. quark added a comment. This was discussed internally. Exit handlers should be per process (ex. "global"), non-copyable to avoid run them multiple times. So this change is a pure improvement. REPOSITORY rHG Mercurial REVISION DETAIL

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

2017-10-17 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I get `skipped: unknown feature: clang-format` when running `test-check-clang-format.t` now. What am I doing wrong? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1133 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

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

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/D1157 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

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

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit marked 4 inline comments as done. pulkit added inline comments. INLINE COMMENTS > ryanmce wrote in cmdutil.py:722-731 > What about an unclean working copy? It looks like that's supported -- could > we make sure it's tested? It's not supported. Handled that case and added a test. Thanks!

D1082: split: new extension to split changesets

2017-10-17 Thread quark (Jun Wu)
quark added a comment. In https://phab.mercurial-scm.org/D1082#19507, @lothiraldan wrote: > I'm still concerned about possible obsmarkers explosion as we move to more and more auto-stabilizing commands in core. For leaving a trace of the problem, if we use auto-stabilizing commands on

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

2017-10-17 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 2944. pulkit edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1074?vs=2807=2944 REVISION DETAIL https://phab.mercurial-scm.org/D1074 AFFECTED FILES mercurial/cmdutil.py

D1166: ui: move request exit handlers to global state

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 Since the ui objects can be created with the 'load' class method, it is possible to lose the exit handlers information from the old ui instance. For example,

D1082: split: new extension to split changesets

2017-10-17 Thread lothiraldan (Boris Feld)
lothiraldan added a comment. In https://phab.mercurial-scm.org/D1082#18693, @quark wrote: > In https://phab.mercurial-scm.org/D1082#18648, @lothiraldan wrote: > > > It will be great to have split in core, even if it's only as an experimental experiment for now. > > > > I like the

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

2017-10-17 Thread phillco (Phil Cohen)
phillco added a comment. I've sent https://phab.mercurial-scm.org/D1165, which is the corrected version. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1122 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel

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

2017-10-17 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `filecmp` follows symlinks by default, which a `filectx.cmp()` call should not be doing as it should only compare the requested entry. After this patch, only

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

2017-10-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 2941. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2878=2941 REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py tests/test-arbitraryfilectx.t CHANGE DETAILS

[PATCH 1 of 4 v4] revset: extract a parsefollowlinespattern helper function

2017-10-17 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1507123663 -7200 # Wed Oct 04 15:27:43 2017 +0200 # Node ID 73dcd7f479a2481be007de11b03e834aec334ffd # Parent 68e0bcb903572cb3641c1b1ac11bdcf47d4ff5ac # EXP-Topic followlines-cli revset: extract a

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

2017-10-17 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1508267731 -7200 # Tue Oct 17 21:15:31 2017 +0200 # Node ID 601ab53301506bc35ab75adc8de9f611af9b3d80 # Parent 909a69f31ef323ded6fef8dd56fb44dc97f4cd89 # EXP-Topic followlines-cli log: add -L/--line-range option to

[PATCH 3 of 4 v4] diff: pass a diff hunks filter function from changeset_printer to patch.diff()

2017-10-17 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1507293917 -7200 # Fri Oct 06 14:45:17 2017 +0200 # Node ID 909a69f31ef323ded6fef8dd56fb44dc97f4cd89 # Parent c73893dd6cfb5693029f5d9dcf1d537197b40a4a # EXP-Topic followlines-cli diff: pass a diff hunks filter

[PATCH 2 of 4 v4] diff: also yield file context objects in patch.trydiff()

2017-10-17 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1507231208 -7200 # Thu Oct 05 21:20:08 2017 +0200 # Node ID c73893dd6cfb5693029f5d9dcf1d537197b40a4a # Parent 73dcd7f479a2481be007de11b03e834aec334ffd # EXP-Topic followlines-cli diff: also yield file context objects

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

2017-10-17 Thread phillco (Phil Cohen)
phillco added a comment. Whoops, sorry, I forgot to run tests on the most recent version. Will fix & resend. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1122 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel

[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

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,

D1161: hghave: disable demandimport when chg is running

2017-10-17 Thread singhsrb (Saurabh Singh)
singhsrb updated this revision to Diff 2940. singhsrb edited the summary of this revision. singhsrb retitled this revision from "hghave: make 'on demand import' unsupported when chg is running" to "hghave: disable demandimport when chg is running". REPOSITORY rHG Mercurial CHANGES SINCE LAST

D1161: hghave: make 'on demand import' unsupported when chg is running

2017-10-17 Thread singhsrb (Saurabh Singh)
singhsrb added inline comments. INLINE COMMENTS > quark wrote in hghave.py:604 > It's more accurate saying: > > # chg disables demandimport on purpose > > chg could support demandimport but chooses to disable it for performance win. Yes, that does looks like a better way to put it. I will

D1161: hghave: make 'on demand import' unsupported when chg is running

2017-10-17 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > hghave.py:604 > def has_demandimport(): > -return os.environ.get('HGDEMANDIMPORT') != 'disable' > +# chg does not support on demand importing. > +return ((not has_chg()) and os.environ.get('HGDEMANDIMPORT') != > 'disable') It's more

D1163: tests: move baduisetup() test out of "#if demandimport"

2017-10-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It no longer depends on demandimport. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1163 AFFECTED FILES

D1162: tests: make test-extension.t's baduisetup.py test fail even if bdiff exists

2017-10-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A mercurial.bdiff module has existed at some point and when I have built at an old version, some .pyc file or something seems to stick around and

D1164: extensions: always include traceback when extension setup fails

2017-10-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I have spent a lot of time debugging extensions that failed to load because we don't include a traceback and I didn't realize I could get traceback for the

D1161: hghave: make 'on demand import' unsupported when chg is running

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 Chg does not support on demand import and therefore, it probably makes sense to indicate that the 'on demand import' is unsupported when chg is running. TEST

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

D1063: rebase: enable multidest by default

2017-10-17 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > dlax wrote in rebase.py:645 > Maybe this could be in a `.. container:: verbose` block since it's an > advanced feature? I think the "SRC" feature itself is not that "advanced" and is easy to understand. The problem is the revset for "restack" is

D1159: run-tests: move newline out of colorized message

2017-10-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The leading newline before "ERROR:" led to an incorrect lexing of the message and the newline got lost. The fixed formatting can be seen in the test case.

D1063: rebase: enable multidest by default

2017-10-17 Thread quark (Jun Wu)
quark added a comment. https://phab.mercurial-scm.org/D1139 changes restack to use revsets. The resulting code is simpler, and no longer do duplicated rebases. From a high level, this feature basically allows some user-invisible logic like rebase source and destination decision to be

D1158: test-show: make it compatible with chg

2017-10-17 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The show extension reads `commands.show.aliasprefix` config in its `extsetup` and that causes issues with chg. This patch adds that config item to chg confighash

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

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 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

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 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 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

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.

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 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 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

[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

[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 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 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

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

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

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

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

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

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.

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

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

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

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

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 ___

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

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

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

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

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

  1   2   >