D3750: ACL: added bookmarks support (from https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-March/080650.html)

idlsoft 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/D3750 AFFECTED FILES hgext/acl.py tests/test-acl.t CHANGE DETAILS diff --git a/tests/test-acl.t

D1974: narrow: import experimental extension from narrowhg revision cb51d673e9c5

idlsoft added inline comments. INLINE COMMENTS > indygreg wrote in narrowbundle2.py:336 > We may want to remove this feature for the time being, as it is very Google > specific. I'm happy to provide a mechanism for extensions to hook in here to > enforce ACLs. But there's nothing in core that

D2231: narrow: fix for getting the username when running http server

idlsoft 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/D2231 AFFECTED FILES hgext/narrow/narrowbundle2.py CHANGE DETAILS diff --git

D2231: narrow: fix for getting the username when running http server

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4224f26c0d35: narrow: fix for getting the username when running http server (authored by idlsoft, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2231: narrow: fix for getting the username when running http server

idlsoft added inline comments. INLINE COMMENTS > martinvonz wrote in narrowbundle2.py:331 > But you're okay with this version for now? This commit is currently the > bottom-most draft commit in the "committed" repo, so please accept it if > you're okay with it. I would have accepted, but I saw

D4311: New bookflow extension for bookmark-based branching

idlsoft 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/D4311 AFFECTED FILES hgext/bookflow.py CHANGE DETAILS diff --git a/hgext/bookflow.py

D4311: New bookflow extension for bookmark-based branching

idlsoft added a comment. This was submitted in error, not sure how to delete it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4311 To: idlsoft, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D4312: New bookflow extension for bookmark-based branching

idlsoft 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/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git

D4353: bookflow: support shelve and enforce working directory pointing to the active bookmark

idlsoft 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/D4353 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git

D4312: New bookflow extension for bookmark-based branching

idlsoft updated this revision to Diff 10507. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4312?vs=10506=10507 REVISION DETAIL https://phab.mercurial-scm.org/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git a/tests/test-bookflow.t

D4353: bookflow: support shelve and enforce working directory pointing to the active bookmark

idlsoft abandoned this revision. idlsoft added a comment. Created a new one instead of updating https://phab.mercurial-scm.org/D4312 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4353 To: idlsoft, #hg-reviewers Cc: mercurial-devel

D4312: New bookflow extension for bookmark-based branching

idlsoft updated this revision to Diff 10506. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4312?vs=10406=10506 REVISION DETAIL https://phab.mercurial-scm.org/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git a/tests/test-bookflow.t

D4312: New bookflow extension for bookmark-based branching

idlsoft updated this revision to Diff 10508. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4312?vs=10507=10508 REVISION DETAIL https://phab.mercurial-scm.org/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git a/tests/test-bookflow.t

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. I added some inline comments. A test for `hg book EXISTING` is indeed missing, there is, however, one for not moving the bookmark on update, it's line 52: ` (leaving bookmark X)`. Hopefully, I'll be able to make some changes later in the week. Was not aware

D4312: New bookflow extension for bookmark-based branching

idlsoft updated this revision to Diff 10754. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4312?vs=10508=10754 REVISION DETAIL https://phab.mercurial-scm.org/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git a/tests/test-bookflow.t

D4312: New bookflow extension for bookmark-based branching

idlsoft updated this revision to Diff 10789. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4312?vs=10754=10789 REVISION DETAIL https://phab.mercurial-scm.org/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git a/tests/test-bookflow.t

D4312: New bookflow extension for bookmark-based branching

idlsoft added inline comments. INLINE COMMENTS > pulkit wrote in bookflow.py:14 > Can we switch the way help is described here. From 'cmdname: help' to > > `To create a new bookmark: hg book mark`. Also, this way it looks more like a cheatsheet REVISION DETAIL

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. At some point RhodeCode was checking if the destination bookmark was a descendant of the source, and not allowing such pull requests to be created. That would have to be handled as a fast-forward, in other words just moving the destination bookmark. REPOSITORY

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. If this is accepted we might want to look into changing the behavior of `hg pull -u`. It should update the working directory only if the active bookmark was moved remotely. I didn't find an easy way to do this without changes to core. REPOSITORY rHG Mercurial

D4312: New bookflow extension for bookmark-based branching

idlsoft updated this revision to Diff 12149. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4312?vs=10789=12149 REVISION DETAIL https://phab.mercurial-scm.org/D4312 AFFECTED FILES hgext/bookflow.py tests/test-bookflow.t CHANGE DETAILS diff --git a/tests/test-bookflow.t

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. First of all, thank you for reviewing the patch. We switched to mercurial a few months ago, mainly because of the narrow extension. Feature branches workflow was something everyone in the company understood and adhered to, so trying to adopt something else

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. In https://phab.mercurial-scm.org/D4312#77084, @pulkit wrote: > Unrelated, do you use narrow with ellipses or without ellipses? Also I am sorry to say but in this cycle, narrow extension has under gone a lot of perf and correctness improvements and it won't be

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. > Were there particular pain points before? The list of things to polish isn't short, but I don't mind reprioritizing things if it helps. I submitted a bug report https://bz.mercurial-scm.org/show_bug.cgi?id=5794 It has a zip file with the repo, although to be

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. @smf I just noticed your name on https://www.mercurial-scm.org/wiki/BookmarkUpdatePlan, which puts your comments into a larger context. This would definitely be an improvement, and reduce the scope of what this extension does. Would you consider also addressing

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. >> Obviously, I can't say I'm too happy with this. Allowing users to shoot themselves in the foot even more is pretty bad. I don't think that's fair. Everyone's experience is different, but it did precisely the opposite for us. When we switched from git we

D4312: New bookflow extension for bookmark-based branching

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe44e6b37b6af: bookflow: new extension for bookmark-based branching (authored by idlsoft, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D4312?vs=12149=12678#toc REPOSITORY

D4312: New bookflow extension for bookmark-based branching

idlsoft added a comment. In https://phab.mercurial-scm.org/D4312#79938, @smf wrote: > This will not help the *average* user and sends a mixed (and dangerous) message that bookmarks should be used. Bookmarks have been in core for some time now, and there is not one mention

D6218: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

idlsoft added a comment. This is nitpicking, but there is a duplicate `_NARROWACL_SECTION` definition in narrowbundle2.py, I think only the one in exchange.py should remain. Btw it's still 'narrowhgacl' from the old days. REPOSITORY rHG Mercurial REVISION DETAIL

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

idlsoft added inline comments. INLINE COMMENTS > narrowbundle2.py:167 > +excludepats = set(exc.splitlines()) > +narrowspec.validatepatterns(includepats) > +narrowspec.validatepatterns(excludepats) shouldn't this be inside the if? `includepats` and `excludepats` are not defined

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

idlsoft added inline comments. INLINE COMMENTS > narrowbundle2.py:36 > _CHANGESPECPART = 'narrow:changespec' > +_RESSPECS = 'narrow:responsespec' > _SPECPART = 'narrow:spec' I thought this would have an uppercase letter to make it mandatory? REPOSITORY rHG Mercurial REVISION DETAIL

D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

idlsoft added inline comments. INLINE COMMENTS > narrowbundle2.py:34 > > _NARROWACL_SECTION = 'narrowhgacl' > _CHANGESPECPART = 'narrow:changespec' If we plan to change this to `narrowacl` at some point, perhaps now is the time, since it's a major version change. REPOSITORY rHG

D6218: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

idlsoft added a comment. Because the current client ignores the data completely, the only way to force it to fail I think is to change the name of the part. This would make things cleaner probably, but I'll deal with whatever solution you guys settle on. REPOSITORY rHG Mercurial

D6218: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

idlsoft added a comment. If ACL is enabled, processing this part is mandatory, yes. On clone, or pull the user doesn't specify includes, so reading this part is the only way the client can get them. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6218 To:

D6776: bookmarks: validate changes on push

idlsoft 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/D6776 AFFECTED FILES mercurial/bundle2.py mercurial/exchange.py mercurial/localrepo.py

D6776: bookmarks: validate changes on push

idlsoft added a comment. This is a potential fix for https://bz.mercurial-scm.org/show_bug.cgi?id=6193 The actual validation is in `bundle2.handlebookmark`. The rest of the changes are there to pass the `force` parameter. I've also made `force` available to hooks. That way one can

D6776: bookmarks: validate changes on push

idlsoft added a comment. I see `--force` as a general "I know what I'm doing, forget your checks" instruction. If it's not, then all the variations would need their own `--force-heads`, `--force-bookmarks`, `--force-*`. May be a bit much. As for this being configurable? I,

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16524. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16519=16524 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6845: pushkeys: introduce a server.bookmarks-pushkey-reject option to complement D6776

idlsoft 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/D6845 AFFECTED FILES mercurial/bookmarks.py mercurial/configitems.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16533. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16531=16533 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16534. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16533=16534 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6851: narrow: don't hexify paths and double-hexify known nodes on wire (BC)

idlsoft added a comment. > @idlsoft and their company does use narrow extension. @idlsoft can you upgrade server and client at the same time? I did that a little while ago to move to 5.0. It was not fun. It's server, teamcity, clients, docker images. What operations does this affect?

D6851: narrow: don't hexify paths and double-hexify known nodes on wire (BC)

idlsoft added a comment. >> Just `tracked --add-include`. A workaround to simplify the upgrade would be to change `wireprototypes.SUPPORTED_ELLIPSESCAP` to be `(ELLIPSESCAP1, )` on the server from now until all clients have upgraded. But that may still be annoying and error-prone for you to

D6776: bookmarks: validate changes on push

idlsoft added a comment. Yes, server changed since your last pull, and you override the bookmark without so much as a warning. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 To:

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16531. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16524=16531 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft added a comment. > Isn't that a client-side change only though, so we still need functionality on the server to reject bad pushes? (I could be missing something.) I'm actually not sure how to make this work for http, it doesn't seem to propagate `--force` to `unbundle`. Which

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16518. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16515=16518 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft added a comment. As I In D6776#133068 , @marmoute wrote: > As @valentin.gatienbaron pointed out, the now avoid adding more semantic to bare `--force` with an associated `--force-bookmark` especially because we want to be able to

D12600: Enforce narrowacl in narrow_widen

idlsoft created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12600