# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1121859785 28800
# Node ID 1e84f1014f332f7118efc7b18c55d2fa9e12a5d2
# Parent  3433b228bbb32c57cbf25e9f1bec3d66ea00cf20
Update tests to reflect walk changes.


diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -118,7 +118,7 @@ def revrange(ui, repo, revs, revlog=None
 
 def make_file(repo, r, pat, node=None,
               total=None, seqno=None, revwidth=None, mode='wb'):
-    if pat == '-':
+    if not pat or pat == '-':
         if 'w' in mode: return sys.stdout
         else: return sys.stdin
     node_expander = {
@@ -1098,7 +1098,9 @@ table = {
     "addremove": (addremove, [], "hg addremove [FILES]"),
     "^annotate":
         (annotate,
-         [('r', 'rev', '', 'revision'),
+         [('I', 'include', [], 'include path in search'),
+          ('X', 'exclude', [], 'exclude path from search'),
+          ('r', 'rev', '', 'revision'),
           ('u', 'user', None, 'show user'),
           ('n', 'number', None, 'show revision number'),
           ('c', 'changeset', None, 'show changeset')],
diff --git a/tests/test-help.out b/tests/test-help.out
--- a/tests/test-help.out
+++ b/tests/test-help.out
@@ -33,15 +33,29 @@ basic hg commands (use "hg help -v" for 
  status     show changed files in the working directory
  update     update or merge working directory
 hg add: option -h not recognized
-hg add FILE...
+hg add [OPTIONS] [FILES]
+
+ -I --include 
+   include path in search
+ -X --exclude 
+   exclude path from search
 
 add the specified files on the next commit
 hg add: option --skjdfks not recognized
-hg add FILE...
+hg add [OPTIONS] [FILES]
+
+ -I --include 
+   include path in search
+ -X --exclude 
+   exclude path from search
 
 add the specified files on the next commit
 hg diff [-r REV1 [-r REV2]] [FILE]...
 
+ -I --include 
+   include path in search
+ -X --exclude 
+   exclude path from search
  -r --rev 
    revision