Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with crew

Changeset 9acbd89ae4f1…

Parents 7c19bdf206aa…

Parents bac6b73d51b3…

by Adrian Buehlmann

Changes to 4 files · Browse files at 9acbd89ae4f1 Showing diff from parent 7c19bdf206aa bac6b73d51b3 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
321
322
323
324
 
325
326
327
 
321
322
323
 
324
325
326
327
@@ -321,7 +321,7 @@
  col1.set_resizable(False)   self.filetree.append_column(col1)   - if self.merging: + if self.count_revs() <= 1:   col = gtk.TreeViewColumn(_('ms'), stat_cell)   col.add_attribute(stat_cell, 'text', FM_MERGE_STATUS)   col.set_sort_column_id(4)
Change 1 of 4 Show Entire File win32/​shellext/​ContextMenu.cpp Stacked
 
116
117
118
119
 
120
121
122
 
139
140
141
142
 
143
144
145
 
164
165
166
167
 
168
169
170
 
189
190
191
192
 
193
194
195
 
116
117
118
 
119
120
121
122
 
139
140
141
 
142
143
144
145
 
164
165
166
 
167
168
169
170
 
189
190
191
 
192
193
194
195
@@ -116,7 +116,7 @@
 MenuDescriptionMap MenuDescMap;  MenuIdCmdMap MenuIdMap;   -void AddMenuList(int idCmd, std::string const& name) +void AddMenuList(int idCmd, const std::string& name)  {   TDEBUG_TRACE("AddMenuList: idCmd = " << idCmd << " name = " << name);   MenuIdMap[idCmd] = MenuDescMap[name]; @@ -139,7 +139,7 @@
 }    void InsertMenuItemWithIcon(HMENU hMenu, int indexMenu, int idCmd, - std::string const& menuText, std::string const& iconName) + const std::string& menuText, const std::string& iconName)  {   MENUITEMINFO mi;   mi.cbSize = sizeof(mi); @@ -164,7 +164,7 @@
 }    void InsertSubMenuItemWithIcon(HMENU hMenu, HMENU hSubMenu, int indexMenu, int idCmd, - std::string const& menuText, std::string const& iconName) + const std::string& menuText, const std::string& iconName)  {   MENUITEMINFO mi;   mi.cbSize = sizeof(mi); @@ -189,7 +189,7 @@
  InsertMenuItem(hMenu, indexMenu, TRUE, &mi);  }   -void InsertMenuItemByName(HMENU hMenu, std::string const& name, int indexMenu, +void InsertMenuItemByName(HMENU hMenu, const std::string& name, int indexMenu,   int idCmd, int idCmdFirst)  {   TDEBUG_TRACE("InsertMenuItemByName: name = " << name);
Change 1 of 1 Show Entire File win32/​shellext/​Makefile.nmake 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
@@ -0,0 +1,40 @@
+ +OBJECTS_DIRSTATE = TortoiseUtils.obj \ + Direntry.obj \ + Directory.obj \ + Winstat.obj + +OBJECTS_THGSGELL = $(OBJECTS_DIRSTATE) \ + ContextMenu.obj \ + IconOverlay.obj \ + ShellExt.obj \ + ShellUtils2.obj \ + StringUtils.obj \ + dirstate.obj \ + Winstat64.obj \ + Dirstatecache.obj \ + DirectoryStatus.obj \ + QueryDirstate.obj + +LIBS = User32.lib Ole32.lib Shlwapi.lib Shell32.lib Advapi32.lib +DEFFILE = ShellExt.def + + +CPPFLAGS = /nologo /Ox /W2 /EHsc /MD /DAPPMAIN +BASE_LDFLAGS = /nologo /INCREMENTAL:NO /MANIFEST $(LIBS) +LDFLAGS_THGSHELL = $(BASE_LDFLAGS) /DLL /DEF:$(DEFFILE) +LDFLAGS_DIRSTATE = $(BASE_LDFLAGS) /SUBSYSTEM:CONSOLE + + +all: THgShell.dll dirstate.exe + +clean: + del *.obj *.dll *.exe *.lib *.exp *.manifest + +THgShell.dll: $(OBJECTS_THGSGELL) + link /OUT:$@ $(LDFLAGS_THGSHELL) $** + mt -nologo -manifest $@.manifest -outputresource:"$@;#2" + +dirstate.exe: dirstate.obj $(OBJECTS_DIRSTATE) + link /OUT:$@ $(LDFLAGS_DIRSTATE) $** + mt -nologo -manifest $@.manifest -outputresource:"$@;#1"
Change 1 of 1 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
43
44
45
46
 
47
48
49
 
43
44
45
 
46
47
48
49
@@ -43,7 +43,7 @@
 };     -bool hasHgDir(std::string const& path) +bool hasHgDir(const std::string& path)  {   return PathIsDirectory((path + "\\.hg").c_str()) != 0;  }