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

status: merge mode will have one parent after the commit

Changeset 7ce8ae53a5cd…

Parent e4958f6dd6cb…

by Steve Borho

Changes to one file · Browse files at 7ce8ae53a5cd Showing diff from parent e4958f6dd6cb Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
858
859
860
861
862
863
864
 
 
 
 
 
865
866
867
 
858
859
860
 
 
 
 
861
862
863
864
865
866
867
868
@@ -858,10 +858,11 @@
  for s in patch.diff(self.repo, pctxs[0].node(), None,   match=matcher, opts=patch.diffopts(self.ui, self.opts)):   difftext.extend(s.splitlines(True)) - difftext.append(_('\n===== Diff to second parent =====\n')) - for s in patch.diff(self.repo, pctxs[1].node(), None, - match=matcher, opts=patch.diffopts(self.ui, self.opts)): - difftext.extend(s.splitlines(True)) + if len(pctxs) > 1: + difftext.append(_('\n===== Diff to second parent =====\n')) + for s in patch.diff(self.repo, pctxs[1].node(), None, + match=matcher, opts=patch.diffopts(self.ui, self.opts)): + difftext.extend(s.splitlines(True))     buf = gtk.TextBuffer()   buf.create_tag('removed', foreground='#900000')