[PATCH 3 of 3 sparse-ext v3] sparse: treat paths as cwd-relative

# HG changeset patch # User Kostia Balytskyi # Date 1501715099 25200 # Wed Aug 02 16:04:59 2017 -0700 # Node ID 871dbf4ff5dd097e3960aed0d6b67fe401552d6a # Parent c0136292871d85675ccb9f386f4ae1913da4eb53 sparse: treat paths as cwd-relative This commit makes it so sparse

[PATCH 1 of 3 sparse-ext v3] sparse: properly error out when absolute paths are used

# HG changeset patch # User Kostia Balytskyi # Date 1501711521 25200 # Wed Aug 02 15:05:21 2017 -0700 # Node ID d24d6711aa2a5397d52f46ccffa64c2a638c088b # Parent 609606d217659e0a6c1cf6f907b6512be5340e57 sparse: properly error out when absolute paths are used Current logic

[PATCH 2 of 3 sparse-ext v3] match: expose some data and functionality to other modules

# HG changeset patch # User Kostia Balytskyi # Date 1501714137 25200 # Wed Aug 02 15:48:57 2017 -0700 # Node ID c0136292871d85675ccb9f386f4ae1913da4eb53 # Parent d24d6711aa2a5397d52f46ccffa64c2a638c088b match: expose some data and functionality to other modules This patch

D218: phabricator: add --confirm option to phabsend command

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds a --confirm flag similar to the confirm flag of `hg email` using which one can confirm the changesets before they get emailed. The confirm flag will

D210: pushvars: move fb extension pushvars to core

pulkit updated this revision to Diff 514. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D210?vs=512=514 REVISION DETAIL https://phab.mercurial-scm.org/D210 AFFECTED FILES mercurial/bundle2.py mercurial/commands.py mercurial/exchange.py

D210: pushvars: move fb extension pushvars to core

quark added inline comments. INLINE COMMENTS > quark wrote in commands.py:4012 > To better fit the rst format, it might be: > > .. container:: verbose > > The --pushvars option sends strings to the server that become environment > variables prepended with HG_USERVAR_. For

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

martinvonz updated this revision to Diff 506. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D211?vs=494=506 REVISION DETAIL https://phab.mercurial-scm.org/D211 AFFECTED FILES tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

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

martinvonz added inline comments. INLINE COMMENTS > quark wrote in test-rebase-obsolete.t:960 > `s/parent ancestor/parent being ancestor/g` ? Hmm, that didn't read very well (my version of it). I rephrased it slightly differently. REPOSITORY rHG Mercurial REVISION DETAIL

D218: phabricator: add --confirm option to phabsend command

pulkit updated this revision to Diff 515. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D218?vs=513=515 REVISION DETAIL https://phab.mercurial-scm.org/D218 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py

[Bug 5648] New: Phase not preserved as part of streaming clone

https://bz.mercurial-scm.org/show_bug.cgi?id=5648 Bug ID: 5648 Summary: Phase not preserved as part of streaming clone Product: Mercurial Version: default branch Hardware: All OS: All Status: UNCONFIRMED

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

quark accepted this revision. quark added a comment. Thanks for this case too! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D212 To: martinvonz, #hg-reviewers, quark Cc: quark, mercurial-devel ___ Mercurial-devel

D210: pushvars: move fb extension pushvars to core

pulkit updated this revision to Diff 512. pulkit edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D210?vs=493=512 REVISION DETAIL https://phab.mercurial-scm.org/D210 AFFECTED FILES mercurial/bundle2.py

D216: evolution: rename bumped to phase-divergent

lothiraldan added a comment. According to my understanding of `context.troubles`, a changeset could be both content-divergent and phase-divergent, it should be easy to add a test for that. About phase-divergent name, I like it, it's both explicit and coherent with the other terms.

D210: pushvars: move fb extension pushvars to core

quark added inline comments. INLINE COMMENTS > commands.py:3973 > ('', 'new-branch', False, _('allow pushing a new branch')), > +('', 'pushvars', [], _('variables that can be sent to server')), > ] + remoteopts, Maybe add `(ADVANCED)` so it gets hidden in `--help` without

