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

Merge with stable

Changeset 3f73cd16cdb0…

Parents 3fc0ad67ec90…

Parents 778b2ea72507…

by Steve Borho

Changes to 3 files · Browse files at 3f73cd16cdb0 Showing diff from parent 3fc0ad67ec90 778b2ea72507 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
824
825
826
 
 
 
 
827
828
829
 
1328
1329
1330
1331
 
1332
1333
1334
 
1874
1875
1876
 
 
 
 
 
 
 
 
1877
1878
1879
 
824
825
826
827
828
829
830
831
832
833
 
1332
1333
1334
 
1335
1336
1337
1338
 
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
@@ -824,6 +824,10 @@
  m.append(create_menu(_('qimport from here to selected'),   self.qimport_revs))   + m.append_sep() + m.append(create_menu(_('Select common ancestor revision'), + self.select_common_ancestor)) +   menu = m.create_menu()   menu.connect_after('selection-done', self.restore_single_sel)   menu.show_all() @@ -1328,7 +1332,7 @@
  self.stbar.end()   self.outgoing = outgoing   self.reload_log() - text = _('%d outgoing changesets') % len(outgoing) + text = _('%d outgoing Changesets') % len(outgoing)   self.stbar.set_idle_text(text)   self.stop_button.disconnect(stop_handler)   self.stop_button.set_sensitive(False) @@ -1874,6 +1878,14 @@
  self.reload_log()   self.changeview.clear()   + def select_common_ancestor(self, menuitem): + rev1, rev2 = self.revrange + changelog = self.repo.changelog + lookup = self.repo.lookup + ancestor = changelog.ancestor(lookup(rev1), lookup(rev2)) + rev = changelog.rev(ancestor) + self.graphview.set_revision_id(rev, True) +   def thgrefresh(self, window):   self.reload_log()  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​rename.py Stacked
 
26
27
28
29
 
30
31
32
 
26
27
28
 
29
30
31
32
@@ -26,7 +26,7 @@
  fname = util.canonpath(root, cwd, pats[0])   target = util.canonpath(root, cwd, pats[1])   except util.Abort, e: - return gdialog.Prompt("invalid path", str(e), None) + return gdialog.Prompt(_('Invalid path'), str(e), None)   except IndexError:   pass   os.chdir(root)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​statusbar.py Stacked
 
42
43
44
45
 
46
47
48
 
42
43
44
 
45
46
47
48
@@ -42,7 +42,7 @@
  self.pbar.pulse()   return True   - def begin(self, msg=_('Running'), timeout=100): + def begin(self, msg=_('Running...'), timeout=100):   self.pbox.set_child_visible(True)   self.pbox.map()   self.set_status_text(msg)