D913: test-globalopts: make the test compatible with chg

2017-10-02 Thread quark (Jun Wu)
quark requested changes to this revision. quark added a comment. This revision now requires changes to proceed. `--traceback` turns on traceback printing. This means chg does not do what is expected. To unblock the test, we can explicitly document that chg is broken here: #if chg

D915: test-devel-warnings: make the test compatible with chg

2017-10-02 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > test-devel-warnings.t:119-150 > + */mercurial/dispatch.py:81 in run (glob) > + */mercurial/dispatch.py:163 in dispatch (glob) > + */mercurial/dispatch.py:303 in _runcatch (glob) > + */mercurial/dispatch.py:311 in

D918: test-revlog-mmapindex: be compatible with chg

2017-10-02 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test misses an explicit flush(). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D918 AFFECTED FILES

D917: eol: make [eol] config section sensitive for chg confighash

2017-10-02 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The eol extension may mangle the [eol] config section and that means chg is unable to detect config file change (because it re-applies setconfig changes).

D915: test-devel-warnings: make the test compatible with chg

2017-10-02 Thread singhsrb (Saurabh Singh)
singhsrb added inline comments. INLINE COMMENTS > test-devel-warnings.t:102 >devel-warn: "wlock" acquired after "lock" at: > - */hg:* in * (glob) > + */hg:* in (glob) > */mercurial/dispatch.py:* in run (glob) Fixed this to be consistent with the rest of the test REPOSITORY rHG

D915: test-devel-warnings: make the test compatible with chg

2017-10-02 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test fails when run with the "--chg" option. Therefore, this commit makes it compatible with chg. TEST PLAN Ran the test "test-devel-warnings' with and

D914: test-logtoprocess: make it chg compatible

2017-10-02 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY chg runs more commands and outputs more lines. This patch matches them. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D914 AFFECTED

D913: test-globalopts: make the test compatible with chg

2017-10-02 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test fails when run with the '--chg' option. Therefore, this commit modifies the test to make it compatible with chg. TEST PLAN Ran 'test-globalopts.t'

D912: test-alias: make it compatible with chg

2017-10-02 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/rHGad1bdea43965ec3d14d6a343bbec4e289208949c (dispatch: defer environment variable resolution in alias commands (BC), 2016-05-06)

D911: test-pager: make it work with chg

2017-10-02 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY chg's runpager implementation is different. It behaves differently for the "shell=False, command not found" case. REPOSITORY rHG Mercurial REVISION DETAIL

D782: merge: improve error messages for path conflicts during update

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2359. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D782?vs=2218=2359 REVISION DETAIL https://phab.mercurial-scm.org/D782 AFFECTED FILES mercurial/merge.py tests/test-merge1.t

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

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2362. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D785?vs=2221=2362 REVISION DETAIL https://phab.mercurial-scm.org/D785 AFFECTED FILES mercurial/context.py tests/test-pathconflicts-basic.t CHANGE DETAILS

D861: commands: tidy up merge state decoding in resolve

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2365. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D861?vs=2223=2365 REVISION DETAIL https://phab.mercurial-scm.org/D861 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D787: tests: add test for path conflicts during merge

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2364. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D787?vs=2005=2364 REVISION DETAIL https://phab.mercurial-scm.org/D787 AFFECTED FILES tests/test-pathconflicts-merge.t CHANGE DETAILS diff --git

D781: merge: check for path conflicts when updating (issue5628)

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2358. mbthomas retitled this revision from "merge: check for path conflicts when updating" to "merge: check for path conflicts when updating (issue5628)". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D784: merge: check for path conflicts when merging (issue5628)

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2361. mbthomas retitled this revision from "merge: check for path conflicts when merging" to "merge: check for path conflicts when merging (issue5628)". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D784?vs=2220=2361

D786: tests: add test for path conflicts during update

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2363. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D786?vs==2363 REVISION DETAIL https://phab.mercurial-scm.org/D786 AFFECTED FILES tests/test-pathconflicts-update.t CHANGE DETAILS diff --git

D783: util: add safename function for generating safe names to rename to

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2360. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D783?vs=2219=2360 REVISION DETAIL https://phab.mercurial-scm.org/D783 AFFECTED FILES mercurial/util.py CHANGE DETAILS diff --git a/mercurial/util.py

D779: merge: add _checkunknowndirs function for detecting path conflicts

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2356. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D779?vs=2215=2356 REVISION DETAIL https://phab.mercurial-scm.org/D779 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D780: merge: rename conflicts to fileconflicts in _checkunknownfiles

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2357. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D780?vs=2216=2357 REVISION DETAIL https://phab.mercurial-scm.org/D780 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D775: commands: update the resolve command to handle path conflicts

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2352. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D775?vs=2211=2352 REVISION DETAIL https://phab.mercurial-scm.org/D775 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D778: merge: backup conflicting directories when getting files

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2355. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D778?vs=2214=2355 REVISION DETAIL https://phab.mercurial-scm.org/D778 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D777: merge: add merge action 'pr' to rename files during update

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2354. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D777?vs=2213=2354 REVISION DETAIL https://phab.mercurial-scm.org/D777 AFFECTED FILES mercurial/merge.py mercurial/sparse.py CHANGE DETAILS diff --git

D776: merge: add merge action 'p' to record path conflicts during update

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2353. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D776?vs=2212=2353 REVISION DETAIL https://phab.mercurial-scm.org/D776 AFFECTED FILES mercurial/merge.py mercurial/sparse.py CHANGE DETAILS diff --git

D774: merge: add pathconflict merge state

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2351. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D774?vs=2210=2351 REVISION DETAIL https://phab.mercurial-scm.org/D774 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D680: scmutil: handle conflicting files and dirs in origbackuppath

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas updated this revision to Diff 2350. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D680?vs=2208=2350 REVISION DETAIL https://phab.mercurial-scm.org/D680 AFFECTED FILES mercurial/scmutil.py tests/test-origbackup-conflict.t CHANGE DETAILS

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

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas added inline comments. INLINE COMMENTS > kiilerix wrote in test-pathconflicts-basic.t:38 > I don't know about these `~hash` files, but including the `+` in the name > definitely seems wrong. I will strip the `+` characters. I didn't know these caused problems on Windows. REPOSITORY

D778: merge: backup conflicting directories when getting files

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas added inline comments. INLINE COMMENTS > kiilerix wrote in merge.py:1175 > This seems quite a bit slower. But I guess it never will happen in tight > loops? If we have to backup a lot of files, then we have lost anyway? It will happen in `batchget`, which is for each file that is

D680: scmutil: handle conflicting files and dirs in origbackuppath

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas added a comment. With `ui.origbackuppath` set to some value, backup should be completely reliable. The file at `$origbackuppath/path/to/file` will be the most recent version of that file that was backed up. It will be overwritten/deleted if a backup of any file named

D894: fsmonitor: warn when fsmonitor could be used

2017-10-02 Thread mbthomas (Mark Thomas)
mbthomas accepted this revision. mbthomas added a comment. LGTM INLINE COMMENTS > merge.py:1739-1743 > +if fsmonitorwarning \ > +and not fsmonitorenabled \ > +and p1.node() == nullid \ > +and len(actions['g']) >= fsmonitorthreshold \ >

D907: cext: move braces for control statements to same line

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg added a comment. FWIW, this series stemmed from me hacking on a `.clang-format` file. I want the big patch where we run clang-format on the repo to be as simple as possible. This series (so far) is all about introducing consistency in our C code. REPOSITORY rHG Mercurial

D910: cext: wrap before brace for functions

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is our prevailing style. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D910 AFFECTED FILES mercurial/cext/manifest.c

D908: cext: reorder #include

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We mostly abide by this style. In one case, a blank line was inserted to prevent a local `#include "file"` from coming before a `#include `. REPOSITORY

D907: cext: move braces for control statements to same line

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This seems to be the prevailing style in the code by a wide margin. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D907 AFFECTED

D909: cext: put case statements on separate line

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This seems to be the prevailing style, even though it is a bit more verbose for very simple switch statements. REPOSITORY rHG Mercurial REVISION DETAIL

D906: registrar: fixing typo in comment

2017-10-02 Thread singhsrb (Saurabh Singh)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc1fe66e89f57: registrar: fixing typo in comment (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D906?vs=2344=2345 REVISION

D906: registrar: fixing typo in comment

2017-10-02 Thread singhsrb (Saurabh Singh)
singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I was just going through the module and noticed the typo. This commit fixes 'onfalure' -> 'onfailure'. TEST PLAN Read it again :) REPOSITORY rHG Mercurial

D905: style: never put multiple statements on one line

2017-10-02 Thread alex_gaynor (Alex Gaynor)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5326e4ef1dab: style: never put multiple statements on one line (authored by alex_gaynor, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D905: style: never put multiple statements on one line

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg added subscribers: sid0, indygreg. indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Since you weren't at the Sprint, I think the decision for style is that we'd check the existing wiki page for the style guide into the repo

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2f5a135b2b04: annotate: track whether a particular annotation was the result of a skip (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D897: context: rename local 'attr' to 'attr_'

2017-10-02 Thread sid0 (Siddharth Agarwal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG52e9310626a8: context: rename local attr to attr_ (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D897?vs=2318=2339 REVISION

D896: annotate: move annotatepair unit tests to a separate file

2017-10-02 Thread sid0 (Siddharth Agarwal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG80215865d154: annotate: move annotatepair unit tests to a separate file (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D895: check-code: allow an exception for camelcase where required

2017-10-02 Thread sid0 (Siddharth Agarwal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb332c01247d8: check-code: allow an exception for camelcase where required (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D901: changelog: use a Factory for default value for files

2017-10-02 Thread lothiraldan (Boris Feld)
lothiraldan accepted this revision. lothiraldan added a comment. Looks good to me and seems coherent with what attr documentation recommends. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D901 To: indygreg, #hg-reviewers, lothiraldan Cc: lothiraldan,

D905: style: never put multiple statements on one line

2017-10-02 Thread alex_gaynor (Alex Gaynor)
alex_gaynor added a comment. This, and the other style things I've sent PRs for, were discovered with `flake8 --select=E714,E701,E203 mercurial/`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D905 To: alex_gaynor, durin42, #hg-reviewers, ryanmce Cc: ryanmce,

D905: style: never put multiple statements on one line

2017-10-02 Thread lothiraldan (Boris Feld)
lothiraldan added a comment. If the Style Czar or Style Committee agree with this change, could we add pylint check? The msg id for these errors is "multiple-statements (C0321)" REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D905 To: alex_gaynor, durin42,

D905: style: never put multiple statements on one line

2017-10-02 Thread ryanmce (Ryan McElroy)
ryanmce accepted this revision. ryanmce added a comment. This seems like a straightforward win. Is there any way we can add a check-code for this if we don't already have one? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D905 To: alex_gaynor, durin42,

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Immutability is a magical property, isn't it ;) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D899 To: sid0, #hg-reviewers, indygreg Cc: indygreg,

D789: merge: add option to abort merge process on failure

2017-10-02 Thread ryanmce (Ryan McElroy)
ryanmce planned changes to this revision. ryanmce added a comment. This doesn't actually lead to merge conflicts in the repo -- the error.Abort is "too strong". I need deeper surgery here. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D789 To: ryanmce,

D889: url: use native strings for header values

2017-10-02 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0ee9cf8d054a: url: use native strings for header values (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D889?vs=2301=2336

D885: httppasswordmgrdbproxy: specify exact arguments

2017-10-02 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGae2fcf7af409: httppasswordmgrdbproxy: specify exact arguments (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D888: keepalive: python 3 portability tweaks

2017-10-02 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa454123f5d94: keepalive: python 3 portability tweaks (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D888?vs=2300=2335

D891: cleanup: use urllibcompat for renamed methods on urllib request objects

2017-10-02 Thread yuja (Yuya Nishihara)
yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. Maybe we'll have to work around unicode/bytes dance in urllibcompat.py, but this patch looks good as itself. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D891

D890: urllibcompat: new library to help abstract out some python3 urllib2 stuff

2017-10-02 Thread yuja (Yuya Nishihara)
yuja requested changes to this revision. yuja added a comment. This revision now requires changes to proceed. Please add GPL boilerplate. FWIW, we might want to move some urllib-related hacks from pycompat.py. REPOSITORY rHG Mercurial REVISION DETAIL

D887: httppeer: use native strings for headers

2017-10-02 Thread yuja (Yuya Nishihara)
yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > httppeer.py:233 > encargs = urlreq.urlencode(sorted(args.items())) > -for header, value in encodevalueinheaders(encargs,

D886: ui: convert to/from Optional[bytes] to Optional[str] in password manager

2017-10-02 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > durin42 wrote in ui.py:141 > Experimentally not true: if I don't do the ispy3 check, tests fail. No idea why. strurl() should just return the input on Py2. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D886 To:

D789: merge: add option to abort merge process on failure

2017-10-02 Thread ryanmce (Ryan McElroy)
ryanmce updated this revision to Diff 2333. ryanmce added a comment. fix check-code -- whoops REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D789?vs=2332=2333 BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D789 AFFECTED FILES

D789: merge: add option to abort merge process on failure

2017-10-02 Thread ryanmce (Ryan McElroy)
ryanmce updated this revision to Diff 2332. ryanmce marked an inline comment as done. ryanmce added a comment. Followed yuja's advice and moved the abort later. This has many advantages as shown in the updated test, which shows this abort also helps with merge tool post-checks, which

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 added a comment. Turns out it actually was buggy. Thanks for catching it! I switched to using `attrs.evolve` (and in the earlier diff setting `frozen=True` to make the attr immutable) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D899 To: sid0,

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 2331. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D899?vs=2329=2331 REVISION DETAIL https://phab.mercurial-scm.org/D899 AFFECTED FILES mercurial/context.py tests/test-annotate.py CHANGE DETAILS diff --git

D898: annotate: introduce attr for storing per-line annotate data

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 2328. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D898?vs=2319=2328 REVISION DETAIL https://phab.mercurial-scm.org/D898 AFFECTED FILES mercurial/commands.py mercurial/context.py mercurial/hgweb/webcommands.py

D900: annotate: mark lines affected by skip-annotate with *

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 2330. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D900?vs=2321=2330 REVISION DETAIL https://phab.mercurial-scm.org/D900 AFFECTED FILES mercurial/commands.py tests/test-annotate.t CHANGE DETAILS diff --git

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 2329. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D899?vs=2320=2329 REVISION DETAIL https://phab.mercurial-scm.org/D899 AFFECTED FILES mercurial/context.py tests/test-annotate.py CHANGE DETAILS diff --git

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 added inline comments. INLINE COMMENTS > sid0 wrote in context.py:1164-1165 > Good question! Not in this case, because a particular annotation can never go > from skip=True to skip=False. If we decide to overwrite the annotation > afterwards, the whole object is replaced, not just fctx

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 added a comment. I'll add a comment explaining that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D899 To: sid0, #hg-reviewers Cc: indygreg, mercurial-devel ___ Mercurial-devel mailing list

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 added inline comments. INLINE COMMENTS > indygreg wrote in context.py:1164-1165 > I see that we're copying a ref to the object instead of making an object > copy. When we had tuples, that was fine because tuples are immutable. But > with attr, instances can be modified. > > Will this

D900: annotate: mark lines affected by skip-annotate with *

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 added a comment. Yeah, I plan to do all of those before marking the option un-experimental. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D900 To: sid0, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel ___

D789: merge: add option to abort merge process on failure

2017-10-02 Thread ryanmce (Ryan McElroy)
ryanmce marked 4 inline comments as done. ryanmce added inline comments. INLINE COMMENTS > yuja wrote in filemerge.py:734 > Perhaps it's better to abort here, not in _xmerge(). > > Several merge tools do not return non-zero status on error, so > we have extra _check() to detect merge error. I

D905: style: never put multiple statements on one line

2017-10-02 Thread alex_gaynor (Alex Gaynor)
alex_gaynor created this revision. alex_gaynor added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH style-fixes (bookmark) on default (branch) REVISION DETAIL https://phab.mercurial-scm.org/D905

[Bug 5698] New: test-status-color.t test failure

2017-10-02 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5698 Bug ID: 5698 Summary: test-status-color.t test failure Product: Mercurial Version: 4.3.3 Hardware: PC OS: NetBSD Status: UNCONFIRMED Severity: feature

[Bug 5697] New: test-hghave.t test failure

2017-10-02 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5697 Bug ID: 5697 Summary: test-hghave.t test failure Product: Mercurial Version: 4.3.3 Hardware: PC OS: NetBSD Status: UNCONFIRMED Severity: feature

D900: annotate: mark lines affected by skip-annotate with *

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. This seems reasonable. Potential follow-ups: 1. Documentation in help output. 2. Inline output saying * denotes skip? 3. Support in templater for indicating skip (maybe

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg added a comment. Before I stamp this I'd like an answer to the mutability concerns. INLINE COMMENTS > context.py:1164-1165 > ak = min(a1 + (bk - b1), a2 - 1) > child[0][bk] = parent[0][ak] > +

D898: annotate: introduce attr for storing per-line annotate data

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. The new code is so much easier to read! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D898 To: sid0, #hg-reviewers, indygreg Cc: indygreg,

D897: context: rename local 'attr' to 'attr_'

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I could bikeshed the naming. But if there isn't automated style checking to flag it as bad, then it's good. REPOSITORY rHG Mercurial REVISION DETAIL

D901: changelog: use a Factory for default value for files

2017-10-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The default value is compiled into the generated type. This means that default values are shared between instances. For immutable types like bool, str, int,

D886: ui: convert to/from Optional[bytes] to Optional[str] in password manager

2017-10-02 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > yuja wrote in ui.py:141 > Nit: no need to check if ispy3. Experimentally not true: if I don't do the ispy3 check, tests fail. > yuja wrote in ui.py:169 > No idea how user and passwd are encoded, but encoding.strfromlocal() might > be better

D886: ui: convert to/from Optional[bytes] to Optional[str] in password manager

2017-10-02 Thread yuja (Yuya Nishihara)
yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > ui.py:141 > +return None > +if pycompat.ispy3: > +return pycompat.strurl(maybebytes) Nit: no need to check if ispy3. > ui.py:169 > +

D898: annotate: introduce attr for storing per-line annotate data

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We're going to extend this a bit -- at first by simply adding whether this was a skipped child. We're well on our way to outgrowing tuples, though -- adding more

D900: annotate: mark lines affected by skip-annotate with *

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is to prevent weird surprises from happening with skips being attributed to the wrong changeset. REPOSITORY rHG Mercurial REVISION DETAIL

D896: annotate: move annotatepair unit tests to a separate file

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In upcoming patches the output is going to be significantly longer than it is today, and doctests don't allow wrapping the output. REPOSITORY rHG Mercurial

D899: annotate: track whether a particular annotation was the result of a skip

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We're going to expose this information in the UI in an upcoming patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D899 AFFECTED

D895: check-code: allow an exception for camelcase where required

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY unittest has a `maxDiff` parameter which has to be set to `None` in order for large enough failure diffs to be displayed. Add a comment to disable the camelcase

D897: context: rename local 'attr' to 'attr_'

2017-10-02 Thread sid0 (Siddharth Agarwal)
sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In the next diff we're going to import mercurial.thirdparty.attr, and pyflakes complains about this if this rename isn't done. REPOSITORY rHG Mercurial REVISION