D3986: split: abort if there's an unfinished operation

martinvonz added a comment. Oh, I should have said that I agree with not queuing this patch now. We can discuss what we want to do and do it on the default branch later. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers Cc: quark

D3986: split: abort if there's an unfinished operation

martinvonz added a comment. In https://phab.mercurial-scm.org/D3986#61989, @quark wrote: > FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive. Two thoughts: 1. We had talked at Google about having the "edit" action

D3986: split: abort if there's an unfinished operation

quark added a comment. FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers Cc: quark, mercurial-devel

D3987: context: use hex nodeid in error about filtered node

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I went a little too far in my cleanup in https://phab.mercurial-scm.org/rHG9231148ea5999ecd08eecbe6ab7f5191e727937c (context: convert to hex for error message

D3986: split: abort if there's an unfinished operation

martinvonz 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/D3986 AFFECTED FILES hgext/split.py tests/test-split.t CHANGE DETAILS diff --git a/tests/test-spl

[Bug 5949] New: make fails with "Title underline too short."

https://bz.mercurial-scm.org/show_bug.cgi?id=5949 Bug ID: 5949 Summary: make fails with "Title underline too short." Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Sev

D3976: grep: add MULTIREV support to --all-files flag

sangeet259 added a subscriber: yuja. sangeet259 added a comment. @yuja can you review this one REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3976 To: sangeet259, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-d

mercurial@38753: 5 new changesets (5 on stable)

5 new changesets (5 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/0c5d131fa428 changeset: 38749:0c5d131fa428 branch: stable user:Yuya Nishihara date:Mon Jul 30 21:26:55 2018 +0900 summary: test-fileset: make con.xml in output conditionally available

Re: [PATCH STABLE follow-up] clone: process 'lookup' return as an arbitrary symbol

I'll queue with the following folded in: diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -731,6 +731,10 @@ def clone(ui, peeropts, source, dest=Non uprev = None status = None if checkout is not None: +

[Bug 5948] New: Add -r argument to hg branch

https://bz.mercurial-scm.org/show_bug.cgi?id=5948 Bug ID: 5948 Summary: Add -r argument to hg branch Product: Mercurial Version: 4.6rc0 Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: feature

[PATCH STABLE follow-up] clone: process 'lookup' return as an arbitrary symbol

# HG changeset patch # User Boris Feld # Date 1532957764 -7200 # Mon Jul 30 15:36:04 2018 +0200 # Branch stable # Node ID 85b015944582ad63927849e253ca7077924b0ec9 # Parent ae17555ef93fc95d800b46ccab865ea93f9951ca # EXP-Topic compat-hggit # Available At https://bitbucket.org/octobus/mercurial

Re: [PATCH stable] tests: use inline Python instead of sed to add trailing whitespace

On Mon, 30 Jul 2018 10:22:19 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1532960309 14400 > # Mon Jul 30 10:18:29 2018 -0400 > # Branch stable > # Node ID b31164c5af62e7f1614ced760ab05bd644d5fbec > # Parent 71d6886d27cf94dc45d0e495c3912d3c6e74794e > tes

[PATCH stable] tests: use inline Python instead of sed to add trailing whitespace

# HG changeset patch # User Augie Fackler # Date 1532960309 14400 # Mon Jul 30 10:18:29 2018 -0400 # Branch stable # Node ID b31164c5af62e7f1614ced760ab05bd644d5fbec # Parent 71d6886d27cf94dc45d0e495c3912d3c6e74794e tests: use inline Python instead of sed to add trailing whitespace The sed

[PATCH 2 of 2 STABLE] sparse-revlog: unconditionally enables general delta

# HG changeset patch # User Boris Feld # Date 1532958737 -7200 # Mon Jul 30 15:52:17 2018 +0200 # Branch stable # Node ID ea0704e5b98147dc9af5c9cfeadb8b20b5cf00b2 # Parent 7f3c63990b6160517a70b896bb9499d1daea2ded # EXP-Topic sparse-revlog # Available At https://bitbucket.org/octobus/mercuria

[PATCH 1 of 2 STABLE] sparse-revlog: also use sparse-revlog config as a general delta trigger

# HG changeset patch # User Boris Feld # Date 1532958827 -7200 # Mon Jul 30 15:53:47 2018 +0200 # Branch stable # Node ID 7f3c63990b6160517a70b896bb9499d1daea2ded # Parent ae17555ef93fc95d800b46ccab865ea93f9951ca # EXP-Topic sparse-revlog # Available At https://bitbucket.org/octobus/mercuria

Re: [PATCH stable] context: add missing b prefix

On Mon, 30 Jul 2018 09:50:43 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1532958632 14400 > # Mon Jul 30 09:50:32 2018 -0400 > # Branch stable > # Node ID 71d6886d27cf94dc45d0e495c3912d3c6e74794e > # Parent a8bfaf592033a8c10e5c8bf8d5edda90ba45c611 > con

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

4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/258d90f69076 changeset: 38745:258d90f69076 branch: stable user:Cédric Krier date:Wed Jul 25 10:05:24 2018 +0200 summary: hgweb: strip trailing '/' in apppath before appending '/static

[PATCH stable] context: add missing b prefix

# HG changeset patch # User Augie Fackler # Date 1532958632 14400 # Mon Jul 30 09:50:32 2018 -0400 # Branch stable # Node ID 71d6886d27cf94dc45d0e495c3912d3c6e74794e # Parent a8bfaf592033a8c10e5c8bf8d5edda90ba45c611 context: add missing b prefix This fixes mercurial/context.py:593: Syntax

Re: [PATCH STABLE] doctest: convert matcher root to native path

> On Jul 28, 2018, at 03:48, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1532763395 -32400 > # Sat Jul 28 16:36:35 2018 +0900 > # Branch stable > # Node ID 39885c84a7c1fa65637d281188c51de06d9c0997 > # Parent 5b3b74e4b21442777f741df60fd81e52e220a182 > d

Re: [PATCH STABLE] test-fileset: make con.xml in output conditionally available

> On Jul 30, 2018, at 08:40, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1532953615 -32400 > # Mon Jul 30 21:26:55 2018 +0900 > # Branch stable > # Node ID 074c7d10db87fd0970ef84a69b17e14d849a18d2 > # Parent 7d91a50276dfe66c6e85892934403b6e803e548f > t

Re: [PATCH 2 of 2 STABLE] test-obsmarker-template: run mkcommit in subshell to isolate envvars

> On Jul 28, 2018, at 03:03, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1532760723 -32400 > # Sat Jul 28 15:52:03 2018 +0900 > # Branch stable > # Node ID 5b3b74e4b21442777f741df60fd81e52e220a182 > # Parent 2b7ce7b55514e248a3247f135f1938090ff19045 > t

[PATCH STABLE] test-fileset: make con.xml in output conditionally available

# HG changeset patch # User Yuya Nishihara # Date 1532953615 -32400 # Mon Jul 30 21:26:55 2018 +0900 # Branch stable # Node ID 074c7d10db87fd0970ef84a69b17e14d849a18d2 # Parent 7d91a50276dfe66c6e85892934403b6e803e548f test-fileset: make con.xml in output conditionally available diff --git a

D3985: context: safegaurd against 'lx' being passed as file flag in manifest

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Subversion can have a file as executable link. When using hgsubversion, we will have both islink and isexec True. This will lead to _flags being set to `lx`. How

Re: [PATCH 3 of 3 STABLE] clone: process 'lookup' return as an arbitrary symbol

On 28/07/2018 02:11, Martin von Zweigbergk via Mercurial-devel wrote: On Fri, Jul 27, 2018 at 3:26 PM Boris FELD > wrote: On 27/07/2018 16:00, Yuya Nishihara wrote: > On Fri, 27 Jul 2018 09:30:26 +0200, Boris FELD wrote: >> On 26/07/2018 17:24, Mar