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

2018-03-04 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2a258985ffeb: revsetlang: add a hint for more useful parse errors (authored by ryanmce, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2619?vs=6507=6540#toc REPOSITORY rHG

D2589: setup: ignore extension load failures when finding working hg

2018-03-04 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5f41e3418407: setup: ignore extension load failures when finding working hg (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

D2572: xdiff: vendor xdiff library from git

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce planned changes to this revision. ryanmce added a comment. This existing directory is called `thirdparty` not `third-party`, unfortunately. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2572 To: ryanmce, #hg-reviewers Cc: quark, mercurial-devel

D2068: revlog: do not use delta for lfs revisions

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > quark wrote in revlog.py:2110 > `candelta` takes two revisions. Here there is only one revision. It's > possible to pass a useless revision but that has unnecessary overhead. > > `candelta` also fetches `flags`, here we already know the values

D2067: changegroup: do not delta lfs revisions

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > revlog.py:746 > +def candelta(self, baserev, rev): > +"""whether two revisions (prev, rev) can be delta-ed or not""" > +# Disable delta if either rev requires a content-changing flag `prev` should be `baserev`? REPOSITORY

D2068: revlog: do not use delta for lfs revisions

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > revlog.py:2110 > +# no delta for flag processor revision (see "candelta" for why) > +if flags & REVIDX_KNOWN_FLAGS: > +deltainfo = None Why is this not `candelta()`? REPOSITORY rHG Mercurial REVISION DETAIL

D2577: mdiff: prefer xdiff for diff calculation

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > quark wrote in mdiff.py:34 > The diff functions below do not have an `ui` object. Would you be okay if the > config is global? ex. something like > > # mdiff.py > def setdiffalgo(name): > global blocks > if name == 'xdiff': >

D2589: setup: ignore extension load failures when finding working hg

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, `make local` would fail if any extension was not properly loading. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2589

D2572: xdiff: vendor xdiff library from git

2018-03-03 Thread ryanmce (Ryan McElroy)
ryanmce added a subscriber: quark. ryanmce added a comment. To be clear, this patch series was created by @quark, but phabricator did not keep the author information from the patches. I've ported it here to generate discussion about this as a path forward. REPOSITORY rHG Mercurial

D2573: xdiff: remove patience and histogram diffs

2018-03-02 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY They are greedy algorithms that yields suboptimal results. Patience diff has been advertised as "slower, but generating better results sometimes" for a long

D2575: xdiff: add a bdiff hunk mode

2018-03-02 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY xdiff generated hunks for the differences (ex. questionmarks in the `@@ -?,? +?,? @@` part from `diff --git` output). However, bdiff generates matched hunks

D2578: xdiff: enable indent heuristic unconditionally

2018-03-02 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Enable the indent heuristic feature unconditionally, since it provides nice visual improvements. See the added test, and [1]. [1]:

D2577: mdiff: prefer xdiff for diff calculation

2018-03-02 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Let's switch to xdiff for its better diff quality and faster performance! bdiff is still used as a fallback for cases xdiff isn't built, or the pure Python

D2576: xdiff: add a python wrapper

2018-03-02 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Implement a `mercurial.cext.xdiff` module that exposes the xdiff algorithm. `xdiff.blocks` should be a drop-in replacement for `bdiff.blocks`. In theory

Re: [PATCH 1 of 6 remotenames-ext] Back out "remotenames: push anonymous head if --force is given"

2018-02-21 Thread Ryan McElroy
On 2/20/18 11:44 PM, Sean Farley wrote: Ryan McElroy <r...@fb.com> writes: # HG changeset patch # User Ryan McElroy <rmcel...@fb.com> # Date 1519040197 28800 # Mon Feb 19 03:36:37 2018 -0800 # Node ID 6b80188783ee2626030113a9b2319f2fd14a8

[PATCH 5 of 6 remotenames-ext] tests: test various combinations of repos with and without extension

2018-02-19 Thread Ryan McElroy
# HG changeset patch # User Ryan McElroy <rmcel...@fb.com> # Date 1519041052 28800 # Mon Feb 19 03:50:52 2018 -0800 # Node ID 0cf83d6117fa918a8a9f6da6bd9747e09241de2a # Parent b1949aca17c6456ba1a7599e9ca121d269fb1ce6 tests: test various combinations of repos with and without extension

[PATCH 4 of 6 remotenames-ext] push: do not over-check for svn/git push targets

2018-02-19 Thread Ryan McElroy
# HG changeset patch # User Ryan McElroy <rmcel...@fb.com> # Date 1519041052 28800 # Mon Feb 19 03:50:52 2018 -0800 # Node ID b1949aca17c6456ba1a7599e9ca121d269fb1ce6 # Parent 50ca5e43b0b816aeabcfd50b09dd9728c02dac86 push: do not over-check for svn/git push targets Previously, if th

[PATCH 3 of 6 remotenames-ext] discovery: do not crash if no bookmarks are passed to push discovery

2018-02-19 Thread Ryan McElroy
# HG changeset patch # User Ryan McElroy <rmcel...@fb.com> # Date 1519041052 28800 # Mon Feb 19 03:50:52 2018 -0800 # Node ID 50ca5e43b0b816aeabcfd50b09dd9728c02dac86 # Parent 7cee78e9b823b9671cbfff28086a0cb914a2edf0 discovery: do not crash if no bookmarks are passed to push discovery

[PATCH 2 of 6 remotenames-ext] tests: update with new hg output

2018-02-19 Thread Ryan McElroy
# HG changeset patch # User Ryan McElroy <rmcel...@fb.com> # Date 1519041042 28800 # Mon Feb 19 03:50:42 2018 -0800 # Node ID 7cee78e9b823b9671cbfff28086a0cb914a2edf0 # Parent 6b80188783ee2626030113a9b2319f2fd14a8119 tests: update with new hg output diff --git a/tests/test-http.t b

[PATCH 1 of 6 remotenames-ext] Back out "remotenames: push anonymous head if --force is given"

2018-02-19 Thread Ryan McElroy
# HG changeset patch # User Ryan McElroy <rmcel...@fb.com> # Date 1519040197 28800 # Mon Feb 19 03:36:37 2018 -0800 # Node ID 6b80188783ee2626030113a9b2319f2fd14a8119 # Parent 905b79d62df82d8ca16ecac175e6236fe959f4ed Back out "remotenames: push anonymous head if --force is given

[PATCH 6 of 6 remotenames-ext] remotenames: do not expect repo._remotenames to be set unconditionally

2018-02-19 Thread Ryan McElroy
# HG changeset patch # User Ryan McElroy <rmcel...@fb.com> # Date 1519041052 28800 # Mon Feb 19 03:50:52 2018 -0800 # Node ID 97562271ac3533d9d1b323611fc9057989727b5d # Parent 0cf83d6117fa918a8a9f6da6bd9747e09241de2a remotenames: do not expect repo._remotenames to be set unconditi

D1506: dagop: handle IndexError when using wdir() in dag range

2017-11-26 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I understand that fixing the crash is a good first step, but ideally, wouldn't this be supported? Is there a reason it's particularly hard to support? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1506 To: swhitaker, #hg-reviewers,

D1332: cmdutil: create dirs for templated cat file output

2017-11-09 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG407ec7f3ff02: cmdutil: create dirs for templated cat file output (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1331: cat: test output path behvaior when target path does not exist

2017-11-09 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8154119ed236: cat: test output path behvaior when target path does not exist (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1331: cat: test output path behvaior when target path does not exist

2017-11-07 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In the next patch, we will change the behavior of the cat command to create output file parent directories before attempting to write the output file. This

D1332: cmdutil: create dirs for templated cat file output

2017-11-07 Thread ryanmce (Ryan McElroy)
ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, the caller was responsible for creating the directory structure of files written out using a path template. This is onerous, especially if the exact

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

2017-10-19 Thread Ryan McElroy
On 10/18/17 11:40 AM, Augie Fackler wrote: We would prefer to have it in this cycle. We want all extensions to have their configuration registered to start beginning working on the cool stuff. Closing the loop from an irc conversation: my concern was that there be a transitional release that

D932: filemerge: introduce functions to halt merge flow

2017-10-19 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > martinvonz wrote in filemerge.py:755-756 > nit: Is the default used only with non-interactive ui? If it also works as a > default that lets the user just press enter to choose Yes, I'd expect the > "yn" to be "Yn" I followed the pattern seen

D952: merge: additional test cases to show merge-halting behavior

2017-10-18 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe10bac797852: merge: additional test cases to show merge-halting behavior (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 >

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

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

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

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,

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

D932: filemerge: introduce functions to halt merge flow

2017-10-16 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa1625035db16: filemerge: introduce functions to halt merge flow (authored by ryanmce, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D932?vs=2501=2876#toc REPOSITORY rHG

D951: merge: allow user to halt merge on merge-tool failures

2017-10-16 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf583cef55995: merge: allow user to halt merge on merge-tool failures (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

2017-10-16 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/D1099 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D1101: wireproto: use a proper exception instead of `assert False`

2017-10-16 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/D1101 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D1104: peer: ensure command names are always ascii bytestrs

2017-10-16 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/D1104 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D1100: wireproto: use listcomp instead of map()

2017-10-16 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/D1100 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D1103: httppeer: always produce native str header keys and values

2017-10-16 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/D1103 To: durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D931: merge: ensure that we always commit the mergestate

2017-10-13 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc0a524f77e8a: merge: ensure that we always commit the mergestate (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D930: merge: add tests to show current behavior on failed filemerges

2017-10-13 Thread ryanmce (Ryan McElroy)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG143337bcec9b: merge: add tests to show current behavior on failed filemerges (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

2017-10-13 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. Seems like we should figure out the spacing stuff on https://phab.mercurial-scm.org/D1028 before moving forward here. REPOSITORY rHG Mercurial REVISION DETAIL

D1046: tweakdefaults: enable rebase

2017-10-13 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision as: ryanmce. ryanmce added a comment. Accepting as myself (not as a reviewer though, since we're both FB). I'm a big +1 on this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1046 To: quark, #hg-reviewers, ryanmce Cc: ryanmce,

D1028: mpatch: reformat function prototypes with clang-format

2017-10-13 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. I thought it was string that check-code doesn't fire on https://phab.mercurial-scm.org/D1030 but does fire here. It turns out that the check-code only finds spaces at the start of the line. So is you start with a tab and then spaces, that's fine. But if you

D1053: i18n: cache translated messages per encoding

2017-10-13 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/D1053 To: yuja, #hg-reviewers, quark, ryanmce Cc: ryanmce, quark, mercurial-devel

D950: run-tests: update back to original node after bisecting

2017-10-13 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision as: ryanmce. ryanmce added a comment. I like this overall; but I don't feel I can queue a new flag to bisect without input from the rest of the community. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D950 To: quark,

D950: run-tests: update back to original node after bisecting

2017-10-13 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > quark wrote in run-tests.py:2124-2153 > During the meeting deciding to experiment with Phabricator, I think we agreed > that with Phabricator's ability to diff with whitespaces ignored >

D1044: bisect: add --abort flag

2017-10-13 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > commands.py:800 > +if firsttime: > +raise error.Abort(_('not in a bisect')) > +cmdutil.checkunfinished(repo) Histedit does

D1016: repoview: remove incorrect documentation of the function

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

D1034: codemod: use pycompat.iswindows

2017-10-13 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. Thanks for making this nice improvement @quark! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1034 To: quark, #hg-reviewers, spectral, lothiraldan Cc: ryanmce, mercurial-devel ___

D1021: check-code: forbid platform.system()

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. +1 to this change, happy to land this once my comments on the series are addressed REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1021 To: quark, #hg-reviewers, lothiraldan Cc: ryanmce, lothiraldan, mercurial-devel

D1020: largefiles: do not use platform.system()

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > lfutil.py:83 > return os.path.join(appdata, longname) > -elif platform.system() == 'Darwin': > +elif pycompat.sysplatform == 'darwin':

D1019: logtoprocess: do not use platform.system()

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. I'm +1 on this direction but think we shouldn't `have == 'nt'` as the "is this windows?" check here. INLINE COMMENTS > logtoprocess.py:55 > def uisetup(ui): > -if

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

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added a comment. I think we need to take a step back and think through how to implement this more robustly than we have currently done in the remotenames extension: - storage file names - storage format I like that you've split

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

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > remotenames.py:10-19 > +def splitremotename(remote): > +name = '' > +if '/' in remote: > +remote, name = remote.split('/', 1) > +return

D937: remotenames: move function to pull remotenames from the remoterepo to core

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. INLINE COMMENTS > remotenames.py:10 > + > +def pullremotenames(localrepo, remoterepo, remotepath): > +""" pulls bookmarks and branches information of the remote repo during a It might be better to call this

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

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. INLINE COMMENTS > remotenames.py:31 > > +def getremotevfs(repo): > +""" returns a vfs object for .hg/remotenames/ This is not a great name. It implies it's a vfs on a remote peer, which is definitely not what we

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

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > durham wrote in test-directaccess.t:64 > I'm still not sure we want to support rev numbers. I think we definitely > don't want to support them for write

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

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > ryanmce wrote in run-tests.py:2116 > I can do this in-flight Actually, since I've asked for changed on the topmost revision, can you fix this up with the next submission please? REPOSITORY rHG Mercurial REVISION DETAIL

D950: run-tests: update back to original node after bisecting

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. I'm +1 on this series and the rest looks fine but I think this one needs some improvements before landing. INLINE COMMENTS > run-tests.py:2115-2116 > return data

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

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > dlax wrote in run-tests.py:2116 > Perhaps also update the indentation of continuation line? I can do this in-flight REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D948 To: quark, #hg-reviewers Cc: ryanmce, dlax,

D1016: repoview: remove incorrect documentation of the function

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. I agree that removing is better than leaving bad docs, so I'm +1 on this, but as @dlax suggests, improving it would be even better. If you don't have ideas on how to

D1009: bdiff: remove trailing newlines

2017-10-12 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/D1009 To: durin42, #hg-reviewers, pulkit, ryanmce Cc: ryanmce, mercurial-devel

D1004: bdiff: format header file with clang-format

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > bdiff.h:18 > int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn, > - struct bdiff_hunk *base); > + struct bdiff_hunk *base); > void bdiff_freehunks(struct bdiff_hunk *l); This doesn't show up in

D930: merge: add tests to show current behavior on failed filemerges

2017-10-12 Thread ryanmce (Ryan McElroy)
ryanmce added a comment. > I guess you missed phabricator.callsign = HG in .hg/hgrc. Yes, that's the case. I've fixed that in my repo. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D930 To: ryanmce, #hg-reviewers, quark Cc: quark, krbullock,

D821: unamend: move fb extension unamend to core

2017-10-11 Thread ryanmce (Ryan McElroy)
ryanmce added inline comments. INLINE COMMENTS > ryanmce wrote in uncommit.py:260 > Test test Tested nested comments, sorry for the spam. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D821 To: pulkit, #hg-reviewers, durham Cc: ryanmce, singhsrb, durham,

D945: fsmonitor: update to match new dirstate refactor

2017-10-11 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D945 To: durham, #hg-reviewers, quark, yuja, ryanmce Cc: ryanmce, yuja, mercurial-devel ___ Mercurial-devel

D1000: contrib: add check-code rule banning use of readlink

2017-10-11 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/D1000 To: durin42, #hg-reviewers, quark, ryanmce Cc: ryanmce, quark, mercurial-devel

D1001: ui: recommend tweakdefaults in the default hgrc template

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

D1001: ui: recommend tweakdefaults in the default hgrc template

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

  1   2   3   4   >