graphlog: fix log -G option types when translating to revset

For instance, --keyword is a multiple value option while it was processed as a
single value option.

hgext/graphlog.py

@@ -236,12 +236,12 b' def revset(pats, opts):'
         revop = opt2revset.get(op, op)
         if op in ('follow', 'only_merges', 'no_merges'):
             revset.append('%s()' % revop)
-        elif op in ("date", "keyword", "remove", "user", "branch",
-                    "only_branch", "prune"):
-            revset.append('%s(%s)' % (op, val))
-        elif op in ('include', 'exclude'):
+        elif op in ('date', 'remove'):
+            revset.append('%s(%s)' % (revop, val))
+        elif op in ('include', 'exclude', 'user', 'branch', 'keyword',
+                    'prune', 'only_branch'):
             for f in val:
-                revset.append('%s(%r)' % (op, f))
+                revset.append('%s(%r)' % (revop, f))
         elif op == 'rev':
             revset.extend(val)
 

tests/test-glog.t

@@ -1393,3 +1393,16 b' Do not crash or produce strange graphs i'
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
+
+Test log -G options
+
+  $ hg log -G -u 'something nice'
+  $ hg log -G -b 'something nice'
+  abort: unknown revision 'something nice'!
+  [255]
+  $ hg log -G -k 'something nice'
+  $ hg log -G --only-branch 'something nice'
+  abort: unknown revision 'something nice'!
+  [255]
+  $ hg log -G --include 'some file' --exclude 'another file'
+