[PATCH 3 of 4] lfs: register config options

2017-11-14 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1510639402 18000 # Tue Nov 14 01:03:22 2017 -0500 # Node ID 6492bdc8a9b8a6304b0fe658d58b5b286043a88f # Parent fce924e1066b338944c4a4913b236cd39a1c4a40 lfs: register config options I'm not sure at what point we can

[PATCH 4 of 4] test-lfs: cast the flags printed to an int

2017-11-14 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1510639788 18000 # Tue Nov 14 01:09:48 2017 -0500 # Node ID e1c6c9631baed04e9bb29e8da25599ab2590e390 # Parent 6492bdc8a9b8a6304b0fe658d58b5b286043a88f test-lfs: cast the flags printed to an int On Windows, the flag

[PATCH 2 of 4] lfs: quiesce check-module-import warnings

2017-11-14 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1510636492 18000 # Tue Nov 14 00:14:52 2017 -0500 # Node ID fce924e1066b338944c4a4913b236cd39a1c4a40 # Parent 450fbe4afec3a3f800b3e13ea787288445aa8f7c lfs: quiesce check-module-import warnings Specifically, 'symbol

[PATCH 1 of 4] lfs: import the Facebook git-lfs client extension

2017-11-14 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1510635983 18000 # Tue Nov 14 00:06:23 2017 -0500 # Node ID 450fbe4afec3a3f800b3e13ea787288445aa8f7c # Parent a68c3420be412d40973fb64ede3d7a250937b5a2 lfs: import the Facebook git-lfs client extension The purpose of

Re: D1358: remotenames: store journal entry for bookmarks if journal is loaded

2017-11-14 Thread Sean Farley
durin42 (Augie Fackler) writes: > durin42 added a comment. > > > In https://phab.mercurial-scm.org/D1358#22899, @smf wrote: > > > pulkit (Pulkit Goyal) writes: > > > > > pulkit created this revision. > > > Herald added a

Re: [PATCH v2] rebase: exclude descendants of obsoletes w/o a successor in dest (issue5300)

2017-11-14 Thread Martin von Zweigbergk via Mercurial-devel
Queued, thanks! On Tue, Nov 14, 2017 at 1:50 PM, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1510695970 -3600 > # Tue Nov 14 22:46:10 2017 +0100 > # Node ID 5dae1b5b2877b300c224011233fcc9cb6aaa9144 > # Parent

[PATCH v2] rebase: exclude descendants of obsoletes w/o a successor in dest (issue5300)

2017-11-14 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1510695970 -3600 # Tue Nov 14 22:46:10 2017 +0100 # Node ID 5dae1b5b2877b300c224011233fcc9cb6aaa9144 # Parent 0564e7c7f4cdbb98ea0ffb3f2c26946dbc0599ac # EXP-Topic rebase-obsolete rebase: exclude descendants of obsoletes w/o

Re: [PATCH 4 of 4] rebase: exclude obsoletes without a successor in destination (issue5300)

2017-11-14 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Nov 14, 2017 at 1:21 PM, Denis Laxalde wrote: > Martin von Zweigbergk a écrit : > >> On Tue, Nov 14, 2017 at 3:24 AM, Denis Laxalde wrote: >> >> Martin von Zweigbergk a écrit : >>> >>> On Mon, Nov 13, 2017 at 3:07 PM, Augie Fackler

Re: [PATCH 4 of 4] rebase: exclude obsoletes without a successor in destination (issue5300)

2017-11-14 Thread Denis Laxalde
Martin von Zweigbergk a écrit : On Tue, Nov 14, 2017 at 3:24 AM, Denis Laxalde wrote: Martin von Zweigbergk a écrit : On Mon, Nov 13, 2017 at 3:07 PM, Augie Fackler wrote: On Sun, Nov 12, 2017 at 06:06:37PM +0100, Denis Laxalde wrote: # HG changeset

Re: Desired use case for obsmarkers / visibility