D210: pushvars: move fb extension pushvars to core

akushner added inline comments. INLINE COMMENTS > commands.py:4012 > +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 > +the following to your configuration file: The

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

quark accepted this revision. quark added a comment. Looks great! Thanks for finding and documenting these tricky cases! There are a few places that might miss some English words. Those could probably be fixed in flight. INLINE COMMENTS > test-rebase-obsolete.t:960 > + > +Rebase merge

D214: evolution: rename unstable to orphan

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rename unstable to orphan in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword and

D215: evolution: rename divergent to content-divergent

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rename divergent to content-divergent in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword

D216: evolution: rename bumped to phase-divergent

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rename bumped to phase-divergent in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword and

D213: evolution: rename trouble(s) to instability

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rename trouble(s) to instability in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword and

D219: morestatus: move fb extension to core as '--repo-state' option to status

martinvonz added a comment. In https://phab.mercurial-scm.org/D219#3558, @pulkit wrote: > @durham and I thought on the flag name and had '--more' and '--repo-state' in our mind. Since '--repo-state' is more explicit, I went with that. Need suggestions for a better flag name. :)

D219: morestatus: move fb extension to core as '--repo-state' option to status

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY morestatus extension in fbext use to show more context about the state of the repo like the repository is in a unfinished merge state, or a rebase is going on,

D219: morestatus: move fb extension to core as '--repo-state' option to status

martinvonz added a comment. In https://phab.mercurial-scm.org/D219#3562, @akushner wrote: > So what does '--verbose' do for status currently? Didn't seem to do anything. Can this output be for verbose? Good question. From

D219: morestatus: move fb extension to core as '--repo-state' option to status

pulkit added a subscriber: durham. pulkit added a comment. @durham and I thought on the flag name and had '--more' and '--repo-state' in our mind. Since '--repo-state' is more explicit, I went with that. Need suggestions for a better flag name. :) REPOSITORY rHG Mercurial REVISION DETAIL

D219: morestatus: move fb extension to core as '--repo-state' option to status

akushner added a comment. So what does '--verbose' do for status currently? Didn't seem to do anything. Can this output be for verbose? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D219 To: pulkit, #hg-reviewers Cc: akushner, martinvonz, durham,

[PATCH STABLE] ui: enable pager always for explicit --pager=on (issue5580)

# HG changeset patch # User FUJIWARA Katsunori # Date 1501581172 -32400 # Tue Aug 01 18:52:52 2017 +0900 # Branch stable # Node ID e9883ae6e2d70b0f78ec8c8953b47130ecba3f07 # Parent 76b171209151fe41dbf8dbfec473cc533f3b40ca # Available At

[PATCH STABLE] i18n: use actual filename, in which function is defined, for hg.pot

# HG changeset patch # User FUJIWARA Katsunori # Date 1501599731 -32400 # Wed Aug 02 00:02:11 2017 +0900 # Branch stable # Node ID b6d0bcd19b4dffb2360f909f459c27104ad16565 # Parent 76b171209151fe41dbf8dbfec473cc533f3b40ca # Available At

Re: [PATCH STABLE] i18n: use actual filename, in which function is defined, for hg.pot

On Wed, Aug 02, 2017 at 10:36:45PM +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1501599731 -32400 > # Wed Aug 02 00:02:11 2017 +0900 > # Branch stable > # Node ID b6d0bcd19b4dffb2360f909f459c27104ad16565 > # Parent

Re: [PATCH 5 of 5 STABLE pypy] util: fix sortdict.update() to call __setitem__() on PyPy (issue5639)

On Wed, Aug 02, 2017 at 11:22:25PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1501681879 -32400 > # Wed Aug 02 22:51:19 2017 +0900 > # Branch stable > # Node ID b05cb26a301c4495f518f7180a69389b839a1fed > # Parent

D216: evolution: rename bumped to phase-divergent

