Re: D135: rebase: use one dirstateguard for when using rebase.singletransaction

2017-07-20 Thread durham (Durham Goode)
durham updated this revision to Diff 338. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D135?vs=274&id=338 REVISION DETAIL https://phab.mercurial-scm.org/D135 AFFECTED FILES hgext/rebase.py mercurial/dirstateguard.py mercurial/util.py tests/test

Re: D98: revset: support reading aliases from a .hgrevsets file

2017-07-20 Thread yuja (Yuya Nishihara)
yuja added a comment. > What else should we allow in here? Are there security concerns we should think through? Probably safe, but could be used for DoS attack: - `filesetalias` (not implemented) - `revsetalias` - `committemplate` - `templatealias` - `templates` Unsafe (

Re: [PATCH 2 of 2] commitextras: make sure keys are non empty ASCII strings

2017-07-20 Thread Yuya Nishihara
On Wed, 19 Jul 2017 20:00:36 +0530, Pulkit Goyal wrote: > On Tue, Jul 18, 2017 at 7:02 PM, Yuya Nishihara wrote: > > On Tue, 18 Jul 2017 17:48:11 +0530, Pulkit Goyal wrote: > >> # HG changeset patch > >> # User Pulkit Goyal <7895pul...@gmail.com> > >> # Date 1500378367 -19800 > >> # Tue Jul 1

[PATCH 2 of 2 STABLE] setup: forcibly include cext/pure packages in py2exe (issue5625)

2017-07-20 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1500558460 -32400 # Thu Jul 20 22:47:40 2017 +0900 # Branch stable # Node ID d5bb7d09db154036eaf1173c5445356218b8291e # Parent 3f8f39ef616024ac0722c701aeae9105a52728fa setup: forcibly include cext/pure packages in py2exe (issue5625) Since th

[PATCH 1 of 2 STABLE] setup: do not select hg executable that prints unexpected warnings

2017-07-20 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1500557557 -32400 # Thu Jul 20 22:32:37 2017 +0900 # Branch stable # Node ID 3f8f39ef616024ac0722c701aeae9105a52728fa # Parent a41e0f1c9b69330a0dd8d6590787faa38d11c0ff setup: do not select hg executable that prints unexpected warnings Otherw

Re: D135: rebase: use one dirstateguard for when using rebase.singletransaction

2017-07-20 Thread martinvonz (Martin von Zweigbergk)
martinvonz accepted this revision. martinvonz added a comment. This revision is now accepted and ready to land. Looks good, but we're in code freeze, so it will have to wait until after. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D135 EMAIL PREFERENCES http

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

2017-07-20 Thread sid0 (Siddharth Agarwal)
sid0 added inline comments. INLINE COMMENTS > martinvonz wrote in test-dirstate-race.t:223-231 > Oh, the "hg status" is just to cause it to write the dirstate? Would "hg > debugrebuilddirstate" work? That doesn't produce any output and it's clearer > that that will result in the dirstate gettin

Re: D152: repo: skip invalidation of changelog if it has 'delayed' changes (API)

2017-07-20 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D152#2246, @quark wrote: > Could we call `changelog._writepending()` automatically to solve this problem? Good question. I spent quite a lot of time trying to see if that would work. It was easy to get all tests to pas

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

2017-07-20 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > sid0 wrote in test-dirstate-race.t:223-231 > I'm afraid not -- debugrebuilddirstate will try to acquire the wlock, which > is already held by the rebase. Makes sense (for others' info: "hg status" will write the dirstate if the lock can be ac

[Bug 5627] New: rebase moves bookmark backwards if it "created no changes to commit"

2017-07-20 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5627 Bug ID: 5627 Summary: rebase moves bookmark backwards if it "created no changes to commit" Product: Mercurial Version: 4.3-rc Hardware: All OS: All

[PATCH STABLE] rebase: move bookmark to destination for commits becoming empty (issue5627)

2017-07-20 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1500594002 25200 # Thu Jul 20 16:40:02 2017 -0700 # Branch stable # Node ID 3253102e6e5222a08737e7204eb672ab12e80764 # Parent a41e0f1c9b69330a0dd8d6590787faa38d11c0ff # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull http

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

2017-07-20 Thread sid0 (Siddharth Agarwal)
sid0 updated this revision to Diff 351. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D153?vs=337&id=351 REVISION DETAIL https://phab.mercurial-scm.org/D153 AFFECTED FILES tests/test-dirstate-race.t CHANGE DETAILS diff --git a/tests/test-dirstate-ra

Re: [PATCH 2 of 2 STABLE] setup: forcibly include cext/pure packages in py2exe (issue5625)

2017-07-20 Thread Matt Harbison
On Thu, 20 Jul 2017 10:39:53 -0400, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1500558460 -32400 # Thu Jul 20 22:47:40 2017 +0900 # Branch stable # Node ID d5bb7d09db154036eaf1173c5445356218b8291e # Parent 3f8f39ef616024ac0722c701aeae9105a52728fa setup: forci

Re: [PATCH 1 of 2 STABLE] setup: do not select hg executable that prints unexpected warnings

2017-07-20 Thread Matt Harbison
On Thu, 20 Jul 2017 10:39:52 -0400, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1500557557 -32400 # Thu Jul 20 22:32:37 2017 +0900 # Branch stable # Node ID 3f8f39ef616024ac0722c701aeae9105a52728fa # Parent a41e0f1c9b69330a0dd8d6590787faa38d11c0ff setup: do no

Re: D153: test-dirstate-race: hide irrelevant hg status output

2017-07-20 Thread sid0 (Siddharth Agarwal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG34a8ef358c93: test-dirstate-race: hide irrelevant hg status output (authored by sid0). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D153?vs=351&id=354 REVISION

Re: [PATCH STABLE] rebase: move bookmark to destination for commits becoming empty (issue5627)

2017-07-20 Thread Martin von Zweigbergk via Mercurial-devel
On Thu, Jul 20, 2017 at 4:40 PM, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1500594002 25200 > # Thu Jul 20 16:40:02 2017 -0700 > # Branch stable > # Node ID 3253102e6e5222a08737e7204eb672ab12e80764 > # Parent a41e0f1c9b69330a0dd8d6590787faa38d11c0ff > # Available At http

Re: [PATCH 2 of 2 STABLE] setup: forcibly include cext/pure packages in py2exe (issue5625)

2017-07-20 Thread Pascal Quantin
Hi Matt and Yuya, 2017-07-21 4:16 GMT+02:00 Matt Harbison : > On Thu, 20 Jul 2017 10:39:53 -0400, Yuya Nishihara wrote: > > # HG changeset patch >> # User Yuya Nishihara >> # Date 1500558460 -32400 >> # Thu Jul 20 22:47:40 2017 +0900 >> # Branch stable >> # Node ID d5bb7d09db154036eaf1173c