D2930: thirdparty: port zope.interface to relative imports

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY By using relative imports, we're guaranteed to get modules vendored with Mercurial rather than other random modules that might be in sys.path. My editor

D2925: localrepo: move featuresetupfuncs out of localrepository class (API)

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7240. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2925?vs=7217=7240 REVISION DETAIL https://phab.mercurial-scm.org/D2925 AFFECTED FILES hgext/largefiles/__init__.py hgext/lfs/__init__.py

D2932: setup: register zope.interface packages and compile C extension

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY With this change, we should be able to use zope.interface in core! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2932 AFFECTED

D2933: repository: define interface for local repositories

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Per discussions on the mailing list and at the 4.4 and 4.6 sprints, we want to start defining interfaces for local repository primitives so that we a) have a

D2929: thirdparty: don't make zope a namespace package

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There are a gazillion zope.* packages in the wild. So zope/__init__.py needs to be a namespace package. But in Mercurial, we have 1 zope package. And even if

D2928: thirdparty: vendor zope.interface 4.4.3

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I've been trying to formalize interfaces for various components of Mercurial. So far, we've been using the "abc" package. This package is "good enough" for a

D2931: thirdparty: allow zope.interface.advice to be lazily imported

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The symbol from this module is only used in functions. Let's access that symbol through its imported module so importing zope.interface.advice can be lazy.

[PATCH] test-strip-narrow: adjust bundle removal for Windows test stability

2018-03-21 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1521686186 14400 # Wed Mar 21 22:36:26 2018 -0400 # Node ID 0a77cd27445c55270e4798351c5a2575e810d268 # Parent 6bc2f1b3bc9d3fb73ffe605f9d811bd75727434e test-strip-narrow: adjust bundle removal for Windows test

Re: [PATCH 9 of 9] templater: drop symbols which should be overridden by new 'ctx' (issue5612)

2018-03-21 Thread Augie Fackler
> On Mar 21, 2018, at 09:51, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1521117537 -32400 > # Thu Mar 15 21:38:57 2018 +0900 > # Node ID 148f113af1cd87295de4f773930575613d0e3d5e > # Parent

Re: [PATCH 3 of 3 V2] annotate: pack line content into annotateline object (API)

2018-03-21 Thread Augie Fackler
> On Mar 17, 2018, at 23:45, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1521343699 -32400 > # Sun Mar 18 12:28:19 2018 +0900 > # Node ID 395f0824cb28c050ab650011c95a514c750f6400 > # Parent

