D355: contrib: add check flag for use of admonitions and its validity

rishabhmadan96 abandoned this revision. rishabhmadan96 marked an inline comment as done. rishabhmadan96 added a comment. In https://phab.mercurial-scm.org/D355#6196, @durin42 wrote: > is this the same thing as https://phab.mercurial-scm.org/D368? Should we close this one in favor of that

[PATCH 4 of 6] i18n: use saved object to get actual function information if available

# HG changeset patch # User FUJIWARA Katsunori # Date 1502792844 -32400 # Tue Aug 15 19:27:24 2017 +0900 # Node ID b6dd19c795147e675b9caf58383b6cafd3f03534 # Parent 1d204d17d51eb143f1ef66426cec1831cd8c93bf # Available At https://bitbucket.org/foozy/mercurial-wip #

[PATCH 1 of 6] i18n: make hggettext use original docstring to compute offset

# HG changeset patch # User FUJIWARA Katsunori # Date 1501603400 -32400 # Wed Aug 02 01:03:20 2017 +0900 # Node ID 17bdacaa47c5b08ebe4e5b8e140b9c0f6d4bf129 # Parent 05264fc9d8d64159ab942c1bde400238f2c0ec88 # Available At https://bitbucket.org/foozy/mercurial-wip #

[PATCH 3 of 6] i18n: ignore doctest part to avoid warning at "make update-pot"

# HG changeset patch # User FUJIWARA Katsunori # Date 1502605216 -32400 # Sun Aug 13 15:20:16 2017 +0900 # Node ID 1d204d17d51eb143f1ef66426cec1831cd8c93bf # Parent abd0f3801a00bf7d3e5a74de796ec68d97d3e9dd # Available At https://bitbucket.org/foozy/mercurial-wip #

[PATCH 2 of 6] largefiles: fix help text to avoid warning at "make update-pot"

# HG changeset patch # User FUJIWARA Katsunori # Date 1501604107 -32400 # Wed Aug 02 01:15:07 2017 +0900 # Node ID abd0f3801a00bf7d3e5a74de796ec68d97d3e9dd # Parent 17bdacaa47c5b08ebe4e5b8e140b9c0f6d4bf129 # Available At https://bitbucket.org/foozy/mercurial-wip #

[PATCH 6 of 6] i18n: get translation entries for description of each compression engines

# HG changeset patch # User FUJIWARA Katsunori # Date 1502798973 -32400 # Tue Aug 15 21:09:33 2017 +0900 # Node ID 2f24939cbd6674abc6815746a07049fa98fa7fa6 # Parent 9278f5eb1e79227c875ddf3a2147b18fc529c504 # Available At https://bitbucket.org/foozy/mercurial-wip #

D368: releasenotes: add check flag for use of admonitions and its validity

durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. A style nit, generally +1 and if you get the style nits handled we should be good to go. INLINE COMMENTS > releasenotes.py:266 > +else: > +

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

phillco added inline comments. INLINE COMMENTS > durin42 wrote in util.py:1862 > This function makes me really nervous, because it's a naive datetime rather > than a tz-aware datetime. Could we do better about preserving the exact > point-in-time value of the tz-aware time information? > >

D360: log: add a "graphwidth" template variable

hooper updated this revision to Diff 941. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D360?vs=940=941 REVISION DETAIL https://phab.mercurial-scm.org/D360 AFFECTED FILES mercurial/cmdutil.py mercurial/graphmod.py mercurial/templatekw.py

D355: contrib: add check flag for use of admonitions and its validity

durin42 added a comment. is this the same thing as https://phab.mercurial-scm.org/D368? Should we close this one in favor of that one? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D355 To: rishabhmadan96, #hg-reviewers, pulkit Cc: durin42, pulkit,

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

phillco added a comment. r https://phab.mercurial-scm.org/rHG87c6ad2251d8703d7f16d51e99e3d1c040f0be49 INLINE COMMENTS > phillco wrote in util.py:1862 > Hm, good question. I only do that because that's what the earlier code did -- > that change dates from