2017-11-14 Thread Boris Feld
[...] > > > > > I /think/ the new visibility work proposed by Jun, Durham, and > > others might > > offer some solutions to this problem. Rather than speculate based > > on my > > limited knowledge of that proposal, I am hoping someone with more > > knowledge > > could weigh in more

D1347: dirstate: make map implementation overridable

2017-11-14 Thread mbthomas (Mark Thomas)
mbthomas added a comment. I think I need it to be an instance attribute, as for treedirstate it depends on the repo as to whether I want a normal dirstatemap or a treedirstatemap. See https://phab.mercurial-scm.org/D1401 for where I override this in treedirstate. REPOSITORY rHG

D1343: dirstate: move dropping of folded filenames into the dirstate map

2017-11-14 Thread mbthomas (Mark Thomas)
mbthomas added a comment. The `filefoldmap` (and `dirfoldmap`) are still `@propertycache`d. They only ever get accessed on systems with case insensitive filesystems, and so will often not be there at all. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1343

D1380: dirstate: document dirstatemap interface

2017-11-14 Thread mbthomas (Mark Thomas)
mbthomas added inline comments. INLINE COMMENTS > durin42 wrote in dirstate.py:1198 > Nit: let's try and prefer """ to ''' > > Try and get a pithy one-line summary of the class on the first line of the > docstring with the """ Sure. This file uses a mix of `"""` and `'''` and I couldn't tell

D1381: crecord: fix revert -ir '.^' crash caused by 3649c3f2cd

2017-11-14 Thread quark (Jun Wu)
quark marked an inline comment as done. quark added a comment. Testing the curses code has been brought up a few times but nobody really knows how to test it cleanly. INLINE COMMENTS > martinvonz wrote in crecord.py:559 > Can this line be deleted? Yes. Good catch. REPOSITORY rHG

D1381: crecord: fix revert -ir '.^' crash caused by 3649c3f2cd

2017-11-14 Thread quark (Jun Wu)
quark updated this revision to Diff 3494. quark edited the summary of this revision. quark retitled this revision from "crecord: fix revert -r '.^' crash caused by 3649c3f2cd" to "crecord: fix revert -ir '.^' crash caused by 3649c3f2cd". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: Upstreaming Facebook extensions

2017-11-14 Thread Jun Wu
Excerpts from Matt Harbison's message of 2017-11-13 22:49:56 -0500: > OK, good to know. > > So is upstreaming lfs in a single patch and marking it experimental a > reasonable next step, or does this need to incubate in hg-experimental a > bit more? I didn't get it working outside of the

[PATCH V2] debugdeltachain: output information about sparse read if enabled

2017-11-14 Thread Paul Morelle
# HG changeset patch # User Paul Morelle # Date 1509002829 -7200 # Thu Oct 26 09:27:09 2017 +0200 # Node ID 404cf035ae72a77af35e049b5de53f8dbbc6cd79 # Parent 602c168c0207c443ac61f7a7c727b31cfb0b86ad # EXP-Topic debugdeltachain # Available At

[PATCH 1 of 2 V2] debuglocks: add tests

2017-11-14 Thread Paul Morelle
# HG changeset patch # User Paul Morelle # Date 1510497259 -3600 # Sun Nov 12 15:34:19 2017 +0100 # Node ID b26aa142783235cddc7c90f2425aac53fbb612da # Parent 602c168c0207c443ac61f7a7c727b31cfb0b86ad # EXP-Topic debugsetlocks # Available At

[PATCH 2 of 2 V2] debuglocks: allow setting a lock

2017-11-14 Thread Paul Morelle
# HG changeset patch # User Paul Morelle # Date 1510497286 -3600 # Sun Nov 12 15:34:46 2017 +0100 # Node ID 61cf7ffd84b89889cbf6bbc2af13cdd67ba2d9f9 # Parent b26aa142783235cddc7c90f2425aac53fbb612da # EXP-Topic debugsetlocks # Available At

D1381: crecord: fix revert -r '.^' crash caused by 3649c3f2cd

2017-11-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > crecord.py:559 > +'apply': _('Select hunks to apply'), > 'revert': _('Select hunks to revert'), > 'discard': _('Select hunks to discard'), Can this line be deleted? REPOSITORY rHG Mercurial REVISION DETAIL

Re: Desired use case for obsmarkers / visibility

2017-11-14 Thread Boris Feld
On Mon, 2017-11-13 at 09:03 -0800, Gregory Szorc wrote: > On Fri, Nov 3, 2017 at 12:34 PM, Boris Feld > wrote: > > On Thu, 2017-11-02 at 10:06 -0700, Gregory Szorc wrote: > > > I have a potential use case for obsmarkers / visibility that I > > want > > > to run by people

Re: [PATCH 4 of 4] rebase: exclude obsoletes without a successor in destination (issue5300)

2017-11-14 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Nov 14, 2017 at 3:24 AM, Denis Laxalde wrote: > Martin von Zweigbergk a écrit : > >> On Mon, Nov 13, 2017 at 3:07 PM, Augie Fackler wrote: >> >> On Sun, Nov 12, 2017 at 06:06:37PM +0100, Denis Laxalde wrote: >>> # HG changeset patch # User

D1224: merge: cache unknown dir checks (issue5716)

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

D1226: merge: check created file dirs for path conflicts only once (issue5716)

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

Re: Upstreaming Facebook extensions

2017-11-14 Thread Augie Fackler
> On Nov 13, 2017, at 22:12, Jun Wu wrote: > > For absorb, it needs to migrate away from using Cython, and has a pure > implementation. Unfortunately I cannot prioritize this work for now. FWIW I still intend to get to this work, as the algorithms side of it interests me pretty

Re: Upstreaming Facebook extensions

2017-11-14 Thread Augie Fackler
> On Nov 13, 2017, at 22:49, Matt Harbison wrote: > > On Mon, 13 Nov 2017 22:12:31 -0500, Jun Wu wrote: > >> Excerpts from Matt Harbison's message of 2017-11-13 21:50:29 -0500: >> >> For LFS, it has been used in a repo synced from p4 for about half a

Re: [PATCH 4 of 4] rebase: exclude obsoletes without a successor in destination (issue5300)

2017-11-14 Thread Denis Laxalde
Martin von Zweigbergk a écrit : On Mon, Nov 13, 2017 at 3:07 PM, Augie Fackler wrote: On Sun, Nov 12, 2017 at 06:06:37PM +0100, Denis Laxalde wrote: # HG changeset patch # User Denis Laxalde # Date 1510489041 -3600 # Sun Nov 12 13:17:21 2017 +0100 #

D1336: remove: print message for each file in verbose mode only while using `-A`

2017-11-14 Thread mitrandir (Mateusz Jakub Kwapich)
mitrandir added a comment. @durin42: I'd say that listing *all the files in the repo* when you run `hg rm -A` should be considered a bug. This can't possibly be the intended behavior. Also: running `hg rm -A` without a `file` argument is not even covered by any testcase. REPOSITORY rHG

Re: [PATCH 4 of 4] rebase: exclude obsoletes without a successor in destination (issue5300)

2017-11-14 Thread Martin von Zweigbergk via Mercurial-devel
On Mon, Nov 13, 2017 at 3:07 PM, Augie Fackler wrote: > On Sun, Nov 12, 2017 at 06:06:37PM +0100, Denis Laxalde wrote: > > # HG changeset patch > > # User Denis Laxalde > > # Date 1510489041 -3600 > > # Sun Nov 12 13:17:21 2017 +0100 > > # Node ID

D1381: crecord: fix revert -r '.^' crash caused by 3649c3f2cd

2017-11-14 Thread lothiraldan (Boris Feld)
lothiraldan accepted this revision. lothiraldan added a comment. LGTM, I could reproduce the crash by adding the `-i` option to @quark command. I'm not sure how we could test this case but we should in my opinion. REPOSITORY rHG Mercurial REVISION DETAIL