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

merge with stable

Changeset 11dc712a7517…

Parents 3e9fa875c486…

Parents 6f33ec32e601…

by Steve Borho

Changes to 4 files · Browse files at 11dc712a7517 Showing diff from parent 3e9fa875c486 6f33ec32e601 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​datamine.py Stacked
 
9
10
11
 
12
13
14
 
333
334
335
 
 
 
 
 
 
 
336
337
338
 
347
348
349
350
 
 
 
 
 
 
 
 
351
352
353
 
9
10
11
12
13
14
15
 
334
335
336
337
338
339
340
341
342
343
344
345
346
 
355
356
357
 
358
359
360
361
362
363
364
365
366
367
368
@@ -9,6 +9,7 @@
 import pango  import Queue  import threading +import re    from mercurial import util   @@ -333,6 +334,13 @@
  _('You must provide a search expression'), self).run()   regexp.grab_focus()   return + try: + re.compile(retext) + except re.error, e: + gdialog.Prompt(_('Invalid regular expression'), + _('Error: %s') % str(e), self).run() + regexp.grab_focus() + return     q = Queue.Queue()   args = [self.repo.root, q, 'grep'] @@ -347,7 +355,14 @@
  for x in excs:   if x: args.extend(['-X', x])   args.append(retext) - thread = thread2.Thread(target=hgcmd_toq, args=args) + + def threadfunc(path, q, *args): + try: + hgcmd_toq(path, q, *args) + except util.Abort, e: + self.stbar.set_status_text(_('Abort: %s') % str(e)) + + thread = thread2.Thread(target=threadfunc, args=args)   thread.start()   frame._mythread = thread   self.stop_button.set_sensitive(True)
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
137
138
139
 
140
141
142
 
137
138
139
140
141
142
143
@@ -137,6 +137,7 @@
    def commit(self, button):   dlg = commit.run(ui.ui()) + dlg.set_transient_for(self)   dlg.set_modal(True)   dlg.set_notify_func(self.commit_notify, dlg)   dlg.display()
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
625
626
627
628
 
 
 
 
 
 
 
629
630
631
 
625
626
627
 
628
629
630
631
632
633
634
635
636
637
@@ -625,7 +625,13 @@
  self.stop_button.set_sensitive(False)   if self.hgthread.return_code() is None:   self.write_err(_('[command interrupted]')) - if self.notify_func and self.lastcmd[0] == 'pull': + if not self.notify_func or self.lastcmd[0] != 'pull': + return False + if ' '.join(self.lastcmd[:2]) == 'pull --rebase': + # disable notification; rebase can be poisonous + self.notify_func = None + self.notify_args = None + else:   self.notify_func(self.notify_args)   return False # Stop polling this function  
Change 1 of 3 Show Entire File win32/​shellext/​ContextMenu.cpp Stacked
 
83
84
85
 
 
 
 
 
 
86
87
88
 
95
96
97
98
 
99
100
101
 
103
104
105
106
107
108
 
 
 
109
110
111
 
83
84
85
86
87
88
89
90
91
92
93
94
 
101
102
103
 
104
105
106
107
 
109
110
111
 
 
 
112
113
114
115
116
117
@@ -83,6 +83,12 @@
  {"vdiff", "Visual Diff",   "View changes using GUI diff tool",   "TortoiseMerge.ico", 0}, + {"hgignore", "Edit Ignore Filter", + "Edit repository ignore filter", + "ignore.ico", 0}, + {"guess", "Guess Renames", + "Detect renames and copies", + "detect_rename.ico", 0},     /* Add new items here */   @@ -95,7 +101,7 @@
 {   Commit, Init, Clone, Status, Shelve, Add, Revert, Remove, Rename,   Log, Synch, Serve, Update, Recover, Thgstatus, Userconf, Repoconf, - About, Datamine, VDiff, + About, Datamine, VDiff, Ignore, Guess,   /* Add new items here */   Separator, EndOfList  }; @@ -103,9 +109,9 @@
 menuDescListEntries RepoNoFilesMenu[] =  {   Commit, Status, Shelve, VDiff, Separator, - Log, Separator, - Update, Separator, - Synch, Clone, Recover, Serve, Thgstatus, Separator, + Log, Update, Datamine, Thgstatus, Separator, + Synch, Serve, Clone, Init, Separator, + Ignore, Guess, Recover, Separator,   Repoconf, Userconf, Separator,   About, EndOfList  };