Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek Merge with stable

Changeset 0f35b9c7bdce…

Parents 78399f7e2ac7…

Parents bb7d19eb4ddb…

by David Golub

Changes to 3 files · Browse files at 0f35b9c7bdce Showing diff from parent 78399f7e2ac7 bb7d19eb4ddb Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
65
66
67
68
69
70
71
 
 
72
73
74
 
65
66
67
 
 
 
 
68
69
70
71
72
@@ -65,10 +65,8 @@
  if message:   cmdline += ['--message=' + hglib.fromunicode(message)]   cmdline += getUserOptions(opts, *olist) - files = ['--'] + [repo.wjoin(hglib.fromunicode(x)) - for x in stwidget.getChecked()] - addrem = [repo.wjoin(hglib.fromunicode(x)) - for x in stwidget.getChecked('!?')] + files = ['--'] + [repo.wjoin(x) for x in stwidget.getChecked()] + addrem = [repo.wjoin(x) for x in stwidget.getChecked('!?')]   if len(files) > 1:   cmdline += files   else:
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
86
87
88
89
 
90
91
92
 
135
136
137
138
139
140
141
 
192
193
194
195
 
 
196
197
198
 
330
331
332
333
 
 
334
335
336
 
86
87
88
 
89
90
91
92
 
135
136
137
 
138
139
140
 
191
192
193
 
194
195
196
197
198
 
330
331
332
 
333
334
335
336
337
@@ -86,7 +86,7 @@
  for m in regexp.finditer(editor):   expanded.append(editor[pos:m.start()-1])   phrase = editor[m.start()+1:m.end()-1] - pos=m.end()+1 + pos = m.end()+1   if '$LINENUM' in phrase:   if lineno is None:   # throw away phrase @@ -135,7 +135,6 @@
   _user_shell = None  def openshell(root, reponame): - global _user_shell   if not os.path.exists(root):   WarningMsgBox(   _('Failed to open path in terminal'), @@ -192,7 +191,8 @@
  'control': 'black bold #dddddd_background',  }   -thgstylesheet = '* { white-space: pre; font-family: monospace; font-size: 9pt; }' +thgstylesheet = '* { white-space: pre; font-family: monospace;' \ + ' font-size: 9pt; }'  tbstylesheet = 'QToolBar { border: 0px }'    def configstyles(ui): @@ -330,7 +330,8 @@
  u'<a href="http://example/">http://example/</a>'   """   csmatch = r'(\b[0-9a-f]{12}(?:[0-9a-f]{28})?\b)' - httpmatch = r'(\b(http|https)://([-A-Za-z0-9+&@#/%?=~_()|!:,.;]*[-A-Za-z0-9+&@#/%=~_()|]))' + httpmatch = r'(\b(http|https)://([-A-Za-z0-9+&@#/%?=~_()|!:,.;]*' \ + r'[-A-Za-z0-9+&@#/%=~_()|]))'   regexp = r'%s|%s' % (csmatch, httpmatch)   bodyre = re.compile(regexp)  
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
686
687
688
689
 
690
691
692
 
1198
1199
1200
1201
 
1202
1203
1204
 
686
687
688
 
689
690
691
692
 
1198
1199
1200
 
1201
1202
1203
1204
@@ -686,7 +686,7 @@
  cmdline.append('--insecure')   if user:   cleanurl = hglib.removeauth(cururl) - res = hglib.readauthforuri(self.repo.ui, cleanurl) + res = hglib.readauthforuri(self.repo.ui, cleanurl, user)   if res:   group, auth = res   if auth.get('username'): @@ -1198,7 +1198,7 @@
    # if the already user has an [auth] configuration for this URL, use it   cleanurl = hglib.removeauth(origurl) - res = hglib.readauthforuri(repo.ui, cleanurl) + res = hglib.readauthforuri(repo.ui, cleanurl, user)   if res:   self.alias, auth = res   else: