Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7.1, 0.7.2, and 0.7.3

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.

Changeset 4c7b1174c416…

Parent f238bdefa6e6…

by Steve Borho

Changes to one file · Browse files at 4c7b1174c416 Showing diff from parent f238bdefa6e6 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
151
152
153
154
 
155
156
157
 
524
525
526
527
528
 
 
529
530
 
531
532
533
 
151
152
153
 
154
155
156
157
 
524
525
526
 
 
527
528
529
 
530
531
532
533
@@ -151,7 +151,7 @@
  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: @@ -524,10 +524,10 @@
  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