D2901: wireproto: explicitly track which requests are active

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG39304dd63589: wireproto: explicitly track which requests are active (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2900: wireproto: use named arguments when passing around frame data

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfe4c944f95bb: wireproto: use named arguments when passing around frame data (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2899: wireproto: define attr-based classes for representing frames

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG884a0c1604ad: wireproto: define attr-based classes for representing frames (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2869: wireproto: add request IDs to frames

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG2ec1fb9de638: wireproto: add request IDs to frames (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2869?vs=7145=7233

D2871: wireproto: service multiple command requests per HTTP request

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbbea991635d0: wireproto: service multiple command requests per HTTP request (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2872: wireproto: define human output side channel frame

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0a6c5cc09a88: wireproto: define human output side channel frame (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2856: wireproto: nominally don't expose "batch" to version 2 wire transports

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGcd0ca979a8b8: wireproto: nominally dont expose batch to version 2 wire transports (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2870: wireproto: support for receiving multiple requests

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc5e9c3b47366: wireproto: support for receiving multiple requests (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2860: wireproto: buffer output frames when in half duplex mode

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG861e9d37e56e: wireproto: buffer output frames when in half duplex mode (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2852: wireproto: implement basic frame reading and processing

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8c3c47362934: wireproto: implement basic frame reading and processing (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2857: wireproto: implement basic command dispatching for HTTPv2

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe7a012b60d6e: wireproto: implement basic command dispatching for HTTPv2 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2858: wireproto: define and implement responses in framing protocol

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG61393f888dfe: wireproto: define and implement responses in framing protocol (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2859: wireproto: change and document results from reactor methods

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg abandoned this revision. indygreg added a comment. Yes. I folded this in to previous commits and `hg phabsend` wasn't smart enough to realize it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2859 To: indygreg, #hg-reviewers Cc: durin42,

D2859: wireproto: change and document results from reactor methods

2018-03-21 Thread durin42 (Augie Fackler)
durin42 added a comment. This one failed to apply. It kind of looks like it got folded into earlier revisions, is that right? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2859 To: indygreg, #hg-reviewers Cc: durin42, mercurial-devel

D2871: wireproto: service multiple command requests per HTTP request

2018-03-21 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > wireprotoserver.py:508 > + > +assert authedperm in (b'ro', b'rw') > +wirecommand = wireproto.commands[command['command']] worth not using assert here? I don't think this is attacker-controlled? REPOSITORY rHG Mercurial

D2860: wireproto: buffer output frames when in half duplex mode

2018-03-21 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > wireprotoserver.py:418-420 > +# TODO Some HTTP clients are full duplex and can receive data before > +# the entire request is transmitted. Figure out a way to indicate support > +# for that so we can opt into full duplex mode. Recent

D2858: wireproto: define and implement responses in framing protocol

2018-03-21 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > wireprotoframing.py:347-349 > +return 'sendframes', { > +'framegen': createbytesresponseframesfrombytes(data), > +} I wonder if we'd be better off with an enumerated set of types that are attr.s instances instead of a

D2850: wireproto: define content negotiation for HTTPv2

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG37d7a1d18b97: wireproto: define content negotiation for HTTPv2 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2842: util: don't log low-level I/O calls for HTTP peer

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd3a9036d9ae9: util: dont log low-level I/O calls for HTTP peer (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2851: wireproto: define and implement protocol for issuing requests

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG40206e227412: wireproto: define and implement protocol for issuing requests (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2836: wireproto: define permissions-based routing of HTTPv2 wire protocol

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfddcb51b5084: wireproto: define permissions-based routing of HTTPv2 wire protocol (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2834: wireproto: support /api/* URL space for exposing APIs

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1cfef5693203: wireproto: support /api/* URL space for exposing APIs (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2837: wireproto: require POST for all HTTPv2 requests

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfc5e261915b9: wireproto: require POST for all HTTPv2 requests (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2843: url: support suppressing Accept header

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa708e1e4d7a8: url: support suppressing Accept header (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2843?vs=7193=7221

D2849: hgweb: also set Content-Type header

2018-03-21 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG55e901396005: hgweb: also set Content-Type header (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2849?vs=7197=7225

D2694: merge: deprecate accessing update results by index

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. This one failed to apply, probably because of my changes to rebase.py. I have to leave now, but I'll try again later tonight, whether or not you've gotten a chance to update it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2694

D2698: merge: use constants for merge state record types

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > merge.py:50 > > +# Merge state record types. See ``mergestate`` docs for more. > +RECORD_LOCAL = b'L' Perhaps we should move that documentation to here so we don't have two lists of the same values that can end up getting out of sync? That

D2692: merge: return an attrs class from update() and applyupdates()

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg added a comment. `__slots__` allocates enough space for the exact set of attributes specified rather than backing object instances by `__dict__`. If you create thousands of small objects that all have the same fields, `__slots__` can yield some performance wins. REPOSITORY rHG

D2693: histedit: always define update results

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz accepted this revision. martinvonz added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > histedit.py:492 > repo.dirstate.setbranch(rulectx.branch()) > if stats and stats[3] > 0: > buf = repo.ui.popbuffer() remove the

D2692: merge: return an attrs class from update() and applyupdates()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > merge.py:1403-1404 > > +@attr.s(frozen=True) > +class updateresult(object): > +updatedcount = attr.ib() mpm made me use a tuple with __slots__ for scmutil.status. Any idea when that's better? I think it was something about performance,

D2925: localrepo: move featuresetupfuncs out of localrepository class (API)

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I want to establish an interface for local repositories. featuresetupfuncs is a class attribute and is global/shared across all localrepository instances.

D2927: localrepo: make filterpats private (API)

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm not sure why this is available on the public API. AFAICT it isn't used outside of the class. .. api:: localrepo.localrepository.filterpats was

D2926: narrow: use featuresetupfuncs

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is the preferred way to register repo requirements that can be opened because it respects the set of loaded extensions at

D2807: remotenames: add functionality to hoist remotebookmarks

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg added a comment. I like the functionality. I'm not crazy about "hoist." I think if the config option were named `hoistedpeer`, that would be a bit better. If it is just `hoist`, it sounds like it should be a boolean. `hoistedname` appearing in `hg log` output doesn't feel

D2924: rebase: rename conclude[memory]node() to commit[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D2924#47088, @phillco wrote: > What _is_ the difference between "conclude" and "commit"? I had assumed it was called "conclude" because it did more than commit (the stuff that's now in _concludecommit()). There's

D2923: rebase: pass in "user" instead of "ctx" to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG8ff5772711fa: rebase: pass in user instead of ctx to conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2921: rebase: move config override out of conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb8d305bd12ca: rebase: move config override out of conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2922: rebase: look up default date outside of conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0b1230a5a958: rebase: look up default date outside of conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2924: rebase: rename conclude[memory]node() to commit[memory]node()

2018-03-21 Thread phillco (Phil Cohen)
phillco added a comment. What _is_ the difference between "conclude" and "commit"? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2924 To: martinvonz, phillco, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel ___

D2924: rebase: rename conclude[memory]node() to commit[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa8d8cdafe29c: rebase: rename conclude[memory]node() to commit[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2924: rebase: rename conclude[memory]node() to commit[memory]node()

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Very nice cleanup! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2924 To: martinvonz, phillco, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel

D2922: rebase: look up default date outside of conclude[memory]node()

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > rebase.py:449-451 > +date = self.date > +if date is None: > +date = ctx.date() We could probably write this as `date = self.date or

D2920: rebase: pass in entire "overrides" dict to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7616073a4cf1: rebase: pass in entire overrides dict to conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2918: rebase: inline _makextrafn() now that we have only one caller

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbd0086bd3af4: rebase: inline _makextrafn() now that we have only one caller (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2919: rebase: pass in "keepbranch" to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7db86856f27f: rebase: pass in keepbranch to conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2917: rebase: pass in "extra" itself into conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0ab0d94ead72: rebase: pass in extra itself into conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2915: rebase: pass in ctx, not rev, to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfbc82a08bdcb: rebase: pass in ctx, not rev, to conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2916: rebase: look up commit message to reuse outside of conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb7f5d03e1e54: rebase: look up commit message to reuse outside of conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2918: rebase: inline _makextrafn() now that we have only one caller

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. The ability to register extra functions seems like the important functionality here. And `self.extrafns` is preserved. So I don't think anyone will miss the old function. REPOSITORY

D2917: rebase: pass in "extra" itself into conclude[memory]node()

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Yeah, the old behavior was wonky. FWIW https://phab.mercurial-scm.org/rHG6cd9b8428104ed62b4fd477d618361f298b34865 and

D2913: rebase: store rebase state after each commit

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG98663bed146e: rebase: store rebase state after each commit (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2914: rebase: extract common _concludenode()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5f99142f59cc: rebase: extract common _concludenode() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2914?vs=7177=7206

D2912: rebase: register status file generator only once when using single transaction

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG74f91bec6991: rebase: register status file generator only once when using single transaction (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2911: tests: add some more tests to test-rebase-collapse.t

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9cc9b3e155f8: tests: add some more tests to test-rebase-collapse.t (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2910: tests: use drawdag in test-rebase-collapse.t

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGdd2833e4d660: tests: use drawdag in test-rebase-collapse.t (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2914: rebase: extract common _concludenode()

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. Nice. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2914 To: martinvonz, phillco, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel

D2910: tests: use drawdag in test-rebase-collapse.t

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. This was hard to review. But I didn't see anything obviously wrong with this refactor. INLINE COMMENTS > test-rebase-collapse.t:182 > + $ hg rebase -s C --dest H --collapse > +

D2909: rebase: remove unused default argument values from conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG36c4e25c3ce1: rebase: remove unused default argument values from conclude[memory]node() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2908: rebase: get "inmemory" state directly from rebase runtime

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG81b35d275a60: rebase: get inmemory state directly from rebase runtime (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2909: rebase: remove unused default argument values from conclude[memory]node()

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. I wonder if it is worth creating a dedicated type to represent the fields in a commit. We have a handful of these functions around the code base where you need to pass around a bunch

D2851: wireproto: define and implement protocol for issuing requests

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7199. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2851?vs=7139=7199 REVISION DETAIL https://phab.mercurial-scm.org/D2851 AFFECTED FILES mercurial/debugcommands.py mercurial/help/internals/wireprotocol.txt

D2850: wireproto: define content negotiation for HTTPv2

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7198. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2850?vs=7138=7198 REVISION DETAIL https://phab.mercurial-scm.org/D2850 AFFECTED FILES mercurial/help/internals/wireprotocol.txt mercurial/wireprotoserver.py

D2849: hgweb: also set Content-Type header

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7197. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2849?vs=7137=7197 REVISION DETAIL https://phab.mercurial-scm.org/D2849 AFFECTED FILES mercurial/hgweb/request.py CHANGE DETAILS diff --git

D2836: wireproto: define permissions-based routing of HTTPv2 wire protocol

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7195. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2836?vs=7135=7195 REVISION DETAIL https://phab.mercurial-scm.org/D2836 AFFECTED FILES mercurial/debugcommands.py mercurial/help/internals/wireprotocol.txt

D2843: url: support suppressing Accept header

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7193. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2843?vs=6997=7193 REVISION DETAIL https://phab.mercurial-scm.org/D2843 AFFECTED FILES mercurial/debugcommands.py mercurial/url.py

D2842: util: don't log low-level I/O calls for HTTP peer

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7192. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2842?vs=7161=7192 REVISION DETAIL https://phab.mercurial-scm.org/D2842 AFFECTED FILES mercurial/debugcommands.py mercurial/util.py

D2837: wireproto: require POST for all HTTPv2 requests

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7196. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2837?vs=7136=7196 REVISION DETAIL https://phab.mercurial-scm.org/D2837 AFFECTED FILES mercurial/help/internals/wireprotocol.txt mercurial/wireprotoserver.py

D2834: wireproto: support /api/* URL space for exposing APIs

2018-03-21 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 7194. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2834?vs=7009=7194 REVISION DETAIL https://phab.mercurial-scm.org/D2834 AFFECTED FILES mercurial/configitems.py mercurial/hgweb/hgweb_mod.py

D2729: copyfile: preserve stat info (mtime, etc.) when doing copies/renames

2018-03-21 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 7191. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2729?vs=7190=7191 REVISION DETAIL https://phab.mercurial-scm.org/D2729 AFFECTED FILES hgext/largefiles/overrides.py mercurial/cmdutil.py

D2729: copyfile: preserve stat info (mtime, etc.) when doing copies/renames

2018-03-21 Thread spectral (Kyle Lippincott)
spectral added a reviewer: indygreg. spectral added a comment. In https://phab.mercurial-scm.org/D2729#46372, @martinvonz wrote: > Greg has some concerns about this patch and it sounds like you will make some changes. The patch was queued by Augie, but I'm dropping it for now, so we

D2729: copyfile: preserve stat info (mtime, etc.) when doing copies/renames

2018-03-21 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 7190. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2729?vs=6967=7190 REVISION DETAIL https://phab.mercurial-scm.org/D2729 AFFECTED FILES hgext/largefiles/overrides.py mercurial/cmdutil.py

D2889: filemerge: make the 'local' path match the format that 'base' and 'other' use

2018-03-21 Thread spectral (Kyle Lippincott)
spectral updated this revision to Diff 7189. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2889?vs=7087=7189 REVISION DETAIL https://phab.mercurial-scm.org/D2889 AFFECTED FILES mercurial/filemerge.py tests/test-merge-tools.t CHANGE DETAILS diff

D2057: rust implementation of hg status

2018-03-21 Thread Ivzhh (Sheng Mao)
Ivzhh marked 4 inline comments as done. Ivzhh added a comment. In https://phab.mercurial-scm.org/D2057#46726, @yuja wrote: > >> I think the only place where you would need to do os-specific code is when > >> doing serialization and serialization > > > > Yes, that will be feasible

D2057: rust implementation of hg status

2018-03-21 Thread Ivzhh (Sheng Mao)
Ivzhh marked 45 inline comments as done. Ivzhh added inline comments. INLINE COMMENTS > kevincox wrote in base85.rs:23 > `` can only hold valid utf8 data? Does it make more sense to have `&[u8]` > here for a list of bytes? It should be any &[u8], but the current cpython crate doesn't wrap for

[PATCH] remove: add dry-run functionality

2018-03-21 Thread Sushil khanchi
# HG changeset patch # User Sushil khanchi # Date 1521655571 -19800 # Wed Mar 21 23:36:11 2018 +0530 # Node ID 35c57ba0cf288af7c232d0bf17ea8dcb01644d09 # Parent b6a4881cec1937a8d9cd2e9bbbdf5ca31cfa73dd remove: add dry-run functionality diff -r b6a4881cec19 -r

D2057: rust implementation of hg status

2018-03-21 Thread Ivzhh (Sheng Mao)
Ivzhh updated this revision to Diff 7188. Ivzhh added a comment. - add revlog and mpatch facilities - add changelog parsing - add manifest parsing - path encoding for data store - add dirstate and matcher facilities - add local repository and the supporting modules - use cargo fmt

D2915: rebase: pass in ctx, not rev, to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY They both need it and there's no locking that might make the results different, so let's do it in one place. This also

D2924: rebase: rename conclude[memory]node() to commit[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The functions do little more than commit at this point. REPOSITORY rHG Mercurial REVISION DETAIL

D2917: rebase: pass in "extra" itself into conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We were passing in a function instead for no clear reason (probably historical, but I haven't bothered looking).

D2922: rebase: look up default date outside of conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2922 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff

D2914: rebase: extract common _concludenode()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY _rebasenode() and _finishrebase() had a lot of code in common. This commit extracts some of that. This means we will also

D2923: rebase: pass in "user" instead of "ctx" to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was the only remaining part of the context object that was needed. REPOSITORY rHG Mercurial REVISION DETAIL

D2912: rebase: register status file generator only once when using single transaction

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY rebase.storestatus() behaved differently depending on whether a transaction is passed to it. If a transaction is passed,

D2918: rebase: inline _makextrafn() now that we have only one caller

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also avoid even creating a function since we just end up calling it right away. REPOSITORY rHG Mercurial REVISION

D2916: rebase: look up commit message to reuse outside of conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was done the same way in both functions, so let's let the single caller do it. REPOSITORY rHG Mercurial REVISION

D2913: rebase: store rebase state after each commit

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, we stored the rebase state early in the processing of a node, before we updated the rebase state to

D2921: rebase: move config override out of conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2921 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff

D2920: rebase: pass in entire "overrides" dict to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As with previous patches, this was done the same way in both functions, so let's make the caller do it instead.

D2919: rebase: pass in "keepbranch" to conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Both functions calculated the same "keepbranch" value from the "keepbranches" we passed in, so let's make the caller do

D2909: rebase: remove unused default argument values from conclude[memory]node()

2018-03-21 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. martinvonz added a reviewer: phillco. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's only "commitmsg" that we don't always pass. REPOSITORY rHG Mercurial REVISION DETAIL

  1   2   >