Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 26bab06c4fb5…

Parents e5b6dc69d36d…

Parents 2bc7a563074f…

by Steve Borho

Changes to 21 files · Browse files at 26bab06c4fb5 Showing diff from parent e5b6dc69d36d 2bc7a563074f Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
180
181
182
 
 
 
183
184
185
 
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
236
237
238
 
180
181
182
183
184
185
186
187
188
 
224
225
226
 
 
 
 
 
 
 
 
 
 
 
 
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
@@ -180,6 +180,9 @@
  <?elseif $(var.Platform) = "x64" ?>   <Merge Id='TortoiseOverlaysMergeX64' Language='0' DiskId='1'   SourceFile='..\contrib\TortoiseOverlays\TortoiseOverlays-1.0.11.18359-x64.msm' /> + <!-- TortoiseOverlaysMergeX64 is merge-incompatible with TortoiseOverlaysMergeX86 due to conflicting + component id's. So we cannot merge both, but ideally, we would + (see http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2446062) -->   <Directory Id="CommonFiles64Folder" Name="Programs64" >   <Directory Id="Common64" Name="TortoiseHg" >   <Component Id='thgshellx64dll' Guid='59FD2A49-BA62-40CC-B155-D11DB11EE611' Win64='yes'> @@ -221,18 +224,28 @@
  <MergeRef Id='VCRedist'/>   <MergeRef Id='VCRedistPolicy' />   </Feature> - <Feature Id='ShellExtension' Title='Shell Extension' Description='Windows Explorer Integration' Level='1'> - <ComponentGroupRef Id='cmenuI18n' /> - <ComponentRef Id='thgtaskbarEXE' /> - <?if $(var.Platform) = "x86" ?> - <MergeRef Id='TortoiseOverlaysMergeX86' /> - <?endif?> - <ComponentRef Id='thgshellx86dll' /> - <?if $(var.Platform) = "x64" ?> - <MergeRef Id='TortoiseOverlaysMergeX64' /> - <ComponentRef Id='thgshellx64dll' /> - <?endif?> - </Feature> + <?if $(var.Platform) = "x86" ?> + <Feature Id='ShellExtension' Title='Shell Extension' Level='1' AllowAdvertise='no' + Description='Overlay icons and context menu'> + <ComponentGroupRef Id='cmenuI18n' /> + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX86' /> + <ComponentRef Id='thgshellx86dll' /> + </Feature> + <?elseif $(var.Platform) = "x64" ?> + <Feature Id='ShellExtension' Title='Shell Extension x64' Level='1' Display='expand' AllowAdvertise='no' + Description='Overlay icons and context menu for 64 bit processes'> + <ComponentGroupRef Id='cmenuI18n' /> + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX64' /> + <ComponentRef Id='thgshellx64dll' /> + <Feature Id='ShellExtensionx86' Title='Shell Extension x86' Level='1' AllowAdvertise='no' + Description='Overlay icons and context menu for 32 bit processes'> + <!-- <MergeRef Id='TortoiseOverlaysMergeX86' /> --> + <ComponentRef Id='thgshellx86dll' /> + </Feature> + </Feature> + <?endif?>   <Feature Id='Locales' Title='Translations' Description='Mercurial and TortoiseHg Translations' Level='1'>   <ComponentGroupRef Id='localeFolder' />   <ComponentGroupRef Id='i18nFolder' />
doc/​source/​figures/​advancedbar.png
size changed from 646x40 to 744x33
Removed image
Added image
doc/​source/​figures/​bundlepreview.png
size changed from 935x305 to 865x408
Removed image
Added image
doc/​source/​figures/​clone.png
size changed from 466x152 to 541x167
Removed image
Added image
doc/​source/​figures/​cmenu-files.jpg
size changed from 334x249 to 395x199
Removed image
Added image
doc/​source/​figures/​cmenu-global-settings.jpg
Added image
doc/​source/​figures/​cmenu-nofiles.jpg
size changed from 383x460 to 425x486
Removed image
Added image
doc/​source/​figures/​import.png
Added image
doc/​source/​figures/​init.png
size changed from 419x150 to 892x691
mode changed from RGBA to RGB
Removed image
Added image
doc/​source/​figures/​log.png
size changed from 753x564 to 892x691
Removed image
Added image
doc/​source/​figures/​newchangeset.png
size changed from 307x69 to 510x62
mode changed from RGBA to RGB
Removed image
Added image
doc/​source/​figures/​outgoing.png
size changed from 373x90 to 323x84
mode changed from RGBA to RGB
Removed image
Added image
doc/​source/​figures/​searchbar.png
size changed from 761x25 to 871x26
mode changed from RGBA to RGB
Removed image
Added image
doc/​source/​figures/​settings.png
size changed from 442x642 to 592x536
mode changed from RGBA to RGB
Removed image
Added image
doc/​source/​figures/​share.png
size changed from 466x152 to 538x165
mode changed from RGBA to RGB
Removed image
Added image
doc/​source/​figures/​syncbar.png
size changed from 763x28 to 682x23
mode changed from RGBA to RGB
Removed image
Added image
doc/​source/​figures/​taskbarui.png
size changed from 416x556 to 416x409
mode changed from RGBA to RGB
Removed image
Added image
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgthread.py Stacked
 
