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

merge translations

Changeset b5c317e3927b…

Parents 1e401643bca9…

Parents 398e5ff836a6…

by Steve Borho

Changes to 2 files · Browse files at b5c317e3927b Showing diff from parent 1e401643bca9 398e5ff836a6 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
325
326
327
328
 
 
 
 
 
 
 
329
330
331
 
325
326
327
 
328
329
330
331
332
333
334
335
336
337
@@ -325,7 +325,13 @@
  self.set_default_size(defx, defy)   if self._setting_wasmax:   self.maximize() - self.move(self._setting_winpos[0], self._setting_winpos[1]) + + # Restore position if it is still on screen + screen = self.get_screen() + w, h = screen.get_width(), screen.get_height() + x, y = self._setting_winpos + if x >= 0 and x < w and y >= 0 and y < h: + self.move(x, y)     vbox = gtk.VBox(False, 0)   self.add(vbox)
Change 1 of 5 Show Entire File hggtk/​synch.py Stacked
 
33
34
35
 
36
37
38
 
294
295
296
297
 
 
 
 
 
 
298
299
300
 
441
442
443
444
 
445
446
447
 
521
522
523
524
 
525
526
527
 
528
529
530
 
599
600
601
602
 
603
604
605
 
33
34
35
36
37
38
39
 
295
296
297
 
298
299
300
301
302
303
304
305
306
 
447
448
449
 
450
451
452
453
 
527
528
529
 
530
531
532
533
534
535
536
537
 
606
607
608
 
609
610
611
612
@@ -33,6 +33,7 @@
  self.fromlog = fromlog   self.notify_func = None   self.last_drop_time = None + self.lastcmd = []     self.saved_stdout = sys.stdout   self.saved_stderr = sys.stderr @@ -294,7 +295,12 @@
  except hglib.RepoError:   return   tip = len(repo) - if self.origchangecount == tip or self.fromlog: + if ' '.join(self.lastcmd[:2]) == 'pull --rebase': + # if last operation was a rebase, do not show 'viewpulled' + # and reset our remembered tip changeset + self.origchangecount = tip + self.viewpulled.hide() + elif self.origchangecount == tip or self.fromlog:   self.viewpulled.hide()   else:   self.buttonhbox.show() @@ -441,7 +447,7 @@
  def conf_clicked(self, toolbutton, data=None):   newpath = hglib.fromutf(self.pathtext.get_text()).strip()   for alias, path in self.paths: - if path == newpath: + if newpath in (path, url.hidepassword(path)):   newpath = None   break   dlg = thgconfig.ConfigDialog(True) @@ -521,10 +527,11 @@
  remote_path = path     cmdline = cmd[:] - cmdline += ['--verbose', '--repository', self.root] + cmdline += ['--verbose']   if proxy_host and not use_proxy:   cmdline += ["--config", "http_proxy.host="]   cmdline += [remote_path] + self.lastcmd = cmdline     # show command to be executed   self.write("", False) @@ -599,7 +606,7 @@
  self.stop_button.set_sensitive(False)   if self.hgthread.return_code() is None:   self.write_err(_('[command interrupted]')) - if self.notify_func: + if self.notify_func and self.lastcmd[0] == 'pull':   self.notify_func(self.notify_args)   return False # Stop polling this function