D5961: copies: add test that makes both the merging csets dirty and run w/o error

martinvonz added inline comments. INLINE COMMENTS > test-copies.t:495-497 > +Test for a case in fullcopytracing algorithm where both the merging csets are > +dirty which means no cset is descendant of merging base. This test reflect > +that for this particular case this algorithm correctly find

D5961: copies: add test that makes both the merging csets dirty and run w/o error

martinvonz added inline comments. INLINE COMMENTS > test-copies.t:524 > + $ echo baba >> b > + $ hg ci --amend -m "added d" > + Could you change the message here to "added d, modified b"? (Also see my next comment for why I care) > test-copies.t:526 > + > + $ hg log --git -pG --hidden -T

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

navaneeth.suresh added inline comments. INLINE COMMENTS > martinvonz wrote in test-uncommit.t:421 > Ideally that patch would come first (so we don't have to remember to roll > back this patch if that other patch doesn't come before we cut the next > release). I'm up for anything. I can send a

D6066: inno: script to automate building Inno installer

indygreg updated this revision to Diff 14338. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6066?vs=14331=14338 REVISION DETAIL https://phab.mercurial-scm.org/D6066 AFFECTED FILES contrib/packaging/__init__.py contrib/packaging/inno/build.py

D6067: inno: stop shipping pywin32

indygreg updated this revision to Diff 14339. indygreg edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6067?vs=14333=14339 REVISION DETAIL https://phab.mercurial-scm.org/D6067 AFFECTED FILES

