Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset da5239906f79

Parents 675304f77d19

Parents 8d4247a6e83d

by Steve Borho

Changes to 6 files · Browse files at da5239906f79 Showing diff from parent 675304f77d19 8d4247a6e83d Diff from another changeset...

 
928
929
930
931
 
 
 
932
933
934
 
 
935
936
937
 
928
929
930
 
931
932
933
934
935
936
937
938
939
940
941
@@ -928,10 +928,14 @@
  result = gtklib.NativeSaveFileDialogWrapper(title=_("Save file to"),   initial=self.cwd,   filename=filename).run() - if result: + if not result: + return + try:   q = Queue.Queue()   hglib.hgcmd_toq(q, 'cat', '--rev',   str(self.currev), '--output', hglib.fromutf(result), self.curfile) + except (util.Abort, IOError), e: + gdialog.Prompt(_('Unable to save file'), str(e), self).run()     def diff_to_local(self, menuitem):   if not self.curfile:
 
1128
1129
1130
 
 
1131
1132
1133
 
1128
1129
1130
1131
1132
1133
1134
1135
@@ -1128,6 +1128,8 @@
  if self.qnew:   cmdline[1] = 'qnew'   cmdline.append('--force') + if not files: + cmdline += ['-X', self.repo.root]   elif self.qheader is not None:   cmdline[1] = 'qrefresh'   if not files:
 
704
705
706
 
707
708
709
 
850
851
852
 
 
 
853
854
855
 
704
705
706
707
708
709
710
 
851
852
853
854
855
856
857
858
859
@@ -704,6 +704,7 @@
  gtklib.set_tortoise_keys(self)   self.set_resizable(resizable)   self.set_has_separator(False) + self.earlyout = False     self.ui = ui.ui()   if norepo: @@ -850,6 +851,9 @@
    # construct dialog body   self.get_body(self.vbox) + if self.earlyout: + gtklib.idle_add_single_call(self.destroy) + return     # focus on default button if needs   name = self.get_default_button()
 
99
100
101
102
 
103
104
105
 
99
100
101
 
102
103
104
105
@@ -99,7 +99,7 @@
  args = ['"%s"' % arg for arg in args]   env = os.environ.copy()   env['THG_HGTK_SPAWN'] = '1' - os.spawnve(os.P_NOWAIT, sys.executable, args, env) + os.spawnve(os.P_DETACH, sys.executable, args, env)   sys.exit(0)    def get_list_from_file(filename):
 
145
146
147
148
 
149
150
151
 
175
176
177
178
 
179
180
181
182
183
 
145
146
147
 
148
149
150
151
 
175
176
177
 
178
179
 
180
181
182
@@ -145,7 +145,7 @@
  ignored='I' in filetypes,   unknown='?' in filetypes)   except IOError: - pass + status = [None] * 7     (modified, added, removed, deleted, unknown, ignored, clean) = status   if 'M' in filetypes: @@ -175,9 +175,8 @@
  if not len(fm):   gdialog.Prompt(_('No appropriate files'),   _('No files found for this operation'), self).run() - gtklib.idle_add_single_call(self.destroy) + self.earlyout=True   self.hide() - return     def get_buttons(self):   return [('go', LABELS[self.command][1], gtk.RESPONSE_OK),
 
1336
1337
1338
1339
 
1340
1341
1342
 
1336
1337
1338
 
1339
1340
1341
1342
@@ -1336,7 +1336,7 @@
  buf.seek(0)   try:   try: - fp = open(result, "w") + fp = open(result, 'wb')   fp.write(buf.read())   except OSError:   pass