comparison tests/test-revert.t @ 23154:690db7415e23

test-revert: reverting an addition is the same as removing

The tests for added_revert and added_untracked-revert test the same
state as added_deleted and added_removed, respectively. Drop the
duplicate tests.

See additional motivation in earlier patch.

23153:9ce22bdcd8bc

  > combination = []
  > for ctxkey, ctxvalue in ctxcontent.iteritems():
  >     for wckey in wccontent:
  >         if (ctxvalue[0] == ctxvalue[1] and 'revert' in wckey):
  >             continue
  >         filename = "%s_%s" % (ctxkey, wckey)
  >         combination.append((filename, ctxkey, wckey))
  > 
  > # make sure we have stable output
  > combination.sort()

  $ python gen-revert-cases.py filelist
  added_clean
  added_deleted
  added_removed
  added_revert
  added_untracked-clean
  added_untracked-revert
  added_untracked-wc
  added_wc
  clean_clean
  clean_deleted
  clean_removed

  $ python ../gen-revert-cases.py parent
  $ hg addremove --similarity 0
  adding added_clean
  adding added_deleted
  adding added_removed
  adding added_revert
  adding added_untracked-clean
  adding added_untracked-revert
  adding added_untracked-wc
  adding added_wc
  removing removed_clean
  removing removed_deleted
  removing removed_removed

  M modified_untracked-wc
  M modified_wc
  A added_clean
  A added_deleted
  A added_removed
  A added_revert
  A added_untracked-clean
  A added_untracked-revert
  A added_untracked-wc
  A added_wc
  R removed_clean
  R removed_deleted
  R removed_removed

  $ python ../dircontent.py > ../content-parent.txt
  $ cat ../content-parent.txt
  parent added_clean
  parent added_deleted
  parent added_removed
  parent added_revert
  parent added_untracked-clean
  parent added_untracked-revert
  parent added_untracked-wc
  parent added_wc
  base   clean_clean
  base   clean_deleted
  base   clean_removed

Setup working directory

  $ python ../gen-revert-cases.py wc
  $ hg addremove --similarity 0
  removing added_removed
  removing added_revert
  removing added_untracked-revert
  removing clean_removed
  adding missing_deleted
  adding missing_untracked-wc
  adding missing_wc
  removing modified_removed

  M modified_wc
  A missing_wc
  A removed_revert
  A removed_wc
  R added_removed
  R added_revert
  R added_untracked-clean
  R added_untracked-revert
  R added_untracked-wc
  R clean_removed
  R clean_untracked-clean
  R clean_untracked-wc
  R modified_removed

check revert output

  $ hg revert --all
  reverting added_deleted
  undeleting added_removed
  undeleting added_revert
  undeleting added_untracked-clean
  undeleting added_untracked-revert
  undeleting added_untracked-wc
  reverting added_wc
  reverting clean_deleted
  undeleting clean_removed
  undeleting clean_untracked-clean

  
  ### revert for: added_deleted
  
  ### revert for: added_removed
  
  ### revert for: added_revert
  
  ### revert for: added_untracked-clean
  
  ### revert for: added_untracked-revert
  
  ### revert for: added_untracked-wc
  
  ### revert for: added_wc
  

  ### revert for: added_deleted
  
  ### revert for: added_removed
  no changes needed to added_removed
  
  ### revert for: added_revert
  no changes needed to added_revert
  
  ### revert for: added_untracked-clean
  no changes needed to added_untracked-clean
  
  ### revert for: added_untracked-revert
  no changes needed to added_untracked-revert
  
  ### revert for: added_untracked-wc
  no changes needed to added_untracked-wc
  
  ### revert for: added_wc

23154:690db7415e23

  > combination = []
  > for ctxkey, ctxvalue in ctxcontent.iteritems():
  >     for wckey in wccontent:
  >         if (ctxvalue[0] == ctxvalue[1] and 'revert' in wckey):
  >             continue
  >         if not ctxvalue[0] and 'revert' in wckey:
  >             continue
  >         filename = "%s_%s" % (ctxkey, wckey)
  >         combination.append((filename, ctxkey, wckey))
  > 
  > # make sure we have stable output
  > combination.sort()

  $ python gen-revert-cases.py filelist
  added_clean
  added_deleted
  added_removed
  added_untracked-clean
  added_untracked-wc
  added_wc
  clean_clean
  clean_deleted
  clean_removed

  $ python ../gen-revert-cases.py parent
  $ hg addremove --similarity 0
  adding added_clean
  adding added_deleted
  adding added_removed
  adding added_untracked-clean
  adding added_untracked-wc
  adding added_wc
  removing removed_clean
  removing removed_deleted
  removing removed_removed

  M modified_untracked-wc
  M modified_wc
  A added_clean
  A added_deleted
  A added_removed
  A added_untracked-clean
  A added_untracked-wc
  A added_wc
  R removed_clean
  R removed_deleted
  R removed_removed

  $ python ../dircontent.py > ../content-parent.txt
  $ cat ../content-parent.txt
  parent added_clean
  parent added_deleted
  parent added_removed
  parent added_untracked-clean
  parent added_untracked-wc
  parent added_wc
  base   clean_clean
  base   clean_deleted
  base   clean_removed

Setup working directory

  $ python ../gen-revert-cases.py wc
  $ hg addremove --similarity 0
  removing added_removed
  removing clean_removed
  adding missing_deleted
  adding missing_untracked-wc
  adding missing_wc
  removing modified_removed

  M modified_wc
  A missing_wc
  A removed_revert
  A removed_wc
  R added_removed
  R added_untracked-clean
  R added_untracked-wc
  R clean_removed
  R clean_untracked-clean
  R clean_untracked-wc
  R modified_removed

check revert output

  $ hg revert --all
  reverting added_deleted
  undeleting added_removed
  undeleting added_untracked-clean
  undeleting added_untracked-wc
  reverting added_wc
  reverting clean_deleted
  undeleting clean_removed
  undeleting clean_untracked-clean

  
  ### revert for: added_deleted
  
  ### revert for: added_removed
  
  ### revert for: added_untracked-clean
  
  ### revert for: added_untracked-wc
  
  ### revert for: added_wc
  

  ### revert for: added_deleted
  
  ### revert for: added_removed
  no changes needed to added_removed
  
  ### revert for: added_untracked-clean
  no changes needed to added_untracked-clean
  
  ### revert for: added_untracked-wc
  no changes needed to added_untracked-wc
  
  ### revert for: added_wc