Mathieu Pillard avatar Mathieu Pillard committed cd535b5 Draft

Fix merge issues and trailing whitespace

Comments (0)

Files changed (1)

     displayer = cmdutil.show_changeset(ui, repo, opts, False)
     for m in missing:
         n = source_nodes[m]
-        
-        if user != '' and user not in n.user():
+
+        if opts['user'] != '' and opts['user'] not in n.user():
             continue
-        if description != '' and description not in n.description():
+        if opts['description'] != '' and opts['description'] not in n.description():
             continue
         if no_merges and (len(n.parents()) > 1):
             continue
              [('t', 'transplants', False, _('check transplanted changesets')),
               ('', 'revno', False, _('interpret arguments as revision number (no pattern magic)')),
               ('M', 'no-merges', False, _('do not show merges')),
-              ('E', 'no-empty', False, _('do not show empty commits (i.e. branch manipulation commits)')),              
+              ('E', 'no-empty', False, _('do not show empty commits (i.e. branch manipulation commits)')),
               ('r', 'reverse', False, _('reverse ordering')),
               ('f', 'file', "", _('show only changesets that change specified file')),
-              ('b', 'branch', "", _('show only changesets that were made in specified branch (even if they were merged later)')),              
+              ('b', 'branch', "", _('show only changesets that were made in specified branch (even if they were merged later)')),
               ('u', 'user', "", _('show only changesets from specified user')),
-              ('d', 'description', "", _('show only changesets with description containing specified string')),              
+              ('d', 'description', "", _('show only changesets with description containing specified string')),
               ('T', 'no-tags', False, _('ignore changesets that only touch .hgtags')),
              ] + commands.templateopts,
              _('hg missing [-M] [-t] [-r] [--revno] [--no-tags] [--no-empty] [-b <branch>] [-d <description] [-f <file>] [-u <user>]  target source')),
     }
-
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.