These refactorings came up when studying issue2447 because they use the same
set of match options (matchUpToOne). But they are not directly related to
the problem.

3 patches for repository http://darcs.net/screened:

patch 12cd5ca4f4f4c51199d963dd1177e08625e7a637
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Fri Jun 19 23:45:17 CEST 2015
  * removed firstMatch handling from dist command
  
  The dist command accepts only non-range matching options, so this extra case
  distinction is just dead code.

patch 3256da060baebf834b59cb9502be9cdb159f5b43
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Fri Jun 19 23:53:20 CEST 2015
  * refactored annotate command implementation
  
  This patch is supposed to be semantically transparent. It mainly consists of
  reducing the number of times the flag list is parsed to extract the
  matchFlags from three to one.

patch 28dfabd1b74b1f2c64859c509da9fd8a0c2ba80b
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Sat Jun 20 00:27:23 CEST 2015
  * refactored 'show files' command
  
  - avoid multiple parses of the flag list to extract the matchFlags
  - renaming of identifiers, in particular the word "revision" has been
    eliminated because it does not fit the Darcs patch model and leads
    to wrong assumptions.
  - avoid expanding a tree more than once and explain the tricky bit

Attachments

• patch-preview.txt
• removed-firstmatch-handling-from-dist-command.dpatch
• unnamed

Looks fine to me. I have to admit I'm still a bit confused about matching 
options in general, but the statement that the firstMatch handling in 
dist is dead code seems reasonable.