[PATCH 5 of 6] i18n: ignore docstring for modules under mercurial

# HG changeset patch # User FUJIWARA Katsunori # Date 1502798786 -32400 # Tue Aug 15 21:06:26 2017 +0900 # Node ID 9278f5eb1e79227c875ddf3a2147b18fc529c504 # Parent b6dd19c795147e675b9caf58383b6cafd3f03534 # Available At https://bitbucket.org/foozy/mercurial-wip #

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

durin42 added inline comments. INLINE COMMENTS > util.py:1862 > +def hgdatetopython(date): > +"""Returns a Python datetime from a Mercurial tuple-style date""" > +t, tz = date This function makes me really nervous, because it's a naive datetime rather than a tz-aware datetime. Could we

D333: repository: formalize wire protocol interface

This revision was automatically updated to reflect the committed changes. Closed by commit rHG558f5b2ee10e: repository: formalize wire protocol interface (authored by indygreg). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D333?vs=848=932 REVISION

D360: log: add a "graphwidth" template variable

hooper added inline comments. INLINE COMMENTS > yuja wrote in templatekw.py:768 > s/graphwidth/showgraphwidth/, and functions should be sorted alphabetically. Can you explain why it should be renamed? I thought it should mirror termwidth. They both return an integer for computations in

[Bug 5660] New: hg should not put warning messages in stdout

https://bz.mercurial-scm.org/show_bug.cgi?id=5660 Bug ID: 5660 Summary: hg should not put warning messages in stdout Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED

D350: demandimport: test whether to enable or not in hg script

quark added a comment. `sys.modules['hgdemandimport']` being set? Maybe I should remove it from commit message. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D350 To: quark, #hg-reviewers Cc: yuja, mercurial-devel

D98: revset: support reading aliases from a .hgrevsets file

quark added a comment. In https://phab.mercurial-scm.org/D98#6041, @mharbison72 wrote: > I thought about doing this, instead of fixing up a stripped down projrc extension. But then you have to get every developer to edit the local .hg/hgrc file for every clone they have. So even if we

D351: demandimport: disable by default if chg is being used

quark added a comment. I tried that approach. If we only set `HGDEMANDIMPORT` for the forked process to execute chg, it will be an infinite loop - environment config hash will mismatch. Setting `HGDEMANDIMPORT` for both the forked and non-forked chg client process seems less cleaner.

D362: hg: Avoid relying on errno numbers / descriptions

durin42 added a comment. Sigh. Do you happen to know if the names of the errno enum values is constant? If it is, maybe we could turn the number back into a name. In any case, queued for stable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D362 To:

D351: demandimport: disable by default if chg is being used

sid0 added a comment. > I tried that approach. If we only set HGDEMANDIMPORT for the forked process to execute hg server, it will be an infinite loop - environment config hash will mismatch. Setting HGDEMANDIMPORT for both the forked and non-forked chg client processes seems less cleaner.

D360: log: add a "graphwidth" template variable

hooper updated this revision to Diff 940. hooper edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D360?vs=822=940 REVISION DETAIL https://phab.mercurial-scm.org/D360 AFFECTED FILES mercurial/cmdutil.py

D361: hg: Tolerate long vs. int in test-context.py

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3889cf955a62: hg: tolerate long vs. int in test-context.py (authored by mithrandi). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D361?vs=823=929 REVISION

D362: hg: Avoid relying on errno numbers / descriptions

This revision was automatically updated to reflect the committed changes. Closed by commit rHG82c39a8ec3b1: hg: avoid relying on errno numbers / descriptions (authored by mithrandi). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D362?vs=824=930 REVISION

D337: httppeer: use peer interface

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf913e90f15a0: httppeer: use peer interface (authored by indygreg). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D337?vs=762=936 REVISION DETAIL

D339: tests: verify that peer instances only expose interface members

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb70029f355a3: tests: verify that peer instances only expose interface members (authored by indygreg). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D338: wireproto: use new peer interface

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdedab036215d: wireproto: use new peer interface (authored by indygreg). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D338?vs=763=937#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST

D335: localrepo: use peer interfaces

This revision was automatically updated to reflect the committed changes. Closed by commit rHG707750e5310b: localrepo: use peer interfaces (authored by indygreg). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D335?vs=760=934 REVISION DETAIL

D334: repository: implement generic capability methods on peer class

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa0aad86b3b6a: repository: implement generic capability methods on peer class (authored by indygreg). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D332: repository: formalize peer interface with abstract base class

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf257943e47ab: repository: formalize peer interface with abstract base class (authored by indygreg). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D332?vs=847=931

D336: sshpeer: use peer interface

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1f8460b55986: sshpeer: use peer interface (authored by indygreg). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D336?vs=761=935 REVISION DETAIL

D30: merge: Removed sorting in casefolding detection, for a slight performance win

This revision was automatically updated to reflect the committed changes. Closed by commit rHG055fee3547df: merge: removed sorting in casefolding detection, for a slight performance win (authored by alex_gaynor). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH] crecord: fixes the formatting of the select status in the status line

On Sun, Aug 13, 2017 at 01:04:52AM -0700, Filip Filmar wrote: > # HG changeset patch > # User Filip Filmar > # Date 1502608633 25200 > # Sun Aug 13 00:17:13 2017 -0700 > # Node ID 4a5fd64feb902da51e7eb5759f4c1d3966186726 > # Parent 03039ff3082b970e70f582e998a7287d1600e912

Re: [PATCH] cext: move PyInt macros to charencode.c properly

On Mon, Aug 14, 2017 at 04:53:00PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1502685326 -32400 > # Mon Aug 14 13:35:26 2017 +0900 > # Node ID 9d9186f859585f2513e3bde3a304cc72cb534565 > # Parent

D300: python3: whitelist four more passing tests

durin42 updated this revision to Diff 944. durin42 retitled this revision from "python3: whitelist two more passing tests" to "python3: whitelist four more passing tests". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D300?vs=683=944 REVISION DETAIL

D296: extensions: if on py3 and propname is a bytestr, convert to sysstr

durin42 added a comment. Take another look? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D296 To: durin42, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D376: filemerge: extract `_picklabels` as a helper function

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa6c290a77fa: filemerge: extract `_picklabels` as a helper function (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D376?vs=857=958

D375: simplemerge: write merge result to the localctx, if passed

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb86fc43e4b73: simplemerge: write merge result to the localctx, if passed (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D375?vs=856=957

D371: simplemerge: extract verifytext as a helper function

This revision was automatically updated to reflect the committed changes. Closed by commit rHGde573184686e: simplemerge: extract verifytext as a helper function (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D371?vs=852=953 REVISION

D406: commit: use context manager with dirstateguard

This revision was automatically updated to reflect the committed changes. Closed by commit rHG158dddc635ff: commit: use context manager with dirstateguard (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D406?vs=922=952 REVISION

D373: filemerge: pass contexts to simplemerge

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdb3e9f7c91aa: filemerge: pass contexts to simplemerge (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D373?vs=854=956 REVISION DETAIL

D405: commit: move dirstateguard creation out of try-block

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5d286eb7009f: commit: move dirstateguard creation out of try-block (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D405?vs=921=951

D374: simplemerge: use contexts to read file data from, if passed

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8b91a4ff23ad: simplemerge: use contexts to read file data from, if passed (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D374?vs=855=955

D372: simplemerge: add optional context parameters to simplemerge

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb3571dc0e6b8: simplemerge: add optional context parameters to simplemerge (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D372?vs=853=954

D409: copies: add more details to the documentation of mergecopies()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG42ad7cc645a4: copies: add more details to the documentation of mergecopies() (authored by pulkit). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D409?vs=942=950

D125: phabricator: add a small language to query Differential Revisions

This revision was automatically updated to reflect the committed changes. Closed by commit rHG539541779010: phabricator: add a small language to query Differential Revisions (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D126: phabricator: add status to revision query language

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfb59192b4981: phabricator: add status to revision query language (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D126?vs=841=960 REVISION

D127: phabricator: add phabupdate command to update status in batch

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6e666cd59879: phabricator: add phabupdate command to update status in batch (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D127?vs=842=962

D377: simplemerge: add `filtereddata=False` to simplemerge()

durin42 added a comment. (from an IRC conversation) I'm not crazy about the shape this makes the API, as I'd rather we didn't start growing awareness of filtering in layers this high. I think we can probably kill contrib/simplemerge entirely - it's had nothing but cleanup changes

D351: demandimport: disable by default if chg is being used

phillco accepted this revision. phillco added a comment. lgtm, pending sid's comment. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D351 To: quark, #hg-reviewers, phillco Cc: phillco, sid0, yuja, mercurial-devel ___

D298: python3: whitelist four more passing tests

durin42 updated this revision to Diff 947. durin42 retitled this revision from "python3: whitelist two more passing tests" to "python3: whitelist four more passing tests". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D298?vs=681=947 REVISION DETAIL

D353: extensions: don't give AttributeError bytes message on Python 3

durin42 updated this revision to Diff 946. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D353?vs=800=946 REVISION DETAIL https://phab.mercurial-scm.org/D353 AFFECTED FILES mercurial/extensions.py CHANGE DETAILS diff --git a/mercurial/extensions.py

D296: extensions: if on py3 and propname is a bytestr, convert to sysstr

durin42 updated this revision to Diff 945. durin42 marked 2 inline comments as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D296?vs=799=945 REVISION DETAIL https://phab.mercurial-scm.org/D296 AFFECTED FILES mercurial/extensions.py CHANGE

D377: simplemerge: add `filtereddata=False` to simplemerge()

durin42 added a comment. Also, timeless noticed https://phab.mercurial-scm.org/rHGabd66eb0889e3efaca4f960e0eacd719c18880dd, which reinforces my belief that we don't need contrib/simplemerge anymore. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D377 To:

Kill off contrib/simplemerge?

Hello, During some of the work to support in-memory merge, the `contrib/simplemerge` script (not to be confused with simplemerge.py in the mercurial package) has come up as a bit of a roadblock that makes existing code messier, and I was wondering if anyone would object if we removed it. This is

Re: Kill off contrib/simplemerge?

> Is it used by "hg merge/rebase/etc"? Only if you pass --tool ? No to the first, and I'm not sure if it'd work for the second. If so it'd be duplicating what simplemerge.py already does. In general -- no idea how this is being used. I suspect people might be using it to just to use hg's merge

D358: copytrace: move fb extension to core under flag experimental.fastcopytrace

pulkit updated this revision to Diff 943. pulkit edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D358?vs=819=943 REVISION DETAIL https://phab.mercurial-scm.org/D358 AFFECTED FILES mercurial/configitems.py

D409: copies: add more details to the documentation of mergecopies()

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This documentation is very helpful for any developer to understand what copytracing is and what the function does. Since this is the main function of doing

Re: [PATCH 2 of 2] bundle2: relax the condition to update transaction.hookargs

On Mon, Aug 14, 2017 at 04:53:50PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1502590235 -32400 > # Sun Aug 13 11:10:35 2017 +0900 > # Node ID 8af5c6fc8ce4c53b43900c6bfb565daa285b8af1 > # Parent

Re: [PATCH] py3: change encoding.localstr to a subclass of bytes, not str

On Mon, Aug 14, 2017 at 04:53:19PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1502693440 -32400 > # Mon Aug 14 15:50:40 2017 +0900 > # Node ID 3852cbe06ef50c23d5c6d25b4ad9b40885e47201 > # Parent

D127: phabricator: add phabupdate command to update status in batch

durin42 accepted this revision. durin42 added a comment. This revision is now accepted and ready to land. queued, thanks REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D127 To: quark, #hg-reviewers, durin42 Cc: durin42, krbullock, mercurial-devel

Re: [PATCH v4] run-tests: also color the summary messages (skipped, failed...)

On Fri, Aug 11, 2017 at 02:25:12PM +0200, mlaneuvi...@gmail.com wrote: > # HG changeset patch > # User Matthieu Laneuville > # Date 1502454109 -7200 > # Fri Aug 11 14:21:49 2017 +0200 > # Node ID 26bd9bfc7f679dc521b8056b48875eee71cd8627 > # Parent

D124: phabricator: change "readpatch" to be more flexible

This revision was automatically updated to reflect the committed changes. Closed by commit rHG75fdaf851e83: phabricator: change "readpatch" to be more flexible (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D124?vs=839=959 REVISION

D359: pushvars: add a coreconfigitem for push.pushvars.server

This revision was automatically updated to reflect the committed changes. Closed by commit rHG057d31ceace3: pushvars: add a coreconfigitem for push.pushvars.server (authored by pulkit). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D359?vs=820=963

D299: py3: introduce a wrapper for __builtins__.{raw_,}input()

durin42 updated this revision to Diff 948. durin42 edited the summary of this revision. durin42 retitled this revision from "pycompat: introduce a wrapper for __builtins__.{raw_,}input()" to "py3: introduce a wrapper for __builtins__.{raw_,}input()". REPOSITORY rHG Mercurial CHANGES SINCE

D299: py3: introduce a wrapper for __builtins__.{raw_,}input()

durin42 marked 5 inline comments as done. durin42 added inline comments. INLINE COMMENTS > yuja wrote in pycompat.py:84 > Nah. So this could be `util.bytesinput(fin, fout)` and `encoding.strio()`. Sigh. I'm not sure I got the encoding.py bit quite right, take a look? REPOSITORY rHG Mercurial

D126: phabricator: add status to revision query language

durin42 accepted this revision. durin42 added a comment. This revision is now accepted and ready to land. queued, thanks REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D126 To: quark, #hg-reviewers, durin42 Cc: durin42, mercurial-devel

[PATCH 1 of 2 STABLE V2] tests: test behavior of IOError during transactions (issue5658)

# HG changeset patch # User Gregory Szorc # Date 1502741560 25200 # Mon Aug 14 13:12:40 2017 -0700 # Branch stable # Node ID 0d5b565629f0491a7673fcfdd9c02cbc1a4b # Parent 7686cbb0ba4138c56d038d8d82ccc052bf9b60d7 tests: test behavior of IOError during

[PATCH 2 of 2 STABLE V2] ui: restore behavior to ignore some I/O errors (issue5658)

# HG changeset patch # User Gregory Szorc # Date 1502827471 25200 # Tue Aug 15 13:04:31 2017 -0700 # Branch stable # Node ID 4295728e1d039be477bf5b72c9b6c34fd406e020 # Parent 0d5b565629f0491a7673fcfdd9c02cbc1a4b ui: restore behavior to ignore some I/O errors

D231: httppeer: add support for httppostargs when we're sending a file

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3c91cc0c5fde: httppeer: add support for httppostargs when we're sending a file (authored by durin42). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: Kill off contrib/simplemerge?

What is the script used for? Is it used by "hg merge/rebase/etc"? Only if you pass --tool ? Not at all? On Tue, Aug 15, 2017 at 2:52 PM, Phillip Cohen wrote: > Hello, > > During some of the work to support in-memory merge, the > `contrib/simplemerge` script (not to be

D340: rebase: prefer choosing merge base with successor in destination

martinvonz added a comment. In https://phab.mercurial-scm.org/D340#6330, @quark wrote: > Since the "unwanted" warning "covers" the case this patch handles. The behavior is still "correct" (since the warning is printed) without this patch. I'm leaning towards dropping this patch. > >

D340: rebase: prefer choosing merge base with successor in destination

quark planned changes to this revision. quark added a comment. Since the "unwanted" warning "covers" the case this patch handles. The behavior is still "correct" (since the warning is printed) without this patch. I'm leaning towards dropping this patch. For errors vs warnings, I still

D411: push: fix docsstring

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Seems the code block misses `::`. This patch makes sure `[push]` and `pushvars.server = true` are in two lines. REPOSITORY rHG Mercurial REVISION DETAIL

D299: py3: introduce a wrapper for __builtins__.{raw_,}input()

yuja added inline comments. INLINE COMMENTS > encoding.py:585 > +def __init__(self, buffer, **kwargs): > +kwargs[r'encoding'] = encoding > +super(strio, self).__init__(buffer, **kwargs) Fixed as `s/encoding/_sysstr(encoding)/`. REPOSITORY rHG Mercurial REVISION DETAIL

D353: extensions: don't give AttributeError bytes message on Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0646608368a9: extensions: don't give AttributeError bytes message on Python 3 (authored by durin42). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D296: extensions: if on py3 and propname is a bytestr, convert to sysstr

This revision was automatically updated to reflect the committed changes. Closed by commit rHG38a3767975a7: extensions: if on py3 and propname is a bytestr, convert to sysstr (authored by durin42). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH 2 of 2] py3: select input or raw_input by pycompat

# HG changeset patch # User Yuya Nishihara # Date 1502859264 -32400 # Wed Aug 16 13:54:24 2017 +0900 # Node ID 2c44ad89954bf0a04392775e7444f1ba2fc0b2e9 # Parent 63c4583c7fa0f989f225488273614f3a0aa88002 py3: select input or raw_input by pycompat This seems slightly cleaner.

[PATCH 1 of 2] py3: make encoding.strio() an identity function on Python 2

# HG changeset patch # User Yuya Nishihara # Date 1502859011 -32400 # Wed Aug 16 13:50:11 2017 +0900 # Node ID 63c4583c7fa0f989f225488273614f3a0aa88002 # Parent 627cb36b537f7f0ffe2ea7e38a9415b6c4c499e3 py3: make encoding.strio() an identity function on Python 2 It's the

[PATCH 2 of 2] templatekw: specify plural form of instability

# HG changeset patch # User Yuya Nishihara # Date 1502601148 -32400 # Sun Aug 13 14:12:28 2017 +0900 # Node ID 50723ff5912ecde3f8e43bea4b84db03bae7f1f0 # Parent 6cd0eafbd52b4e0efcad037876dc9bdf6c9bbfbb templatekw: specify plural form of instability Follows up 40739aef97f7.

[PATCH 1 of 2] templatekw: rename termwidth() per convention

# HG changeset patch # User Yuya Nishihara # Date 1502859439 -32400 # Wed Aug 16 13:57:19 2017 +0900 # Node ID 6cd0eafbd52b4e0efcad037876dc9bdf6c9bbfbb # Parent 2c44ad89954bf0a04392775e7444f1ba2fc0b2e9 templatekw: rename termwidth() per convention diff --git

D368: Differential Revision: https://phab.mercurial-scm.org/D368releasenotes: add check flag for use of admonitions and its validity

rishabhmadan96 updated this revision to Diff 973. rishabhmadan96 retitled this revision from "releasenotes: add check flag for use of admonitions and its validity" to "Differential Revision: https://phab.mercurial-scm.org/D368 releasenotes: add check flag for use of admonitions and its

D368: releasenotes: add check flag for use of admonitions and its validity

rishabhmadan96 added a comment. Sorry I just edited the revision string. Will that work? Or should I update it again with "Differential Revision: https://phab.mercurial-scm.org/D368; at the end. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D368 To:

D350: demandimport: test whether to enable or not in hg script

quark abandoned this revision. quark added a comment. > So there's no point to duplicate the HGDEMANDIMPORT check? Hmm... I cannot remember why I did this at the first place. Just checking chg alone should be enough. REPOSITORY rHG Mercurial REVISION DETAIL

D360: log: add a "graphwidth" template variable

yuja added inline comments. INLINE COMMENTS > cmdutil.py:2557 > displayer.flush(ctx) > -edges = edgefn(type, char, lines, state, rev, parents) > -for type, char, lines, coldata in edges: > +for type, char, width, coldata in itertools.chain([firstedge], > edges):

D368: Differential Revision: https://phab.mercurial-scm.org/D368releasenotes: add check flag for use of admonitions and its validity

quark added a comment. Did you add "Differential Revision: https://phab.mercurial-scm.org/D368; to the first line of your commit message? Could you try moving it to the last line? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D368 To: rishabhmadan96,

Re: [PATCH] crecord: fixes the formatting of the select status in the status line

On Tue, 15 Aug 2017 16:51:54 -0700, Jun Wu wrote: > len(text) does not take wide characters into consideration. So it does not > work with all localizations in theory. Maybe we can just add spaces here and > rely on translators to align them. encoding.colwidth() could be used.

D351: demandimport: disable by default if chg is being used

yuja added a comment. > Setting `HGDEMANDIMPORT` for both the forked and non-forked chg client processes seems less cleaner. That seems less bad since the hg script doesn't have to know the chg stuff. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D351 To:

D352: chgserver: special handle __version__ in mtimehash (issue5653)

quark added a comment. I will test it on a Mac tomorrow. I think this patch is optional (nice to have). FB also has some weird reports that suggest demandimport is causing chg to load a mix of old and new modules. So the first two patches are more important in terms of correctness.

Re: [PATCH] crecord: fixes the formatting of the select status in the status line

len(text) does not take wide characters into consideration. So it does not work with all localizations in theory. Maybe we can just add spaces here and rely on translators to align them. Excerpts from Filip Filmar's message of 2017-08-13 01:04:52 -0700: > # HG changeset patch > # User Filip

D299: py3: introduce a wrapper for __builtins__.{raw_,}input()

yuja accepted this revision. yuja added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > util.py:180 > +sys.stdin, sys.stdout = encoding.strio(fin), encoding.strio(fout) > +return pycompat.bytestr(input(*args, **kwargs)) > +else:

D300: python3: whitelist four more passing tests

yuja requested changes to this revision. yuja added a comment. This revision now requires changes to proceed. This appears to be identical to https://phab.mercurial-scm.org/D298. Dropped. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D300 To: durin42,

D351: demandimport: disable by default if chg is being used

quark added a comment. > That seems less bad since the hg script doesn't have to know the chg stuff. Having `HGDEMANDIMPORT` set may affect `hg` ran by child process (like hooks). How about moving the demandimport stuff to `dispatch.py`? I think eventually `dispatch.py` will have

D350: demandimport: test whether to enable or not in hg script

yuja added a comment. > `sys.modules['hgdemandimport']` being set? Maybe I should remove it from commit message. So there's no point to duplicate the HGDEMANDIMPORT check? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D350 To: quark, #hg-reviewers Cc:

D299: py3: introduce a wrapper for __builtins__.{raw_,}input()

This revision was automatically updated to reflect the committed changes. durin42 marked an inline comment as done. Closed by commit rHGd390726b575d: py3: introduce a wrapper for __builtins__.{raw_,}input() (authored by durin42). CHANGED PRIOR TO COMMIT

D298: python3: whitelist four more passing tests

This revision was automatically updated to reflect the committed changes. Closed by commit rHG48f3e87ce650: python3: whitelist four more passing tests (authored by durin42). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D298?vs=947=970 REVISION DETAIL

D302: python3: whitelist another *13* tests that now pass

This revision was automatically updated to reflect the committed changes. Closed by commit rHG470e2c7ee34f: python3: whitelist another *13* tests that now pass (authored by durin42). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D302?vs=685=972 REVISION

D98: revset: support reading aliases from a .hgrevsets file

yuja added a comment. > I couldn't tell from Yuya's comment if "... not add such revset functions" means I meant "don't load unsafe extensions." revsets and filesets have to be secure against malicious input because they are accessible through the Web UI. It's up to users to make a

D351: demandimport: disable by default if chg is being used

yuja added a comment. Perhaps the chg executable can simply set `HGDEMANDIMPORT=disable` if it isn't specified by user. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D351 To: quark, #hg-reviewers Cc: yuja, mercurial-devel

D393: exchange: simplify unbundle locking using context managers

This revision was automatically updated to reflect the committed changes. Closed by commit rHG389f7b17ffb3: exchange: simplify unbundle locking using context managers (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D393?vs=891=919

  1   2   >