Re: [PATCH 1 of 8 "] util: extract compression code in `mercurial.utils.compression`

2019-04-01 Thread Josef 'Jeff' Sipek
On Sun, Mar 31, 2019 at 17:36:17 +0200, Pierre-Yves David wrote: ... > diff --git a/mercurial/util.py b/mercurial/utils/compression.py > copy from mercurial/util.py > copy to mercurial/utils/compression.py > --- a/mercurial/util.py > +++ b/mercurial/utils/compression.py > @@ -1,1555 +1,37 @@ > -# u

D6178: crecord: new keys g & G to navigate to the top and bottom hunks respectively

2019-04-01 Thread arun (Arun Chandrasekaran)
arun created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch introduces two new keys 'g' and 'G' that helps to navigate to the top and bottom of the hunks respectively. This is inline with the shortcuts used in man

[PATCH V4] uncommit: abort if an explicitly given file cannot be uncommitted

2019-04-01 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1553910795 14400 # Fri Mar 29 21:53:15 2019 -0400 # Node ID 8ced6cadf535d8f7502f61db01ddcb8b2629a17a # Parent eec20025ada33889233e553c5825aac36b708f6c uncommit: abort if an explicitly given file cannot be uncommitted I've gotten burned severa

Re: [PATCH V3] uncommit: abort if an explicitly given file cannot be uncommitted

2019-04-01 Thread Matt Harbison
On Mon, 01 Apr 2019 18:59:10 -0400, Yuya Nishihara wrote: On Sun, 31 Mar 2019 22:46:25 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1553910795 14400 # Fri Mar 29 21:53:15 2019 -0400 # Node ID 9802203e693d83f4092512be6d3e397926b36f8e # Parent eec20025ada33

D6177: histedit: narrow the scope of discarded ui output

2019-04-01 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio updated this revision to Diff 14614. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6177?vs=14613&id=14614 REVISION DETAIL https://phab.mercurial-scm.org/D6177 AFFECTED FILES hgext/histedit.py tests/test-histedit-arguments.t tests/test-hi

D6177: histedit: narrow the scope of discarded ui output

2019-04-01 Thread rdamazio (Rodrigo Damazio Bovendorp)
rdamazio created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In https://phab.mercurial-scm.org/rHG34165875fa5df813bec3a0cd348932b304d44efb, a lot of the output from histedit was excluded.

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-01 Thread yuja (Yuya Nishihara)
yuja added a comment. > I saw some patches[0][1][2] trying to fix this issue. It seems like it's difficult to preserve the second parent. > > [0]: http://mercurial.808500.n3.nabble.com/PATCH-shelve-adds-restoring-original-parents-after-unshelve-issue5123-tc4035657.html#none > [

Re: D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-01 Thread Yuya Nishihara
> I saw some patches[0][1][2] trying to fix this issue. It seems like it's > difficult to preserve the second parent. > > [0]: > http://mercurial.808500.n3.nabble.com/PATCH-shelve-adds-restoring-original-parents-after-unshelve-issue5123-tc4035657.html#none > [1]: > http://mercurial.8085

Re: [PATCH V3] uncommit: abort if an explicitly given file cannot be uncommitted

2019-04-01 Thread Yuya Nishihara
On Sun, 31 Mar 2019 22:46:25 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1553910795 14400 > # Fri Mar 29 21:53:15 2019 -0400 > # Node ID 9802203e693d83f4092512be6d3e397926b36f8e > # Parent eec20025ada33889233e553c5825aac36b708f6c > uncommit: abort if an

D6169: unshelve: disable unshelve during merge (issue5123)

2019-04-01 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added a comment. I saw some patches[0][1][2] trying to fix this issue. It seems like it's difficult to preserve the second parent. [0]: http://mercurial.808500.n3.nabble.com/PATCH-shelve-adds-restoring-original-parents-after-unshelve-issue5123-tc4035657.html#none [1]: