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 f82ea34b322b…

Parents 927a7a9750d8…

Parents 1e5e7faea4f2…

by Adrian Buehlmann

Changes to 2 files · Browse files at f82ea34b322b Showing diff from parent 927a7a9750d8 1e5e7faea4f2 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​shell-register.wxi Stacked
 
1
2
3
4
 
 
 
 
 
 
 
 
5
6
7
 
 
 
 
 
 
 
 
8
9
10
 
 
 
 
 
 
 
 
11
12
13
 
 
 
 
 
 
 
 
14
15
16
 
 
 
 
 
 
 
 
17
18
19
20
21
22
23
24
25
26
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27
28
29
30
31
32
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
33
34
35
36
37
38
39
40
41
42
43
44
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
45
 
1
2
 
 
3
4
5
6
7
8
9
10
11
 
 
12
13
14
15
16
17
18
19
20
 
 
21
22
23
24
25
26
27
28
29
 
 
30
31
32
33
34
35
36
37
38
 
 
39
40
41
42
43
44
45
46
47
48
 
 
 
 
 
 
 
 
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
 
 
 
 
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
 
 
 
 
 
 
 
 
 
 
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
@@ -1,45 +1,121 @@
 <Include>   <!-- cmenu COM component --> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + />   <!-- Normal overlay COM component --> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + />   <!-- Added overlay COM component --> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + />   <!-- Modified overlay COM component --> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + />   <!-- Unversioned overlay COM component --> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + />     <!-- cmenu registration --> - <RegistryValue Root='HKCR' Key='Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> - <RegistryValue Root='HKCR' Key='Directory\Background\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> - <RegistryValue Root='HKCR' Key='Drive\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> - <RegistryValue Root='HKCR' Key='Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> - <RegistryValue Root='HKCR' Key='InternetShortcut\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> - <RegistryValue Root='HKCR' Key='LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> - <RegistryValue Root='HKCR' Key='LibraryFolder\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> - <RegistryValue Root='HKCR' Key='*\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <RegistryValue + Root='HKCR' Key='Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='Directory\Background\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='Drive\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='InternetShortcut\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='LibraryFolder\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='*\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + />     <!-- register overlay components with TortoiseOverlays --> - <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Normal' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgNormal)' /> - <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Added' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgAdded)' /> - <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Modified' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)' /> - <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Unversioned' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgUnversioned)' /> + <RegistryValue + Root='HKMU' Key='Software\TortoiseOverlays\Normal' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgNormal)' + /> + <RegistryValue + Root='HKMU' Key='Software\TortoiseOverlays\Added' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgAdded)' + /> + <RegistryValue Root='HKMU' + Key='Software\TortoiseOverlays\Modified' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)' + /> + <RegistryValue + Root='HKMU' Key='Software\TortoiseOverlays\Unversioned' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgUnversioned)' + />     <!-- Mark all as approved --> - <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg' /> - <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='$(var.CLSID_TortoiseHgNormal)' Value='TortoiseHg' /> - <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='$(var.CLSID_TortoiseHgAdded)' Value='TortoiseHg' /> - <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='$(var.CLSID_TortoiseHgModified)' Value='TortoiseHg' /> - <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='$(var.CLSID_TortoiseHgUnversioned)' Value='TortoiseHg' /> + <RegistryValue + Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Type='string' Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg' + /> + <RegistryValue + Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Type='string' Name='$(var.CLSID_TortoiseHgNormal)' Value='TortoiseHg' + /> + <RegistryValue + Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Type='string' Name='$(var.CLSID_TortoiseHgAdded)' Value='TortoiseHg' + /> + <RegistryValue + Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Type='string' Name='$(var.CLSID_TortoiseHgModified)' Value='TortoiseHg' + /> + <RegistryValue + Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Type='string' Name='$(var.CLSID_TortoiseHgUnversioned)' Value='TortoiseHg' + />  </Include>
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
 
625
626
627
628
 
629
630
631
 
761
762
763
 
 
 
 
 
 
 
 
 
764
765
766
 
625
626
627
 
628
629
630
631
 
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
@@ -625,7 +625,7 @@
    reload = gtk.Button(_('Reload'))   hbox.pack_start(reload, False, False) - reload.connect('clicked', lambda *a: self.refresh()) + reload.connect('clicked', self.reload_clicked)     # insert padding of between combo and middle pane   wrapbox.pack_start(gtk.VBox(), False, False, 4) @@ -761,6 +761,15 @@
  if not gtklib.open_with_editor(u, self.fn, self):   self.focus_field('tortoisehg.editor')   + def reload_clicked(self, button): + if self.dirty: + ret = gdialog.Confirm(_('Confirm Reload'), [], self, + _('Unsaved changes will be lost.\n' + 'Do you want to reload?')).run() + if ret != gtk.RESPONSE_YES: + return + self.refresh() +   def delete_event(self, dlg, event):   return True