D212: tests: demonstrate crash when trying to rebase merge without its parents

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As the test case shows, when "hg rebase -d G -r 'B + D + F'" is run on the following graph, we crash with traceback. It's reasonable to fail because we can no

D211: tests: demonstrate broken rebase of merge with p1's successor in dest

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The fix in https://phab.mercurial-scm.org/rHG8ede973597fda1368d1b867e7293ef812c82c2ab (rebase: handle successor targets (issue5198), 2016-04-11) only fixed th

D210: pushvars: move fb extension pushvars to core

akushner added a comment. @pulkit - see what others say. People might disagree with me on this, but I'd rather be cautious on a feature like this. Even though the variables passed are all prepended with HG_USERVAR so I don't see a way how this could cause problems. INLINE COMMENTS > pulkit

D210: pushvars: move fb extension pushvars to core

pulkit added inline comments. INLINE COMMENTS > akushner wrote in commands.py:4012-4016 > This should definitely be opt-in, vs. opt-out. Sorry but I don't understand what you mean here. Do I need to change the documentation part or the change the flag part. Currently I have set the default of

D210: pushvars: move fb extension pushvars to core

akushner added inline comments. INLINE COMMENTS > commands.py:4011 > > +The --pushvars option is used to passed environment variables to server. > If > +you want to disable this on your server for security purposes, you can > add s/passed/pass/ > commands.py:4012-4016 > +you wan

D210: pushvars: move fb extension pushvars to core

akushner added inline comments. INLINE COMMENTS > test-pushvars.t:7 > + $ cat > $TESTTMP/pretxnchangegroup.sh << EOF > + > #!/bin/bash > + > env | grep -E "^HG_USERVAR_DEBUG" Please use /bin/sh > test-pushvars.t:8-9 > + > #!/bin/bash > + > env | grep -E "^HG_USERVAR_DEBUG" > + > env | gre

D209: bundle2: load hookargs from bundleoperation into transaction when started one

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When a transaction is started, we must load the hookargs from the bundleoperation object to the transaction so that they can be used in the transaction. Also this

D210: pushvars: move fb extension pushvars to core

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY pushvars extension in fbext adds a --pushvars flag to push command using which one send environment variables to server which can be used to run hooks. The extens

D208: bundle2: add the capability to store hookargs on bundle operation object

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There are extensions like pushrebase, pushvars which run hooks on a server before taking the lock. Since the lock is not taken, transaction is not there, so the h

mercurial@33610: 4 new changesets (3 on stable)

4 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/6c142f279625 changeset: 33607:6c142f279625 branch: stable user:Boris Feld date:Mon Jul 31 17:43:45 2017 +0200 summary: pypy: fix failing test files with Pypy5.6.0 https://www.mercuri

D126: phabricator: add status to revision query language

quark updated this revision to Diff 488. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D126?vs=238&id=488 REVISION DETAIL https://phab.mercurial-scm.org/D126 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py b/

D122: phabricator: add --amend option to phabsend

quark updated this revision to Diff 485. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D122?vs=233&id=485 REVISION DETAIL https://phab.mercurial-scm.org/D122 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py b/

D125: phabricator: add a small language to query Differential Revisions

quark updated this revision to Diff 487. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D125?vs=237&id=487 REVISION DETAIL https://phab.mercurial-scm.org/D125 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py b/

D124: phabricator: change "readpatch" to be more flexible

quark updated this revision to Diff 486. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D124?vs=236&id=486 REVISION DETAIL https://phab.mercurial-scm.org/D124 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py b/

D121: phabricator: use Phabricator's last node information

quark updated this revision to Diff 484. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D121?vs=232&id=484 REVISION DETAIL https://phab.mercurial-scm.org/D121 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py b/

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG609606d21765: rebase: use one dirstateguard for when using rebase.singletransaction (authored by durham). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D135?vs=33

[PATCH 08 of 10 py3] bundle2: look for __next__ as well as next to identify iterators

# HG changeset patch # User Augie Fackler # Date 1500909585 14400 # Mon Jul 24 11:19:45 2017 -0400 # Node ID 7aac6fefd0a1a7357fb4f04b92e50131768b3f6b # Parent 89d7a53b500a213396ab3c8e043a31dc5538ccaf bundle2: look for __next__ as well as next to identify iterators In Python 3, next is calle

[PATCH 10 of 10 py3] bundle2: use bytestr() instead of str() to convert part id to bytes

# HG changeset patch # User Augie Fackler # Date 1500910120 14400 # Mon Jul 24 11:28:40 2017 -0400 # Node ID d8907ce0da00480ddabfdf4214db1bc9cb1c75dd # Parent fab6234e619e0e57cec4b7d0b5150bfbbede8b30 bundle2: use bytestr() instead of str() to convert part id to bytes This was exposed by try