38
39
40
 
41
42
43
 
38
39
40
41
42
43
44
@@ -38,6 +38,7 @@
  self.dialogq = dialogq   self.responseq = responseq   self.setconfig('ui', 'interactive', 'on') + self.setconfig('ui', 'progress', 'False')     def write(self, *args):   if hglib.uiwrite(self, args):
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​hgtk.py Stacked
 
15
16
17
 
18
19
20
 
30
31
32
 
 
 
 
 
 
33
34
35
 
95
96
97
98
99
100
101
102
103
104
105
 
 
 
 
 
 
106
107
108
 
15
16
17
18
19
20
21
 
31
32
33
34
35
36
37
38
39
40
41
42
 
102
103
104
 
 
 
 
 
 
 
 
105
106
107
108
109
110
111
112
113
@@ -15,6 +15,7 @@
 import os  import pdb  import sys +import subprocess  import traceback  import gtk  import gobject @@ -30,6 +31,12 @@
 except ImportError:   config_nofork = None   +try: + import win32con + openflags = win32con.CREATE_NO_WINDOW +except ImportError: + openflags = 0 +  nonrepo_commands = '''userconfig shellconfig clone debugcomplete init  about help version thgstatus serve'''   @@ -95,14 +102,12 @@
  args = sys.argv   else:   args = [sys.executable] + sys.argv - if os.name == 'nt': - args = ['"%s"' % arg for arg in args] - mode = os.P_DETACH - else: - mode = os.P_NOWAIT - env = os.environ.copy() - env['THG_HGTK_SPAWN'] = '1' - os.spawnve(mode, sys.executable, args, env) + os.environ['THG_HGTK_SPAWN'] = '1' + cmdline = subprocess.list2cmdline(args) + subprocess.Popen(cmdline, + close_fds=True, + creationflags=openflags, + shell=True)   sys.exit(0)    def get_list_from_file(filename):
Change 1 of 1 Show Entire File tortoisehg/​util/​prej.py Stacked
 
282
283
284
 
285
286
287
 
 
 
288
 
 
289
290
291
292
293
294
295
296
297
298
 
 
 
299
300
301
 
282
283
284
285
286
 
 
287
288
289
290
291
292
293
 
 
 
 
 
 
 
 
 
294
295
296
297
298
299
@@ -282,20 +282,18 @@
  self.lines[l : l + len(old)] = newlines   self.offset += len(newlines) - len(old)   self.dirty = 1 + offset = l - orig_start - fuzzlen   if fuzzlen: - fuzzstr = "with fuzz %d " % fuzzlen - f = self.ui.warn + msg = _("Hunk #%d succeeded at %d " + "with fuzz %d " + "(offset %d lines).\n")   self.printfile(True) + self.ui.warn(msg % + (h.number, l + 1, fuzzlen, offset))   else: - fuzzstr = "" - f = self.ui.note - offset = l - orig_start - fuzzlen - if offset == 1: - linestr = "line" - else: - linestr = "lines" - f(_("Hunk #%d succeeded at %d %s(offset %d %s).\n") % - (h.number, l+1, fuzzstr, offset, linestr)) + msg = _("Hunk #%d succeeded at %d " + "(offset %d lines).\n") + self.ui.note(msg % (h.number, l + 1, offset))   return fuzzlen   self.printfile(True)   self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start))
Change 1 of 2 Show Entire File win32/​shellext/​shellext.rc Stacked
 
30
31
32
33
34
 
35
36
37
 
58
59
60
61
 
62
63
64
 
30
31
32
 
 
33
34
35
36
 
57
58
59
 
60
61
62
63
@@ -30,8 +30,7 @@
  TOSTR2(THG_VERSION_FIRST) "." \   TOSTR2(THG_VERSION_SECOND) "." \   TOSTR2(THG_VERSION_THIRD) "-" \ - TOSTR2(THG_PARENT_ID) " / " \ - TOSTR2(THG_PRODUCT_ID) + TOSTR2(THG_PARENT_ID)      VS_VERSION_INFO VERSIONINFO @@ -58,7 +57,7 @@
  VALUE "InternalName", "shellext"   VALUE "LegalCopyright", "Copyright (C) 2010 Steve Borho and others"   VALUE "OriginalFilename", "ThgShell.dll" - VALUE "ProductName", "TortoiseHg" + VALUE "ProductName", "TortoiseHg " TOSTR2(THG_PRODUCT_ID)   VALUE "ProductVersion", THG_VERSION_STRING   END   END