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 8f19f0b9c52c…

Parents 3039e50ebdd7…

Parents 74b21b770955…

by Adrian Buehlmann

Changes to 4 files · Browse files at 8f19f0b9c52c Showing diff from parent 3039e50ebdd7 74b21b770955 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​logview/​treemodel.py Stacked
 
122
123
124
125
 
 
126
127
128
 
131
132
133
134
135
 
 
136
137
138
 
122
123
124
 
125
126
127
128
129
 
132
133
134
 
 
135
136
137
138
139
@@ -122,7 +122,8 @@
  taglist = hglib.toutf(', '.join(tags))   tstr = ''   for tag in tags: - tstr += '<span background="#ffffaa"> %s </span> ' % tag + tstr += '<span color="%s" background="%s"> %s </span> ' % \ + ('black', '#ffffaa', tag)     # show branch names per hgweb's logic   branches = webutil.nodebranchdict(self.repo, ctx) @@ -131,8 +132,8 @@
  branchstr = ''   for branch in branches:   branchstr += branch['name'] - bstr += '<span background="#aaffaa"> %s </span> ' % \ - branch['name'] + bstr += '<span color="%s" background="%s"> %s </span> ' % \ + ('black', '#aaffaa', branch['name'])   for branch in inbranches:   branchstr += branch['name']  
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
101
102
103
104
105
106
107
 
 
 
 
 
108
109
110
 
111
112
 
 
113
114
 
115
116
117
 
101
102
103
 
 
 
 
104
105
106
107
108
109
110
 
111
112
 
113
114
115
 
116
117
118
119
@@ -101,17 +101,19 @@
  summary = ctx.description().replace('\0', '')   summary = summary.split('\n')[0]   escape = gobject.markup_escape_text - desc = '<b>rev</b>\t\t: %s\n' % escape(revstr) - desc += '<b>summary</b>\t: %s\n' % escape(summary[:80]) - desc += '<b>user</b>\t\t: %s\n' % escape(ctx.user()) - desc += '<b>date</b>\t\t: %s\n' % escape(hglib.displaytime(ctx.date())) + desc = '<b>' + _('rev') + '</b>\t\t: %s\n' % escape(revstr) + desc += '<b>' + _('summary') + '</b>\t: %s\n' % escape(summary[:80]) + desc += '<b>' + _('user') + '</b>\t\t: %s\n' % escape(ctx.user()) + desc += '<b>' + _('date') + '</b>\t\t: %s\n' \ + % escape(hglib.displaytime(ctx.date()))   node = repo.lookup(revid)   tags = repo.nodetags(node) - desc += '<b>branch</b>\t: ' + escape(ctx.branch()) + desc += '<b>' + _('branch') + '</b>\t: ' + escape(ctx.branch())   if tags: - desc += '\n<b>tags</b>\t\t: ' + escape(', '.join(tags)) + desc += '\n<b>' + _('tags') + '</b>\t\t: ' \ + + escape(', '.join(tags))   if node not in repo.heads(): - desc += '\n<b>Not a head revision!</b>' + desc += '\n<b>' + _('Not a head revision!') + '</b>'   return revstr, hglib.toutf(desc)     def set_notify_func(self, func, *args):
Change 1 of 1 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
5
6
7
 
 
 
8
9
10
 
5
6
7
8
9
10
11
12
13
@@ -5,6 +5,9 @@
 #include "StringUtils.h"  #include <olectl.h>   +#define INITGUID +#include <initguid.h> +  DEFINE_GUID(CLSID_TortoiseHg0, 0xb456dba0L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);  DEFINE_GUID(CLSID_TortoiseHg1, 0xb456dba1L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);  DEFINE_GUID(CLSID_TortoiseHg2, 0xb456dba2L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);
Change 1 of 1 Show Entire File win32/​shellext/​ShellExt.h Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
 
1
2
3
 
 
 
 
 
 
4
5
 
6
 
7
8
9
@@ -1,17 +1,9 @@
 #ifndef _SHELL_EXT_H_  #define _SHELL_EXT_H_   -#pragma data_seg(".text") -#include <objbase.h> -#define INITGUID -#include <initguid.h> -#include <shlobj.h> -#include <shlguid.h>  #include <vector>  #include <string> -#pragma data_seg()   -#define DLLREGUNREGNAME TEXT("DLL Registerer")    enum TortoiseOLEClass  {