Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

history: do not show/hide toolbar buttons

Partially backing out of cset <00c3b466f8ff>.

Changeset 6cc7971d87ac

Parent 3860b6414a48

by Yuki KODAMA

Changes to one file · Browse files at 6cc7971d87ac Showing diff from parent 3860b6414a48 Diff from another changeset...

 
1047
1048
1049
 
 
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
 
1071
1072
1073
1074
1075
 
 
1076
1077
1078
 
1294
1295
1296
1297
 
1298
1299
1300
 
1334
1335
1336
1337
 
1338
1339
1340
 
1348
1349
1350
1351
 
1352
1353
1354
 
1399
1400
1401
1402
 
1403
1404
1405
 
1450
1451
1452
1453
 
1454
1455
1456
 
1470
1471
1472
1473
 
1474
1475
1476
 
1491
1492
1493
1494
 
1495
1496
1497
 
1512
1513
1514
1515
 
1516
1517
1518
 
1572
1573
1574
1575
 
1576
1577
1578
 
1585
1586
1587
1588
 
1589
1590
1591
 
2049
2050
2051
2052
 
2053
2054
2055
 
2063
2064
2065
2066
 
2067
2068
2069
 
2076
2077
2078
2079
 
2080
2081
2082
 
2097
2098
2099
2100
 
2101
2102
2103
 
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
 
 
 
1058
1059
1060
 
1070
1071
1072
 
 
1073
1074
1075
1076
1077
 
1293
1294
1295
 
1296
1297
1298
1299
 
1333
1334
1335
 
1336
1337
1338
1339
 
1347
1348
1349
 
1350
1351
1352
1353
 
1398
1399
1400
 
1401
1402
1403
1404
 
1449
1450
1451
 
1452
1453
1454
1455
 
1469
1470
1471
 
1472
1473
1474
1475
 
1490
1491
1492
 
1493
1494
1495
1496
 
1511
1512
1513
 
1514
1515
1516
1517
 
1571
1572
1573
 
1574
1575
1576
1577
 
1584
1585
1586
 
1587
1588
1589
1590
 
2048
2049
2050
 
2051
2052
2053
2054
 
2062
2063
2064
 
2065
2066
2067
2068
 
2075
2076
2077
 
2078
2079
2080
2081
 
2096
2097
2098
 
2099
2100
2101
2102
@@ -1047,15 +1047,14 @@
  refresh = syncbox.append_button(gtk.STOCK_REFRESH,   _('Reload revision history'))   syncbox.append_separator() + incoming = syncbox.append_button(gtk.STOCK_GO_DOWN, + _('Download and view incoming changesets'))   apply = syncbox.append_button(gtk.STOCK_APPLY,   _('Accept changes from Bundle preview'),   group='bundle')   reject = syncbox.append_button(gtk.STOCK_DIALOG_ERROR,   _('Reject changes from Bundle preview'),   group='bundle') - syncbox.append_separator(group='bundle') - incoming = syncbox.append_button(gtk.STOCK_GO_DOWN, - _('Download and view incoming changesets'))   pull = syncbox.append_button(gtk.STOCK_GOTO_BOTTOM,   _('Pull incoming changesets'))   importbtn = syncbox.append_button('menuimport.ico', @@ -1071,8 +1070,8 @@
  stop = syncbox.append_button(gtk.STOCK_STOP,   _('Stop current transaction'), group='stop')   - syncbox.set_visible('stop', False) - syncbox.set_visible('bundle', False) + syncbox.set_enable('stop', False) + syncbox.set_enable('bundle', False)     self.stop_button = stop   self.syncbar_apply = apply @@ -1294,7 +1293,7 @@
  self.toolbar.remove(self.toolbar.get_nth_item(0))   self.cmd_set_sensitive('accept', False)   self.cmd_set_sensitive('reject', False) - self.syncbox.set_visible('bundle', False) + self.syncbox.set_enable('bundle', False)   for w in self.incoming_disabled:   w.set_sensitive(True)   for cmd in self.incoming_disabled_cmds: @@ -1334,7 +1333,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.syncbox.set_visible('stop', False) + self.syncbox.set_enable('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0 and os.path.isfile(bfile):   self.set_bundlefile(bfile) @@ -1348,7 +1347,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Incoming'))   self.stbar.begin(_('Checking incoming changesets...')) - self.syncbox.set_visible('stop', True) + self.syncbox.set_enable('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -1399,7 +1398,7 @@
  self.incoming_disabled.append(w)   self.syncbox.foreach(disable_child)   - self.syncbox.set_visible('bundle', True) + self.syncbox.set_enable('bundle', True)     self.bfile = bfile   oldtip = len(self.repo) @@ -1450,7 +1449,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.syncbox.set_visible('stop', False) + self.syncbox.set_enable('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   self.repo.invalidate() @@ -1470,7 +1469,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Pull'))   self.stbar.begin(_('Pulling changesets...')) - self.syncbox.set_visible('stop', True) + self.syncbox.set_enable('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -1491,7 +1490,7 @@
    def callback(return_code, buffer, *args):   self.stbar.end() - self.syncbox.set_visible('stop', False) + self.syncbox.set_enable('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   outgoing = [] @@ -1512,7 +1511,7 @@
  if self.runner.execute(cmd, callback):   self.runner.set_title(_('Outgoing'))   self.stbar.begin(_('Checking outgoing changesets...')) - self.syncbox.set_visible('stop', True) + self.syncbox.set_enable('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -1572,7 +1571,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.syncbox.set_visible('stop', False) + self.syncbox.set_enable('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   if self.outgoing: @@ -1585,7 +1584,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Push'))   self.stbar.begin(_('Pushing changesets...')) - self.syncbox.set_visible('stop', True) + self.syncbox.set_enable('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -2049,7 +2048,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.syncbox.set_visible('stop', False) + self.syncbox.set_enable('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   if self.outgoing: @@ -2063,7 +2062,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Push to %s') % rev)   self.stbar.begin(_('Pushing changesets to revision %s...') % rev) - self.syncbox.set_visible('stop', True) + self.syncbox.set_enable('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -2076,7 +2075,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.syncbox.set_visible('stop', False) + self.syncbox.set_enable('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   curtip = len(hg.repository(self.ui, self.repo.root)) @@ -2097,7 +2096,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Pull to %s') % rev)   self.stbar.begin(_('Pulling changesets to revision %s...') % rev) - self.syncbox.set_visible('stop', True) + self.syncbox.set_enable('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'),