Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 3ce6960d9c85…

Parents 15ec58c23797…

Parents aab8032d8c22…

by Steve Borho

Changes to 2 files · Browse files at 3ce6960d9c85 Showing diff from parent 15ec58c23797 aab8032d8c22 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
140
141
142
 
 
143
144
145
 
140
141
142
143
144
145
146
147
@@ -140,6 +140,8 @@
    def get_title(self):   root = self.get_reponame() + if self.is_merge(): + root = _('merging ') + root   user = self.opts.get('user') or ''   if user: user = 'as ' + user   date = self.opts.get('date') or ''
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)