Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

status/hgshelve: only set mq mode when working directory is qtip

it is possible to execute hg update when patches are applied

Changeset 243ddad19471…

Parent 5b8e3bc17b39…

by Simon Heimberg

Changes to 2 files · Browse files at 243ddad19471 Showing diff from parent 5b8e3bc17b39 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​hgshelve.py Stacked
 
438
439
440
441
 
442
443
444
 
438
439
440
 
441
442
443
444
@@ -438,7 +438,7 @@
    def shelvefunc(ui, repo, message, match, opts):   # If an MQ patch is applied, consider all qdiff changes - if hasattr(repo, 'mq') and repo.mq.applied: + if hasattr(repo, 'mq') and repo.mq.applied and repo['.'] == repo['qtip']:   qtip = repo['.']   basenode = qtip.parents()[0].node()   else:
Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
231
232
233
234
 
235
236
237
 
551
552
553
554
 
555
556
557
 
231
232
233
 
234
235
236
237
 
551
552
553
 
554
555
556
557
@@ -231,7 +231,7 @@
  except KeyError:   pass   self.mqmode = None - if hasattr(self.repo, 'mq') and self.repo.mq.applied: + if hasattr(self.repo, 'mq') and self.repo.mq.applied and repo['.'] == repo['qtip']:   self.mqmode = True     @@ -551,7 +551,7 @@
  repo = self.repo   hglib.invalidaterepo(repo)   if hasattr(repo, 'mq'): - self.mqmode = repo.mq.applied + self.mqmode = repo.mq.applied and repo['.'] == repo['qtip']   self.set_title(self.get_title())     if self.mqmode and self.mode != 'status':