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 01ac84adabb0…

Parents 37168299c64a…

Parents 50af3738159b…

by Steve Borho

Changes to 6 files · Browse files at 01ac84adabb0 Showing diff from parent 37168299c64a 50af3738159b Diff from another changeset...

Change 1 of 1 Show Entire File setup.py Stacked
 
189
190
191
192
193
194
 
 
 
195
196
197
 
189
190
191
 
 
 
192
193
194
195
196
197
@@ -189,9 +189,9 @@
   setup(name="tortoisehg",   version=version, - author='TK Soh', - author_email='teekaysoh@gmail.com', - url='http://bitbucket.org/tortoisehg/stable/', + author='Steve Borho', + author_email='steve@borho.org', + url='http://tortoisehg.bitbucket.org',   description=desc,   license='GNU GPL2',   scripts=scripts,
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gtklib.py Stacked
 
16
17
18
19
 
20
21
22
 
242
243
244
 
245
246
247
 
16
17
18
 
19
20
21
22
 
242
243
244
245
246
247
248
@@ -16,7 +16,7 @@
 from tortoisehg.util.i18n import _  from tortoisehg.util import paths, hglib, thread2   -from tortoisehg.hgtk import hgtk, gdialog +from tortoisehg.hgtk import hgtk    if gtk.gtk_version < (2, 14, 0):   # at least on 2.12.12, gtk widgets can be confused by control @@ -242,6 +242,7 @@
  def overwriteConfirmation(self, filepath):   result = filepath   if os.path.exists(filepath): + from tortoisehg.hgtk import gdialog   res = gdialog.Confirm(_('Confirm Overwrite'), [], None,   _('The file "%s" already exists!\n\n'   'Do you want to overwrite it?') % filepath).run()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgtk.py Stacked
 
652
653
654
655
 
656
657
658
 
652
653
654
 
655
656
657
658
@@ -652,7 +652,7 @@
  "^datamine|annotate|blame|grep": (datamine, [], _('hgtk datamine')),   "^hgignore|ignore|filter": (hgignore, [], _('hgtk hgignore [FILE]')),   "^init": (hginit, [], _('hgtk init [DEST]')), - "^log|history": (log, + "^log|history|explorer": (log,   [('l', 'limit', '', _('limit number of changes displayed'))],   _('hgtk log [OPTIONS] [FILE]')),   "^merge": (merge,
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
95
96
97
98
 
99
100
101
 
95
96
97
 
98
99
100
101
@@ -95,7 +95,7 @@
  return live     def get_title(self): - str = _('%s - changelog') % self.get_reponame() + str = self.get_reponame() + ' - ' + _('Repository Explorer')   if self.bfile:   str += _(' (Bundle Preview)')   return str
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
 
124
125
126
 
127
128
129
 
124
125
126
127
128
129
130
@@ -124,6 +124,7 @@
  self.repo = repo   self.currevid = None   self.pbar = pbar + self.index = {}   self.opts = { 'outgoing':[], 'orig-tip':None, 'npreviews':0,   'branch-color':False, 'show-graph':True }   self.construct_treeview()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
208
209
210
211
 
212
213
214
 
208
209
210
 
211
212
213
214
@@ -208,7 +208,7 @@
  _('There are no file changes to view'), self).run()   # GTK+ locks up if this is done immediately here   gtklib.idle_add_single_call(self.destroy) - return + return gtk.ListStore(str, str)     tmproot = tempfile.mkdtemp(prefix='extdiff.')   self.connect('response', self.response)