comparison tests/test-revert.t @ 22136:a29574cb8552

test-revert: add case where the file is removed between "base" and "parent"

22135:37d2bd2c04f6

  >     'clean': ['base', 'base'],
  >     # modified: file content change from base to parent
  >     'modified': ['base', 'parent'],
  >     # added: file is missing from base and added in parent
  >     'added': [None, 'parent'],
  > }
  > 
  > # content of file in working copy
  > wccontent = {
  >     # clean: wc content is the same as parent

  $ python gen-revert-cases.py filelist
  added_clean
  clean_clean
  modified_clean

Script to make a simple text version of the content
---------------------------------------------------

  $ cat << EOF >> dircontent.py

  $ python ../gen-revert-cases.py base
  $ hg addremove --similarity 0
  adding clean_clean
  adding modified_clean
  $ hg status
  A clean_clean
  A modified_clean
  $ hg commit -m 'base'

(create a simple text version of the content)

  $ python ../dircontent.py > ../content-base.txt
  $ cat ../content-base.txt
  base   clean_clean
  base   modified_clean

Create parent changeset

  $ python ../gen-revert-cases.py parent
  $ hg addremove --similarity 0
  adding added_clean
  $ hg status
  M modified_clean
  A added_clean
  $ hg commit -m 'parent'

(create a simple text version of the content)

  $ python ../dircontent.py > ../content-parent.txt

  $ hg status

  $ hg status --rev 'desc("base")'
  M modified_clean
  A added_clean

(create a simple text version of the content)

  $ python ../dircontent.py > ../content-wc.txt
  $ cat ../content-wc.txt

check revert output

  $ hg revert --all --rev 'desc(base)'
  removing added_clean
  reverting modified_clean

Compare resulting directory with revert target.

The diff is filtered to include change only. The only difference should be
additional `.orig` backup file when applicable.

  no changes needed to clean_clean
  
  ### revert for: modified_clean
  no changes needed to modified_clean
  

check resulting directory againt the --all run
(There should be no difference)

  $ python ../dircontent.py > ../content-parent-explicit.txt

  
  ### revert for: clean_clean
  
  ### revert for: modified_clean
  

check resulting directory againt the --all run
(There should be no difference)

  $ python ../dircontent.py > ../content-base-explicit.txt

22136:a29574cb8552

  >     'clean': ['base', 'base'],
  >     # modified: file content change from base to parent
  >     'modified': ['base', 'parent'],
  >     # added: file is missing from base and added in parent
  >     'added': [None, 'parent'],
  >     # removed: file exist in base but is removed from parent
  >     'removed': ['base', None],
  > }
  > 
  > # content of file in working copy
  > wccontent = {
  >     # clean: wc content is the same as parent

  $ python gen-revert-cases.py filelist
  added_clean
  clean_clean
  modified_clean
  removed_clean

Script to make a simple text version of the content
---------------------------------------------------

  $ cat << EOF >> dircontent.py

  $ python ../gen-revert-cases.py base
  $ hg addremove --similarity 0
  adding clean_clean
  adding modified_clean
  adding removed_clean
  $ hg status
  A clean_clean
  A modified_clean
  A removed_clean
  $ hg commit -m 'base'

(create a simple text version of the content)

  $ python ../dircontent.py > ../content-base.txt
  $ cat ../content-base.txt
  base   clean_clean
  base   modified_clean
  base   removed_clean

Create parent changeset

  $ python ../gen-revert-cases.py parent
  $ hg addremove --similarity 0
  adding added_clean
  removing removed_clean
  $ hg status
  M modified_clean
  A added_clean
  R removed_clean
  $ hg commit -m 'parent'

(create a simple text version of the content)

  $ python ../dircontent.py > ../content-parent.txt

  $ hg status

  $ hg status --rev 'desc("base")'
  M modified_clean
  A added_clean
  R removed_clean

(create a simple text version of the content)

  $ python ../dircontent.py > ../content-wc.txt
  $ cat ../content-wc.txt

check revert output

  $ hg revert --all --rev 'desc(base)'
  removing added_clean
  reverting modified_clean
  adding removed_clean

Compare resulting directory with revert target.

The diff is filtered to include change only. The only difference should be
additional `.orig` backup file when applicable.

  no changes needed to clean_clean
  
  ### revert for: modified_clean
  no changes needed to modified_clean
  
  ### revert for: removed_clean
  removed_clean: no such file in rev * (glob)
  

check resulting directory againt the --all run
(There should be no difference)

  $ python ../dircontent.py > ../content-parent-explicit.txt

  
  ### revert for: clean_clean
  
  ### revert for: modified_clean
  
  ### revert for: removed_clean
  

check resulting directory againt the --all run
(There should be no difference)

  $ python ../dircontent.py > ../content-base-explicit.txt