comparison tests/test-commit-interactive.t @ 47565:00ae1fb6c459

cmdutil: fix newandmodified file accounting for --interactive commits

`originalchunks` is a misleading name, because it only contains header objects, which are flattened to selected hunks by the filter function. As such, `chunks not in originalchunks` is always True and misleading, because hunk objects never compare equal to header objects. This change fixes the internal naming and removes the useless parameter from the method.

This change also fixes issue6533, by considering the filtered headers, rather than the hunks, when determining new and modified files. If a file is renamed + edited, and the edited hunks are deselected (but the file is not), the filtered chunks will contain a header for the file (because it's .special()) but but no hunks.

Differential Revision: https://phab.mercurial-scm.org/D10936

47564:57bdecf4322c

   11
  +somechange
  record this change to 'plain3'?
  (enter ? for help) [Ynesfdaq?] y
  
The #if execbit block above changes the hash here on some systems
  $ hg status -A plain3
  C plain3
  $ hg tip
  changeset:   32:* (glob)
  tag:         tip
  user:        test
  date:        Thu Jan 01 00:00:23 1970 +0000
  summary:     moving_files
  
Editing patch of newly added file

  $ hg update -C .
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat > editor.sh << '__EOF__'
  > cat "$1"  | sed "s/first/very/g"  > tt
  > mv tt  "$1"
  > __EOF__
  $ cat > newfile << '__EOF__'
  > This is the first line
  > This is the second line
  > This is the third line
  > __EOF__
  $ hg add newfile
  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-new <<EOF
  > y
  > e
  > EOF
  diff --git a/newfile b/newfile
  new file mode 100644

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ mkdir folder
  $ cd folder
  $ echo "foo" > bar
  $ hg add bar
  $ hg commit -i -d '23 0' -mnewfilesubdir  <<EOF
  > y
  > y
  > EOF
  diff --git a/folder/bar b/folder/bar
  new file mode 100644

  record this change to 'folder/bar'?
  (enter ? for help) [Ynesfdaq?] y
  
The #if execbit block above changes the hashes here on some systems
  $ hg tip -p
  changeset:   34:* (glob)
  tag:         tip
  user:        test
  date:        Thu Jan 01 00:00:23 1970 +0000
  summary:     newfilesubdir
  
  diff -r * -r * folder/bar (glob)
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/folder/bar	Thu Jan 01 00:00:23 1970 +0000
  @@ -0,0 +1,1 @@
  +foo
  
  $ cd ..

47565:00ae1fb6c459

   11
  +somechange
  record this change to 'plain3'?
  (enter ? for help) [Ynesfdaq?] y
  

Rename file but discard edits

  $ echo content > new-file
  $ hg add -q new-file
  $ hg commit -qm 'new file'
  $ hg mv new-file renamed-file
  $ echo new-content >> renamed-file
  $ hg commit -i -d '24 0' -m content-rename<<EOF
  > y
  > n
  > EOF
  diff --git a/new-file b/renamed-file
  rename from new-file
  rename to renamed-file
  1 hunks, 1 lines changed
  examine changes to 'new-file' and 'renamed-file'?
  (enter ? for help) [Ynesfdaq?] y
  
  @@ -1,1 +1,2 @@
   content
  +new-content
  record this change to 'renamed-file'?
  (enter ? for help) [Ynesfdaq?] n
  
  $ hg status
  M renamed-file
  ? editedfile.orig
  ? editedfile.rej
  ? editor.sh
  $ hg diff
  diff -r * renamed-file (glob)
  --- a/renamed-file	Thu Jan 01 00:00:24 1970 +0000
  +++ b/renamed-file	Thu Jan 01 00:00:00 1970 +0000
  @@ -1,1 +1,2 @@
   content
  +new-content

The #if execbit block above changes the hash here on some systems
  $ hg status -A plain3
  C plain3
  $ hg tip
  changeset:   34:* (glob)
  tag:         tip
  user:        test
  date:        Thu Jan 01 00:00:24 1970 +0000
  summary:     content-rename
  
Editing patch of newly added file

  $ hg update -C .
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat > editor.sh << '__EOF__'
  > cat "$1"  | sed "s/first/very/g"  > tt
  > mv tt  "$1"
  > __EOF__
  $ cat > newfile << '__EOF__'
  > This is the first line
  > This is the second line
  > This is the third line
  > __EOF__
  $ hg add newfile
  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '25 0' -medit-patch-new <<EOF
  > y
  > e
  > EOF
  diff --git a/newfile b/newfile
  new file mode 100644

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ mkdir folder
  $ cd folder
  $ echo "foo" > bar
  $ hg add bar
  $ hg commit -i -d '26 0' -mnewfilesubdir  <<EOF
  > y
  > y
  > EOF
  diff --git a/folder/bar b/folder/bar
  new file mode 100644

  record this change to 'folder/bar'?
  (enter ? for help) [Ynesfdaq?] y
  
The #if execbit block above changes the hashes here on some systems
  $ hg tip -p
  changeset:   36:* (glob)
  tag:         tip
  user:        test
  date:        Thu Jan 01 00:00:26 1970 +0000
  summary:     newfilesubdir
  
  diff -r * -r * folder/bar (glob)
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/folder/bar	Thu Jan 01 00:00:26 1970 +0000
  @@ -0,0 +1,1 @@
  +foo
  
  $ cd ..