Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9.1, 0.9.1.1, and 0.9.2

stable status: hide unknowns, clean, and ignored when merging

Closes #721

Changeset aab8032d8c22…

Parent 3ee7cc0c70e8…

by Steve Borho

Changes to one file · Browse files at aab8032d8c22 Showing diff from parent 3ee7cc0c70e8 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
684
685
686
 
 
 
687
688
689
690
691
 
 
 
692
693
694
 
684
685
686
687
688
689
690
691
 
 
 
692
693
694
695
696
697
@@ -684,11 +684,14 @@
  self._node1, self._node2, = n1, n2   self.status_error = None   matcher = cmdutil.match(repo, self.pats, self.opts) + unknown = self.test_opt('unknown') and not self.is_merge() + clean = self.test_opt('clean') and not self.is_merge() + ignored = self.test_opt('ignored') and not self.is_merge()   try:   status = repo.status(node1=n1, node2=n2, match=matcher, - ignored=self.test_opt('ignored'), - clean=self.test_opt('clean'), - unknown=self.test_opt('unknown')) + ignored=ignored, + clean=clean, + unknown=unknown)   self.status = status   except IOError, e:   self.status_error = str(e)