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

merge

Changeset eeb1cd2d2538…

Parents b40200540d59…

Parents 75c4dd997c9a…

by Steve Borho

Changes to 3 files · Browse files at eeb1cd2d2538 Showing diff from parent b40200540d59 75c4dd997c9a Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​dialog.py Stacked
 
14
15
16
17
18
19
20
21
22
 
 
23
24
25
26
27
 
14
15
16
 
 
 
 
 
 
17
18
19
 
20
21
22
@@ -14,14 +14,9 @@
 # along with this program; if not, write to the Free Software  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA   -try: - import pygtk - pygtk.require("2.0") -except: - pass - +import pygtk +pygtk.require("2.0")  import gtk -import gtk.glade  from gtklib import MessageDialog    
Change 1 of 1 Show Entire File hggtk/​hgtk.py Stacked
 
45
46
47
48
 
 
 
 
 
 
 
 
 
49
50
51
 
45
46
47
 
48
49
50
51
52
53
54
55
56
57
58
59
@@ -45,7 +45,15 @@
  except util.Abort, inst:   sys.stderr.write(_("abort: %s\n") % inst)   return -1 - return _runcatch(u, args) + if '--debugger' in args: + pdb.set_trace() + try: + return _runcatch(u, args) + except: + if '--debugger' in args: + pdb.post_mortem(sys.exc_info()[2]) + ui.print_exc() + raise    def get_list_from_file(filename):   try:
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
913
914
915
916
917
918
919
920
921
922
923
 
924
925
 
 
 
 
 
 
 
926
927
928
 
913
914
915
 
 
 
 
 
 
 
 
916
917
 
918
919
920
921
922
923
924
925
926
927
@@ -913,16 +913,15 @@
    def dohgdiff():   self.diff_model.clear() - difflines = [] - if len(files) != 0: - wfiles = [self.repo.wjoin(x) for x in files] - matcher = cmdutil.match(self.repo, wfiles, self.opts) - diffopts = mdiff.diffopts(git=True, nodates=True) - for s in patch.diff(self.repo, self._node1, self._node2, - match=matcher, opts=diffopts): - difflines.extend(s.splitlines(True)) + difftext = cStringIO.StringIO()   try: - difftext = cStringIO.StringIO(''.join(difflines)) + if len(files) != 0: + wfiles = [self.repo.wjoin(x) for x in files] + matcher = cmdutil.match(self.repo, wfiles, self.opts) + diffopts = mdiff.diffopts(git=True, nodates=True) + for s in patch.diff(self.repo, self._node1, self._node2, + match=matcher, opts=diffopts): + difftext.writelines(s.splitlines(True))   difftext.seek(0)     self._shelve_chunks = hgshelve.parsepatch(difftext)