[PATCH 07 of 10 py3] bundle2: obtain repr() of exception in a python3-safe way

# HG changeset patch # User Augie Fackler # Date 1500909551 14400 # Mon Jul 24 11:19:11 2017 -0400 # Node ID 89d7a53b500a213396ab3c8e043a31dc5538ccaf # Parent 4c1f4e109bf90a8352a25a6b45a80fabcac6306b bundle2: obtain repr() of exception in a python3-safe way This was exposed by other problem

[PATCH 06 of 10 py3] bundle2: use modern Python division

# HG changeset patch # User Augie Fackler # Date 1500909456 14400 # Mon Jul 24 11:17:36 2017 -0400 # Node ID 4c1f4e109bf90a8352a25a6b45a80fabcac6306b # Parent 7d68e38eb849015f034a0cbd66990777e635e8f6 bundle2: use modern Python division This was failing on Python 3 because the / was returnin

[PATCH 02 of 10 py3] hg: avoid sending unicode url into config infrastructure

# HG changeset patch # User Augie Fackler # Date 1500906158 14400 # Mon Jul 24 10:22:38 2017 -0400 # Node ID 8b22554199879f80a13ddee556bc540ddcb65a94 # Parent 87ee5c3b3271ded54fe4462aa43a9d1520b8a10b hg: avoid sending unicode url into config infrastructure This was causing some unfortunate

[PATCH 03 of 10 py3] obsolete: use bytestr() instead of str() so the node is bytes on py3

# HG changeset patch # User Augie Fackler # Date 1500907059 14400 # Mon Jul 24 10:37:39 2017 -0400 # Node ID f50da59f7977c7d796850b95ac7c80a4fd92bd18 # Parent 8b22554199879f80a13ddee556bc540ddcb65a94 obsolete: use bytestr() instead of str() so the node is bytes on py3 I'm not sure this is r

[PATCH 09 of 10 py3] bundle2: work around zip() being lazy in Python 3

# HG changeset patch # User Augie Fackler # Date 1500909608 14400 # Mon Jul 24 11:20:08 2017 -0400 # Node ID fab6234e619e0e57cec4b7d0b5150bfbbede8b30 # Parent 7aac6fefd0a1a7357fb4f04b92e50131768b3f6b bundle2: work around zip() being lazy in Python 3 diff --git a/mercurial/bundle2.py b/mercu

[PATCH 01 of 10 py3] obsolete: reuse _fm1metapair for computing _fm1metapairsize

# HG changeset patch # User Augie Fackler # Date 1500906083 14400 # Mon Jul 24 10:21:23 2017 -0400 # Node ID 87ee5c3b3271ded54fe4462aa43a9d1520b8a10b # Parent 658524d45af0dbb627b25d795ed84227a20fd634 obsolete: reuse _fm1metapair for computing _fm1metapairsize It's evaluated at import time,

[PATCH 04 of 10 py3] bundle2: correct %s to %d since part ids are integers

# HG changeset patch # User Augie Fackler # Date 1500909392 14400 # Mon Jul 24 11:16:32 2017 -0400 # Node ID 73208fb1aea975f0d50168860d5bd691cbbad7e7 # Parent f50da59f7977c7d796850b95ac7c80a4fd92bd18 bundle2: correct %s to %d since part ids are integers Fixes some Python 3 regressions. dif

[PATCH 05 of 10 py3] changegroup: wrap some ** expansions in strkwargs

# HG changeset patch # User Augie Fackler # Date 1500909413 14400 # Mon Jul 24 11:16:53 2017 -0400 # Node ID 7d68e38eb849015f034a0cbd66990777e635e8f6 # Parent 73208fb1aea975f0d50168860d5bd691cbbad7e7 changegroup: wrap some ** expansions in strkwargs diff --git a/mercurial/changegroup.py b/m

Re: [PATCH STABLE] README: make paragraphs before example code end with "::" for reST syntax

On Mon, Jul 31, 2017 at 11:14:45PM +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1501505273 -32400 > # Mon Jul 31 21:47:53 2017 +0900 > # Branch stable > # Node ID fe33ab21105ba2476131c7b078d905a1f2f7efcf > # Parent 92f7dcf9a40b056573be89f611e1f

