Steve Borho avatar Steve Borho committed 4c7b117

status: show only wc diffs in status mode

When an MQ patch is applied, commit will show qdiffs for qrefresh.
Shelve and status will show WC diffs.

Comments (0)

Files changed (1)

         if revs:
             r = ':'.join(revs)
             return ' '.join([root, 'status', r]) + ' '.join(self.pats)
-        elif self.mqmode:
+        elif self.mqmode and hasattr(self, 'text'):
             patch = self.repo.mq.lookup('qtip')
             return root + ' applied MQ patch ' + patch
         else:
         self.repo.dirstate.invalidate()
         self.repo.invalidate()
 
-        # The following code was copied from the status function in mercurial\commands.py
-        # and modified slightly to work here
+        # The following code was copied from the status function in
+        # mercurial\commands.py and modified slightly to work here
         
-        if self.mqmode and not self.opts.get('rev'):
+        if self.mqmode and not self.opts.get('rev') and hasattr(self, 'text'):
             # when a patch is applied, show diffs to parent of top patch
             self._node1 = self.repo.lookup(-3)
             self._node2 = None
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.