D2066: lfs: add a test showing bundle application could be broken

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4e41b59633fa: lfs: add a test showing bundle application could be broken (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2067: changegroup: do not delta lfs revisions

2018-03-06 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > indygreg wrote in test-lfs.t:374 > Where did this change come from? The number grows from 3 digits to 4 digits because of increased size, and one of the space becomes a digit. REPOSITORY rHG Mercurial REVISION DETAIL

D2688: hgweb: adapt to socket._fileobject changes in Python 3

2018-03-06 Thread durin42 (Augie Fackler)
durin42 added a comment. Oh, good catch. Fixed and passes tests on 2.7. :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2688 To: durin42, #hg-reviewers, yuja Cc: yuja, mercurial-devel ___ Mercurial-devel mailing

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. This change is a bit difficult to reason about. But I think it is fine. Essentially, we're ensuring that the delta stored in the revlog is applied on top of the fulltext after flag

Re: Mercurial Versions compatible with Windows 10

2018-03-06 Thread Augie Fackler
> On Mar 5, 2018, at 21:08, Callisto, Albie > wrote: > > Hello, > > Hoping you can assist me please? > > Can you please confirm which versions of Mercurial are compatible with > Windows 10? To the best of my knowledge (which is limited when it comes to

D2068: revlog: do not use delta for lfs revisions

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5c47fa90bf13: revlog: do not use delta for lfs revisions (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2068?vs=6668=6671

D2067: changegroup: do not delta lfs revisions

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd031609b3cb7: changegroup: do not delta lfs revisions (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2067?vs=6469=6670

D2688: hgweb: adapt to socket._fileobject changes in Python 3

2018-03-06 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 6673. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2688?vs=6647=6673 REVISION DETAIL https://phab.mercurial-scm.org/D2688 AFFECTED FILES mercurial/hgweb/server.py CHANGE DETAILS diff --git

D2067: changegroup: do not delta lfs revisions

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added inline comments. INLINE COMMENTS > test-lfs.t:374 > * (manifests) (glob) > - * a (glob) > + * a (glob) >$ hg --config extensions.strip= strip -r 2 --no-backup --force -q Where did this change come from? REPOSITORY rHG

D2068: revlog: do not use delta for lfs revisions

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > test-revlog-raw.py:156-161 > +if r == 0 or rlog.flags(r): > text = rlog.revision(r, raw=True) > cachedelta = None > else:

D2703: phabricator: follow-up phab auth improvements with backwards compat mode

2018-03-06 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We'll rip this out before we ship 4.6, but this gives people a window to migrate. REPOSITORY rHG Mercurial REVISION DETAIL

mercurial@36747: 47 new changesets (3 on stable)

2018-03-06 Thread Mercurial Commits
47 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d77c3b023393 changeset: 36701:d77c3b023393 user:Yuya Nishihara date:Sat Mar 03 23:49:39 2018 -0500 summary: lock: block signal interrupt while making a lock file

mercurial@36700: 2 new changesets

2018-03-06 Thread Mercurial Commits
2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/aa9c5d447980 changeset: 36699:aa9c5d447980 parent: 36696:0c431d3129c4 user:Augie Fackler date:Sun Mar 04 11:49:33 2018 -0500 summary: util: also silence py3 warnings from codec

D2695: osutil: implement minimal __getitem__ compatibility on our custom listdir type

2018-03-06 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 6678. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2695?vs=6675=6678 REVISION DETAIL https://phab.mercurial-scm.org/D2695 AFFECTED FILES mercurial/cext/osutil.c mercurial/policy.py CHANGE DETAILS diff --git

D2068: revlog: do not use delta for lfs revisions

2018-03-06 Thread quark (Jun Wu)
quark updated this revision to Diff 6672. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2068?vs=6671=6672 REVISION DETAIL https://phab.mercurial-scm.org/D2068 AFFECTED FILES mercurial/revlog.py tests/test-lfs-bundle.t tests/test-revlog-raw.py

D2696: cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime

2018-03-06 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 6676. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2696?vs=6656=6676 REVISION DETAIL https://phab.mercurial-scm.org/D2696 AFFECTED FILES hgext/extdiff.py hgext/shelve.py mercurial/cext/osutil.c

D2695: osutil: implement minimal __getitem__ compatibility on our custom listdir type

2018-03-06 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 6675. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2695?vs=6655=6675 REVISION DETAIL https://phab.mercurial-scm.org/D2695 AFFECTED FILES mercurial/cext/osutil.c mercurial/policy.py CHANGE DETAILS diff --git

D2068: revlog: do not use delta for lfs revisions

2018-03-06 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > indygreg wrote in test-revlog-raw.py:156-161 > I feel like this should be checking against specific flags. But since this is > a test, I'm fine accepting this. We can fix in a follow-up if the logic is > wrong. Seems I missed this line somehow.

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG369aadf7a326: revlog: resolve lfs rawtext to vanilla rawtext before applying delta (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2678: help: supporting both help and doc for aliases

2018-03-06 Thread spectral (Kyle Lippincott)
spectral added a comment. (I'm stepping in and responding while rdamazio is out for a few days) In https://phab.mercurial-scm.org/D2678#43299, @mharbison72 wrote: > I really like this feature too. Any plans to extend it to {fileset,revset,template}alias? We don't have any

mercurial@36760: new changeset

2018-03-06 Thread Mercurial Commits
New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/7bf80d9d9543 changeset: 36760:7bf80d9d9543 bookmark:@ tag: tip parent: 36747:4c71a26a4009 parent: 36759:9639c433be54 user:Gregory Szorc date:Tue Mar 06 14:32:14

mercurial@36759: 12 new changesets (12 on stable)

2018-03-06 Thread Mercurial Commits
12 new changesets (12 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/369aadf7a326 changeset: 36748:369aadf7a326 branch: stable tag: 4.5.1 parent: 36744:33275ab5e837 user:Jun Wu date:Tue Feb 13 11:35:32 2018 -0800 summary:

D2704: archival: fileit should not use atomictemp, causes major performance regression

2018-03-06 Thread vincent.parrett (Vincent Parrett)
vincent.parrett added a comment. This change results in around a 20% performance increase when archiving to a folder. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2704 To: vincent.parrett, #hg-reviewers Cc: mercurial-devel

D2013: commit: allow --no-secret to override phases.new-commit setting

2018-03-06 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D2013#43542, @indygreg wrote: > @spectral: what's the state of this series? Do you plan to submit a follow-up? I think he's waiting for me to hopefully do it in a more generic way. I have been working on that. Turned

D2013: commit: allow --no-secret to override phases.new-commit setting

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg added a comment. @spectral: what's the state of this series? Do you plan to submit a follow-up? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2013 To: spectral, #hg-reviewers Cc: indygreg, martinvonz, mercurial-devel

D2096: infinitepush: move the extension to core from fb-hgext

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. Per discussion at sprint, Pulkit will follow up by deleting yet more code around workspaces and scratch branches. We're going to focus on the "try server" use case for the

D2704: archival: fileit should not use atomictemp, causes major performance regression

2018-03-06 Thread vincent.parrett (Vincent Parrett)
vincent.parrett 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/D2704 AFFECTED FILES mercurial/archival.py CHANGE DETAILS diff --git a/mercurial/archival.py

D2013: commit: allow --no-secret to override phases.new-commit setting

2018-03-06 Thread spectral (Kyle Lippincott)
spectral added a comment. In https://phab.mercurial-scm.org/D2013#43547, @martinvonz wrote: > In https://phab.mercurial-scm.org/D2013#43542, @indygreg wrote: > > > @spectral: what's the state of this series? Do you plan to submit a follow-up? > > > I think he's waiting for me

D2686: xdiff: add a preprocessing step that trims files

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg added a comment. @quark: Will you be refactoring this based on upstream feedback? Or rebasing due to other xdiff changes that have since landed? i.e. should I review this patch now? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2686 To: quark,

D2686: xdiff: add a preprocessing step that trims files

2018-03-06 Thread quark (Jun Wu)
quark added a comment. The patch sent to the git list was completely different from this one, because git has another layer `xdiff-interface.c` and trimming happens there. git also has some more complexity like context line handling, which is the hard part. Since the context lines

D2678: help: supporting both help and doc for aliases

2018-03-06 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. In https://phab.mercurial-scm.org/D2678#43533, @spectral wrote: > (I'm stepping in and responding while rdamazio is out for a few days) > > In https://phab.mercurial-scm.org/D2678#43299, @mharbison72 wrote: > > > I really like this feature too. Any

D2706: xdiff: remove xmerge related logic

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Good riddance to hard-to-read C code. Thank you for doing this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2706 To: quark, #hg-reviewers,

D2707: fuzz: fix xdiff build

2018-03-06 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Recent xdiff code cleanups removed some files and changed some structures. Update fuzz code. REPOSITORY rHG Mercurial REVISION DETAIL

D2707: fuzz: fix xdiff build

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG04d64163039a: fuzz: fix xdiff build (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2707?vs=6689=6690 REVISION DETAIL

D2686: xdiff: add a preprocessing step that trims files

2018-03-06 Thread quark (Jun Wu)
quark added a comment. I'll do the rebase (probably tomorrow). It will make the `xdl_do_diff2` change unnecessary, and maybe rename `prefix_lines` etc to be more like the original code. But the main feature (xdl_trim_files) will probably stay unchanged and is worth a look now. REPOSITORY

D2683: xdiff: remove whitespace related feature

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I *love* patches that only remove code. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2683 To: quark, #hg-reviewers, indygreg Cc: indygreg,

D2683: xdiff: remove whitespace related feature

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG09f320067591: xdiff: remove whitespace related feature (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2683?vs=6681=6685

D2705: xdiff: remove xemit related logic

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG90f8fe72446c: xdiff: remove xemit related logic (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2705?vs=6683=6687 REVISION

D2706: xdiff: remove xmerge related logic

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3cf40112efb7: xdiff: remove xmerge related logic (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2706?vs=6684=6688 REVISION

D2684: xdiff: remove unused structure, functions, and constants

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb5bb0f99064d: xdiff: remove unused structure, functions, and constants (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH] xdiff: fix trivial build warnings on Windows

2018-03-06 Thread Jun Wu
Yeah, xdiff needs a migration from using "long", "int"s to "size_t" etc. The git community has chosen to disallow diff >1GB files because of the overflow concern [1]. [1]: https://github.com/git/git/commit/dcd1742e56ebb944c4ff62346da4548e1e3be675 Excerpts from Matt Harbison's message of

D2706: xdiff: remove xmerge related logic

2018-03-06 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY hg has its own merge algorithm with flexible config options. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2706 AFFECTED FILES

D2683: xdiff: remove whitespace related feature

2018-03-06 Thread quark (Jun Wu)
quark updated this revision to Diff 6681. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2683?vs=6641=6681 REVISION DETAIL https://phab.mercurial-scm.org/D2683 AFFECTED FILES mercurial/thirdparty/xdiff/xdiff.h mercurial/thirdparty/xdiff/xdiffi.c

D2705: xdiff: remove xemit related logic

2018-03-06 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY xemit handles "diff formatting and output" with options like context lines, whether show function names, etc. That is handled more cleanly at a higher level in

D2684: xdiff: remove unused structure, functions, and constants

2018-03-06 Thread quark (Jun Wu)
quark updated this revision to Diff 6682. quark edited the summary of this revision. quark retitled this revision from "xdiff: remove unused structure and functions" to "xdiff: remove unused structure, functions, and constants". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

mercurial@36698: 2 new changesets (2 on stable)

2018-03-06 Thread Mercurial Commits
2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/9a08f7d18c20 changeset: 36697:9a08f7d18c20 branch: stable parent: 36689:b394778b1a50 user:Yuya Nishihara date:Sun Mar 04 13:19:05 2018 -0500 summary:

Mercurial Versions compatible with Windows 10

2018-03-06 Thread Callisto, Albie
Hello, Hoping you can assist me please? Can you please confirm which versions of Mercurial are compatible with Windows 10? We currently have version 2.9.2 packaged, but this looks like its fairly old considering that the latest packaged version is 4.5 Regards

Re: D2701: merge: use constants for actions

2018-03-06 Thread Pulkit Goyal
I also faced difficulty in past understanding these magic single or double character values. I am +1 on this series. On Mar 5, 2018 7:15 PM, "indygreg (Gregory Szorc)" < phabrica...@mercurial-scm.org> wrote: indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added

D2068: revlog: do not use delta for lfs revisions

2018-03-06 Thread quark (Jun Wu)
quark updated this revision to Diff 6668. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2068?vs=6470=6668 REVISION DETAIL https://phab.mercurial-scm.org/D2068 AFFECTED FILES mercurial/revlog.py tests/test-lfs-bundle.t tests/test-revlog-raw.py

D2687: sslutil: lots of unicode/bytes cleanup

2018-03-06 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG424994a0adfd: sslutil: lots of unicode/bytes cleanup (authored by durin42, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2687?vs=6646=6665#toc REPOSITORY rHG Mercurial

D2690: sslutil: some more forcebytes() on some exception messages

2018-03-06 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4c71a26a4009: sslutil: some more forcebytes() on some exception messages (authored by durin42, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2690?vs=6649=6667#toc REPOSITORY

D2689: sslutil: sslcontext needs the cipher name as a sysstr

2018-03-06 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG25798cf7dc9d: sslutil: sslcontext needs the cipher name as a sysstr (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2688: hgweb: adapt to socket._fileobject changes in Python 3

2018-03-06 Thread yuja (Yuya Nishihara)
yuja requested changes to this revision. yuja added a comment. This revision now requires changes to proceed. As long as `self.request` is a socket object, we can use `request.makefile()` on Python 2. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2688 To:

D2695: osutil: implement minimal __getitem__ compatibility on our custom listdir type

2018-03-06 Thread mharbison72 (Matt Harbison)
mharbison72 added inline comments. INLINE COMMENTS > osutil.c:130 > + if (index != 8) { > + PyErr_Format(PyExc_TypeError, "osutil.stat objects only suport" > + " stat.ST_MTIME in __getitem__"); s/suport/support/ REPOSITORY rHG Mercurial REVISION

D2701: merge: use constants for actions

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg marked an inline comment as done. indygreg added a comment. In https://phab.mercurial-scm.org/D2701#43478, @phillco wrote: > btw, @quark mentioned there could be a perf hit (@sid0 mentioned this too a long time ago iirc) Are we sure about that? I could see a perf hit for

[PATCH 1 of 4] py3: read/write plain lock file in binary mode

2018-03-06 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520205676 18000 # Sun Mar 04 18:21:16 2018 -0500 # Node ID faea088aebdbda2e32e5339cbb6df51283fe2f56 # Parent 4c71a26a4009d88590c9ae3d64a5912fd556d82e py3: read/write plain lock file in binary mode A lock file shouldn't

[PATCH 2 of 4] py3: fix type of default username

2018-03-06 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520206486 18000 # Sun Mar 04 18:34:46 2018 -0500 # Node ID db161596cd95de9da2ac0fc4b2496ac295f63672 # Parent faea088aebdbda2e32e5339cbb6df51283fe2f56 py3: fix type of default username diff --git a/contrib/python3-whitelist

[PATCH 4 of 4] py3: drop b'' from generate-working-copy-states.py output

2018-03-06 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520207227 18000 # Sun Mar 04 18:47:07 2018 -0500 # Node ID 0ff68d961b986c69fac32c02c6ee6b34fe84b923 # Parent e121d58f97b1cb94d3a45972bbfb7cf9f477d3cf py3: drop b'' from generate-working-copy-states.py output I could make

[PATCH 3 of 4] py3: make test-commit-multiple.t byte-safe

2018-03-06 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1520206869 18000 # Sun Mar 04 18:41:09 2018 -0500 # Node ID e121d58f97b1cb94d3a45972bbfb7cf9f477d3cf # Parent db161596cd95de9da2ac0fc4b2496ac295f63672 py3: make test-commit-multiple.t byte-safe diff --git

Re: [PATCH 1 of 4 STABLE] test-subrepo: demonstrate problems with subrepo sharing and absolute paths

2018-03-06 Thread Yuya Nishihara
On Sun, 04 Mar 2018 17:15:30 -0500, Matt Harbison wrote: > On Sun, 04 Mar 2018 08:20:07 -0500, Yuya Nishihara wrote: > > > On Sat, 03 Mar 2018 23:03:25 -0500, Matt Harbison wrote: > >> # HG changeset patch > >> # User Matt Harbison > >> # Date 1519795767

Re: [PATCH 1 of 4 STABLE] test-subrepo: demonstrate problems with subrepo sharing and absolute paths

2018-03-06 Thread Matt Harbison
> On Mar 6, 2018, at 7:30 AM, Yuya Nishihara wrote: > >> On Sun, 04 Mar 2018 17:15:30 -0500, Matt Harbison wrote: >>> On Sun, 04 Mar 2018 08:20:07 -0500, Yuya Nishihara wrote: >>> On Sat, 03 Mar 2018 23:03:25 -0500, Matt Harbison wrote: # HG changeset