D6068: inno: remove w9xpopen.exe

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY w9xpopen.exe is a utility program shipped with Python <3.4 (https://bugs.python.org/issue14470 tracked its removal). The program was used by subprocess to

D6060: inno: replace add_path.exe with a Pascal script

indygreg updated this revision to Diff 14335. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6060?vs=14325=14335 REVISION DETAIL https://phab.mercurial-scm.org/D6060 AFFECTED FILES contrib/packaging/inno/mercurial.iss

D6062: inno: remove references to pywin32

indygreg updated this revision to Diff 14337. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6062?vs=14327=14337 REVISION DETAIL https://phab.mercurial-scm.org/D6062 AFFECTED FILES contrib/packaging/inno/readme.txt contrib/win32/hgwebdir_wsgi.py

D6061: inno: remove cacerts.pem from documentation

indygreg updated this revision to Diff 14336. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6061?vs=14326=14336 REVISION DETAIL https://phab.mercurial-scm.org/D6061 AFFECTED FILES contrib/packaging/inno/readme.txt CHANGE DETAILS diff --git

D6059: inno: move inno installer files to contrib/packaging/inno-installer

indygreg updated this revision to Diff 14334. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6059?vs=14324=14334 REVISION DETAIL https://phab.mercurial-scm.org/D6059 AFFECTED FILES contrib/packaging/inno/mercurial.iss

D6067: inno: stop shipping pywin32

indygreg updated this revision to Diff 14333. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6067?vs=14332=14333 REVISION DETAIL https://phab.mercurial-scm.org/D6067 AFFECTED FILES contrib/packaging/inno-installer/build.py

D6066: inno: script to automate building Inno installer

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The official Inno installer build process is poorly documented. And attempting to reproduce behavior of the installer uploaded to www.mercurial-scm.org has

D6067: inno: stop shipping pywin32

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Ancient versions of Mercurial relied on pywin32 and I suspect that's why we have this dependency. We also ship the "keyring" package, which has a dependency

D6065: setup: exclude some internal UCRT files

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When attempting to build the Inno installer locally, I was getting several file not found errors when py2exe was crawling DLL dependencies. The missing DLLs

D6064: setup: include additional packages in py2exe distribution

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm attempting to reproduce the Inno installers on my local machine. As part of auditing differences between installer output, I noticed that the existing Inno

D6060: inno: replace add_path.exe with a Pascal script

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY While attempting to build the Inno installer, I was unable to find a copy of add_path.exe from the source site previously listed in the docs. Some quick

D6063: setup: define build_doc command

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Currently, various processes for packaging Mercurial state to manually invoke `make -C doc` in order to generate the documentation. This Makefile merely

D6062: inno: remove references to pywin32

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY According to the commit message for https://phab.mercurial-scm.org/rHG0c35bb01a119557a20558aba53087234df27ecd0, pywin32 was removed in Mercurial 1.8!

D6061: inno: remove cacerts.pem from documentation

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The inno distribution no longer includes cacert.pem as of https://phab.mercurial-scm.org/rHGca1ad8ef38be225caec42564502aafe43cae173d (April 2015). The docs were

D6059: inno: move inno installer files to contrib/packaging/inno-installer

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Let's isolate the inno installer files to their own directory so the separation between things is clearer. This required adjusting a few relative paths and

D6058: patch: include flag-only file changes in "special" while filtering patch (issue5864)

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch fix the issue5864 (or maybe issue5865 too) which occurs during split (or I should say at the time of filtering the hunks in interactive mode) where

D6057: split: add tests which demonstrate the issue5864

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6057 AFFECTED FILES tests/test-split.t CHANGE DETAILS diff --git a/tests/test-split.t

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

martinvonz added a comment. In https://phab.mercurial-scm.org/D5940#88276, @pulkit wrote: > In https://phab.mercurial-scm.org/D5940#88065, @martinvonz wrote: > > > I don't understand the commit message. `experimental.uncommitondirtydir` already works with PATH, doesn't it? I think

D6042: py3: convert filtername to str if it's None

pulkit updated this revision to Diff 14321. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6042?vs=14320=14321 REVISION DETAIL https://phab.mercurial-scm.org/D6042 AFFECTED FILES mercurial/branchmap.py CHANGE DETAILS diff --git

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

pulkit added a comment. In https://phab.mercurial-scm.org/D5940#88065, @martinvonz wrote: > I don't understand the commit message. `experimental.uncommitondirtydir` already works with PATH, doesn't it? I think you mean something like "uncommit: allow dirty working copy with PATH". Did I

D6042: py3: convert filtername to str if it's None

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

Re: caching pull - stable partitioning of bundle requests

On Tue, Feb 19, 2019 at 3:23 PM Boris FELD wrote: > On 15/02/2019 21:16, Pulkit Goyal wrote: > > > > On Thu, Oct 4, 2018 at 6:16 PM Boris FELD wrote: > >> The road for moving this in Core is clear, but not short. So far we have >> not been able to free the necessary time to do it. Between the

D6056: patch: stop aborting when ADD/RENAME/COPY files on --interactive (issue5727)

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY issue5727 was reported specifically for mq on using qrefresh. On investigating further, I realized that it was a check in `patch.py` that resulting in

D6045: inno: replace add_path.exe with a Pascal script

indygreg planned changes to this revision. indygreg added a comment. I'm going to make this part of a larger series to improve the Inno installer... REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6045 To: indygreg, #hg-reviewers Cc: mercurial-devel

D6052: global: use raw string for setlocale() argument

indygreg added a comment. Yeah, `''.join([u''])` will coerce the `str` to `unicode`, so we're fine on that front. The problem is only with `HGUNICODEPEDANTRY=1`, which will raise during implicit `str` <-> `unicode` coercion. One can reproduce a failure with `HGUNICODEPEDANTRY=1

mercurial@41837: 5 new changesets

5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/89f01ea906ae changeset: 41833:89f01ea906ae user:Gregory Szorc date:Sat Mar 02 12:55:29 2019 -0800 summary: attr: don't attempt to .encode() a str on Python 2

mercurial@41832: 10 new changesets

10 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/7a139fc60eb0 changeset: 41823:7a139fc60eb0 user:FUJIWARA Katsunori date:Fri Mar 01 02:53:09 2019 +0900 summary: contrib: factor out actual error check for file data of check-code.py

D6052: global: use raw string for setlocale() argument

yuja added a comment. > After this series, the number of test failures in that mode is ~70. Most of the remaining failures are in `stringutil.wrap()`. Essentially `textwrap` from the standard library wants to operate on native `str`. Our version is feeding in `unicode`. We get into

Re: D6052: global: use raw string for setlocale() argument

> After this series, the number of test failures in that mode is ~70. Most of > the remaining failures are in `stringutil.wrap()`. Essentially `textwrap` > from the standard library wants to operate on native `str`. Our version is > feeding in `unicode`. We get into trouble when the standard

D6044: phabricator: convert conduit response JSON unicode to bytes inside callconduit

yuja added a comment. > - parsed = json.loads(body) +parsed = pycompat.rapply(lambda x: encoding.unitolocal(x) + if isinstance(x, unicode) else x, json.loads(body)) s/unicode/pycompat.unicode/ Perhaps some of `r''` would have to be changed to `b''`

Re: D6044: phabricator: convert conduit response JSON unicode to bytes inside callconduit

> -parsed = json.loads(body) > +parsed = pycompat.rapply(lambda x: encoding.unitolocal(x) > + if isinstance(x, unicode) else x, > json.loads(body)) s/unicode/pycompat.unicode/ Perhaps some of `r''` would have to be changed to `b''` since dict keys are now

D6052: global: use raw string for setlocale() argument

This revision was automatically updated to reflect the committed changes. Closed by commit rHG82d9728ace95: global: use raw string for setlocale() argument (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6053: walkfilerevs: rename filerevgen() to filerevs() since it's not a generator

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdcbb1b4dc93a: walkfilerevs: rename filerevgen() to filerevs() since its not a generator (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6049: global: use raw strings for namedtuple()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7f63ec6969f3: global: use raw strings for namedtuple() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6049?vs=14298=14314

D6046: global: use raw strings for __slots__

This revision was automatically updated to reflect the committed changes. Closed by commit rHGae189674bdad: global: use raw strings for __slots__ (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6046?vs=14295=14311

D6050: revsetlang: use sysbytes() instead of blind encode()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGddb174511f1b: revsetlang: use sysbytes() instead of blind encode() (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6051: encoding: use raw strings for encoding arguments

This revision was automatically updated to reflect the committed changes. Closed by commit rHG25694a78e4a4: encoding: use raw strings for encoding arguments (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6048: attr: don't attempt to .encode() a str on Python 2

This revision was automatically updated to reflect the committed changes. Closed by commit rHG89f01ea906ae: attr: dont attempt to .encode() a str on Python 2 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6047: procutil: use a raw string for module name

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb275dbb60089: procutil: use a raw string for module name (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE