Patchwork [2,of,2,V3] record_curses: fix ui bug for newly added file

login
register
mail settings
Submitter Laurent Charignon
Date March 26, 2015, 8:30 p.m.
Message ID <ac6e0dff43e6a69a148e.1427401854@dev919.prn2.facebook.com>
Download mbox | patch
Permalink /patch/8305/
State Superseded
Commit efa094701a05d58d505c3b0c3b3c73dba4e51e97
Headers show

Comments

Laurent Charignon - March 26, 2015, 8:30 p.m.
# HG changeset patch
# User Laurent Charignon <lcharignon@fb.com>
# Date 1427326374 25200
#      Wed Mar 25 16:32:54 2015 -0700
# Node ID ac6e0dff43e6a69a148e9bbe611eb0a35c1b44bb
# Parent  d2276d7c1db113d743e15929106bfe65edb2e804
record_curses: fix ui bug for newly added file

With record's curses interface toggling and untoggling a newly added file
would lead to a confusing UI (the header was marked as partial and the hunks
as unselected)
Matt Mackall - March 26, 2015, 10:30 p.m.
On Thu, 2015-03-26 at 13:30 -0700, Laurent Charignon wrote:
> # HG changeset patch
> # User Laurent Charignon <lcharignon@fb.com>
> # Date 1427326374 25200
> #      Wed Mar 25 16:32:54 2015 -0700
> # Node ID ac6e0dff43e6a69a148e9bbe611eb0a35c1b44bb
> # Parent  d2276d7c1db113d743e15929106bfe65edb2e804
> record_curses: fix ui bug for newly added file

Queued for default, thanks.
Matt Mackall - March 27, 2015, midnight
On Thu, 2015-03-26 at 13:30 -0700, Laurent Charignon wrote:
> # HG changeset patch
> # User Laurent Charignon <lcharignon@fb.com>
> # Date 1427326374 25200
> #      Wed Mar 25 16:32:54 2015 -0700
> # Node ID ac6e0dff43e6a69a148e9bbe611eb0a35c1b44bb
> # Parent  d2276d7c1db113d743e15929106bfe65edb2e804
> record_curses: fix ui bug for newly added file
> 
> With record's curses interface toggling and untoggling a newly added file
> would lead to a confusing UI (the header was marked as partial and the hunks
> as unselected)

This patch makes test-commit-interactive.t really unhappy on two
systems, dropping for now.
Laurent Charignon - March 27, 2015, 8:33 p.m.
Hi,

What system are you referring to, how could I repro the failure?

On 3/26/15, 5:00 PM, "Matt Mackall" <mpm@selenic.com> wrote:

>On Thu, 2015-03-26 at 13:30 -0700, Laurent Charignon wrote:
>> # HG changeset patch
>> # User Laurent Charignon <lcharignon@fb.com>
>> # Date 1427326374 25200
>> #      Wed Mar 25 16:32:54 2015 -0700
>> # Node ID ac6e0dff43e6a69a148e9bbe611eb0a35c1b44bb
>> # Parent  d2276d7c1db113d743e15929106bfe65edb2e804
>> record_curses: fix ui bug for newly added file
>> 
>> With record's curses interface toggling and untoggling a newly added
>>file
>> would lead to a confusing UI (the header was marked as partial and the
>>hunks
>> as unselected)
>
>This patch makes test-commit-interactive.t really unhappy on two
>systems, dropping for now.
>
>-- 
>Mathematics is the supreme nostalgia of our time.
>
>
Matt Mackall - March 27, 2015, 8:39 p.m.
On Fri, 2015-03-27 at 20:33 +0000, Laurent Charignon wrote:
> Hi,
> 
> What system are you referring to, how could I repro the failure?

I ran it on my Debian laptop (Py2.7) and on a large Centos 6 box of the
type you should have handy (Py2.6).

Patch

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -822,7 +822,7 @@ 
     diff_re = re.compile('diff -r .* (.*)$')
     allhunks_re = re.compile('(?:index|deleted file) ')
     pretty_re = re.compile('(?:new file|deleted file) ')
-    special_re = re.compile('(?:index|new|deleted|copy|rename) ')
+    special_re = re.compile('(?:index|deleted|copy|rename) ')
 
     def __init__(self, header):
         self.header = header