durin42 added a comment. I'd like to hear others chime in on this and https://phab.mercurial-scm.org/D215. Do we /know/ that something that's phase-divergent is only divergent by phase? or could the content also be different? Is it possible to have a case in the tests that's both

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf3407d56a6e8: bundle2: add the capability to store hookargs on bundle operation object (authored by pulkit). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

On Tue, 01 Aug 2017 16:34:35 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1500909551 14400 > # Mon Jul 24 11:19:11 2017 -0400 > # Node ID 89d7a53b500a213396ab3c8e043a31dc5538ccaf > # Parent 4c1f4e109bf90a8352a25a6b45a80fabcac6306b >

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

On Tue, 01 Aug 2017 16:34:30 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1500906158 14400 > # Mon Jul 24 10:22:38 2017 -0400 > # Node ID 8b22554199879f80a13ddee556bc540ddcb65a94 > # Parent 87ee5c3b3271ded54fe4462aa43a9d1520b8a10b >

D210: pushvars: move fb extension pushvars to core

durin42 added a comment. I've often wanted a way to have extra arguments to push commands (etc), but I'm not sure that just exporting all environment variables is exactly the interface I want. Could we accomplish something similar by having an --extra-args= flag that delivers a part with an

mercurial@33618: 4 new changesets (4 on stable)

4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c6146dd10072 changeset: 33615:c6146dd10072 branch: stable user:Martin von Zweigbergk date:Mon Jul 31 16:32:01 2017 -0700 summary: tests: fix

D214: evolution: rename unstable to orphan

This revision was automatically updated to reflect the committed changes. Closed by commit rHG03039ff3082b: evolution: rename unstable to orphan (authored by lothiraldan). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D214?vs=497=505 REVISION DETAIL

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5fc4ddfbe626: bundle2: load hookargs from bundleoperation into transaction when started one (authored by pulkit). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D213: evolution: rename trouble(s) to instability

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6f4bc9688ca9: evolution: rename trouble(s) to instability (authored by lothiraldan). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D213?vs=496=504 REVISION

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

On Tue, 01 Aug 2017 16:34:31 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1500907059 14400 > # Mon Jul 24 10:37:39 2017 -0400 > # Node ID f50da59f7977c7d796850b95ac7c80a4fd92bd18 > # Parent 8b22554199879f80a13ddee556bc540ddcb65a94 >

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

On Tue, 01 Aug 2017 16:34:32 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1500909392 14400 > # Mon Jul 24 11:16:32 2017 -0400 > # Node ID 73208fb1aea975f0d50168860d5bd691cbbad7e7 > # Parent f50da59f7977c7d796850b95ac7c80a4fd92bd18 >

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

> On Aug 2, 2017, at 11:11, Yuya Nishihara wrote: > > On Tue, 01 Aug 2017 16:34:31 -0400, Augie Fackler wrote: >> # HG changeset patch >> # User Augie Fackler >> # Date 1500907059 14400 >> # Mon Jul 24 10:37:39 2017 -0400 >> # Node ID

mercurial@33614: 4 new changesets (4 on stable)

4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/a2b55ee62803 changeset: 33611:a2b55ee62803 branch: stable parent: 33609:a72b2db1a6a9 user:FUJIWARA Katsunori date:Mon Jul 31 13:10:19 2017 +0900 summary:

[PATCH 3 of 5 STABLE pypy] tests: clear __pycache__ for PyPy compatibility (issue5638) (issue5642)

# HG changeset patch # User Yuya Nishihara # Date 1501679042 -32400 # Wed Aug 02 22:04:02 2017 +0900 # Branch stable # Node ID 0c342a3b5857d30c71d31e1933bcd2e4ea84be8f # Parent 50ed00ce37627070546e40305460ec378bb121fb tests: clear __pycache__ for PyPy compatibility

[PATCH 5 of 5 STABLE pypy] util: fix sortdict.update() to call __setitem__() on PyPy (issue5639)

# HG changeset patch # User Yuya Nishihara # Date 1501681879 -32400 # Wed Aug 02 22:51:19 2017 +0900 # Branch stable # Node ID b05cb26a301c4495f518f7180a69389b839a1fed # Parent 2c94746eb01204a1c703d555f21ebec031ed74b7 util: fix sortdict.update() to call __setitem__() on PyPy

[PATCH 2 of 5 STABLE pypy] test-extension: glob module name in error message for PyPy

# HG changeset patch # User Yuya Nishihara # Date 1501679205 -32400 # Wed Aug 02 22:06:45 2017 +0900 # Branch stable # Node ID 50ed00ce37627070546e40305460ec378bb121fb # Parent 4291548fe6ee8bf5249d73c1eefbb145818e1318 test-extension: glob module name in error message for PyPy

[PATCH 4 of 5 STABLE pypy] test-revlog-raw: close file handles explicitly (issue5644)

# HG changeset patch # User Yuya Nishihara # Date 1501682318 -32400 # Wed Aug 02 22:58:38 2017 +0900 # Branch stable # Node ID 2c94746eb01204a1c703d555f21ebec031ed74b7 # Parent 0c342a3b5857d30c71d31e1933bcd2e4ea84be8f test-revlog-raw: close file handles explicitly (issue5644)

[PATCH 1 of 5 STABLE pypy] rebase: sort collapsed revisions in commit message (issue5643)

# HG changeset patch # User Yuya Nishihara # Date 1501678342 -32400 # Wed Aug 02 21:52:22 2017 +0900 # Branch stable # Node ID 4291548fe6ee8bf5249d73c1eefbb145818e1318 # Parent 76b171209151fe41dbf8dbfec473cc533f3b40ca rebase: sort collapsed revisions in commit message

[PATCH hglib] summary: parse commit line less strictly (issue5637)

# HG changeset patch # User Yuya Nishihara # Date 1501684996 -32400 # Wed Aug 02 23:43:16 2017 +0900 # Node ID 5f3e6f1a7e68298e21f893683c5b5d3f634c2c30 # Parent 8e959ad6a25c9fe6ab490e1a4cbd5f7445d9bcb1 summary: parse commit line less strictly (issue5637) diff --git

D210: pushvars: move fb extension pushvars to core

durin42 added a comment. In https://phab.mercurial-scm.org/D210#3506, @akushner wrote: > @durin42 - This isn't exporting all the shell variables it works almost exactly like you are suggesting > > > Could we accomplish something similar by having an --extra-args= flag that

D210: pushvars: move fb extension pushvars to core

pulkit added a comment. >> Notice that the HG_USERVAR is prepended to the "BYPASS_LARGE_FILE_CHECK" var? The user can't override normal shell variables with this. > > Sure, but environment variables are still global state, so its got nonzero concurrency concerns. I'm also

D210: pushvars: move fb extension pushvars to core

akushner added a comment. @durin42 - This isn't exporting all the shell variables it works almost exactly like you are suggesting > Could we accomplish something similar by having an --extra-args= flag that delivers a part with an arbitrary payload that can then be used (or not) by

mercurial@33619: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/609606d21765 changeset: 33619:609606d21765 bookmark:@ tag: tip parent: 33610:658524d45af0 user:Durham Goode date:Thu Jul 20 01:30:41 2017 -0700 summary: rebase: use one

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

On Wed, 2 Aug 2017 11:37:45 -0400, Augie Fackler wrote: > > > On Aug 2, 2017, at 11:11, Yuya Nishihara wrote: > > > > On Tue, 01 Aug 2017 16:34:31 -0400, Augie Fackler wrote: > >> # HG changeset patch > >> # User Augie Fackler > >> # Date 1500907059 14400 > >>

[PATCH] py3: use bytes IO to write sample hgrc

# HG changeset patch # User Yuya Nishihara # Date 1501688702 -32400 # Thu Aug 03 00:45:02 2017 +0900 # Node ID 52bbc0a0dc7a3e946ed16bf547929252e95603d4 # Parent 6a620fd39e4cac88e1a46f18aa7b852639e3b729 py3: use bytes IO to write sample hgrc Unicode sucks. Stop using Text IO