D204: commit: don't let failed commit with --addremove update dirstate (issue5645)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5ac845ca059a: commit: don't let failed commit with --addremove update dirstate (issue5645) (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org

D203: tests: demonstrate that failed "hg ci -A" updates dirstate (issue5645)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd84da82764e3: tests: demonstrate that failed "hg ci -A" updates dirstate (issue5645) (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D203?

D202: tests: fix test-flagprocessor.t flakiness

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc6146dd10072: tests: fix test-flagprocessor.t flakiness (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D202?vs=475&id=480 REVISION DETAI

D201: tests: clarify that duplicate flag processors is not an error

This revision was automatically updated to reflect the committed changes. Closed by commit rHG41081364addb: tests: clarify that duplicate flag processors is not an error (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D201?vs=469&id

D202: tests: fix test-flagprocessor.t flakiness

durin42 accepted this revision. durin42 added a comment. queued 201, 202 for stable REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D202 To: martinvonz, #hg-reviewers, dsp, akushner, durin42 Cc: durin42, dsp, mercurial-devel ___

D202: tests: fix test-flagprocessor.t flakiness

martinvonz updated this revision to Diff 475. martinvonz edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D202?vs=470&id=475 REVISION DETAIL https://phab.mercurial-scm.org/D202 AFFECTED FILES tests/test-flagprocessor.

Re: [PATCH 3 of 3 STABLE] tests: avoid unexpected result at invocation of *.py file on Windows

On Tue, Aug 01, 2017 at 08:52:22PM +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1501518452 -32400 > # Tue Aug 01 01:27:32 2017 +0900 > # Branch stable > # Node ID d64e152fedf9b5e30423d9684be204aa2fa1d792 > # Parent e5dac85fed4b0ebf699cc55374356

D202: tests: fix test-flagprocessor.t flakiness

dsp requested changes to this revision. dsp added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > test-flagprocessor.t:168 > + *** failed to set up extension duplicate: cannot register multiple > processors on flag '0x8'. > +File "/usr/local/google/home/mar

4.3 freeze over, release delayed

Howdy folks, We've got an upcoming security fix that needs to be coordinated with other packages, so we're not releasing 4.3 today. We *are*, however, unfreezing and you're welcome to send patches for default (which will become 4.4) even as we're waiting for the all-clear to release 4.3. Thank

Re: Using releasenotes extension for 4.4 cycle

On Tue, Jul 25, 2017 at 7:00 AM, Augie Fackler wrote: > On Mon, Jul 24, 2017 at 01:37:19PM -0500, Kevin Bullock wrote: > > > On Jul 24, 2017, at 10:41, Yuya Nishihara wrote: > > > > > > On Sun, 23 Jul 2017 11:39:21 -0700, Gregory Szorc wrote: > > >> Rishabh has been doing great work on the relea

[Bug 5647] New: mbed project import from mbed online compliler

https://bz.mercurial-scm.org/show_bug.cgi?id=5647 Bug ID: 5647 Summary: mbed project import from mbed online compliler Product: Mercurial Version: unspecified Hardware: PC OS: Windows Status: UNCONFIRMED S

[PATCH 1 of 3 STABLE] tests: make pdiff return appropriate exit code at comparison of files

# HG changeset patch # User FUJIWARA Katsunori # Date 1501474219 -32400 # Mon Jul 31 13:10:19 2017 +0900 # Branch stable # Node ID 3277d2061d402e57a282e1568f8e3bec189d # Parent 92f7dcf9a40b056573be89f611e1f093521696d7 # Available At https://bitbucket.org/foozy/mercurial-wip #

[PATCH 3 of 3 STABLE] tests: avoid unexpected result at invocation of *.py file on Windows

# HG changeset patch # User FUJIWARA Katsunori # Date 1501518452 -32400 # Tue Aug 01 01:27:32 2017 +0900 # Branch stable # Node ID d64e152fedf9b5e30423d9684be204aa2fa1d792 # Parent e5dac85fed4b0ebf699cc55374356a4020a7a891 # Available At https://bitbucket.org/foozy/mercurial-wip #

[PATCH 2 of 3 STABLE] tests: use pdiff instead of diff for portability

# HG changeset patch # User FUJIWARA Katsunori # Date 1501474594 -32400 # Mon Jul 31 13:16:34 2017 +0900 # Branch stable # Node ID e5dac85fed4b0ebf699cc55374356a4020a7a891 # Parent 3277d2061d402e57a282e1568f8e3bec189d # Available At https://bitbucket.org/foozy/mercurial-wip #

[PATCH 2 of 2 v7] releasenotes: add similarity check function to compare incoming notes

# HG changeset patch # User Rishabh Madan # Date 1501585562 -19800 # Tue Aug 01 16:36:02 2017 +0530 # Node ID be3b6b414d443412d5df53ddbf3e80192b6311cc # Parent 1d79b04c402f3f431ca052b677b1021ddd93a10e releasenotes: add similarity check function to compare incoming notes It is possible that

[PATCH 1 of 2 v7] releasenotes: add import check for fuzzywuzzy

# HG changeset patch # User Rishabh Madan # Date 1501317386 -19800 # Sat Jul 29 14:06:26 2017 +0530 # Node ID 1d79b04c402f3f431ca052b677b1021ddd93a10e # Parent 9a944e908ecf9ac3aabf30a24406513370eeebe7 releasenotes: add import check for fuzzywuzzy This patch adds the has_fuzzywuzzy for impor