Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

filelistview: currentFile() returns a local encoded string

Changeset ebd330741de1…

Parent 513d27d7199a…

by Steve Borho

Changes to one file · Browse files at ebd330741de1 Showing diff from parent 513d27d7199a Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
103
104
105
106
 
107
108
109
 
114
115
116
117
 
118
119
120
 
127
128
129
130
131
132
 
133
134
135
136
 
 
137
138
139
 
142
143
144
145
 
146
147
148
 
165
166
167
168
 
169
170
171
 
103
104
105
 
106
107
108
109
 
114
115
116
 
117
118
119
120
 
127
128
129
 
130
 
131
132
133
 
 
134
135
136
137
138
 
141
142
143
 
144
145
146
147
 
164
165
166
 
167
168
169
170
@@ -103,7 +103,7 @@
  if filename is None:   return   model = self.model() - pats = [hglib.fromunicode(filename)] + pats = [filename]   opts = {'change':str(model._ctx.rev())}   dlg = visdiff.visualdiff(model.repo.ui, model.repo, pats, opts)   if dlg: @@ -114,7 +114,7 @@
  if filename is None:   return   model = self.model() - pats = [hglib.fromunicode(filename)] + pats = [filename]   opts = {'rev':[str(model._ctx.rev())]}   dlg = visdiff.visualdiff(model.repo.ui, model.repo, pats, opts)   if dlg: @@ -127,13 +127,12 @@
  model = self.model()   repo = model.repo   rev = model._ctx.rev() - path = hglib.fromunicode(filename)   if rev is None: - files = [repo.wjoin(path)] + files = [repo.wjoin(filename)]   wctxactions.edit(self, repo.ui, repo, files)   else: - base, _ = visdiff.snapshot(repo, [path], repo[rev]) - files = [os.path.join(base, path)] + base, _ = visdiff.snapshot(repo, [filename], repo[rev]) + files = [os.path.join(base, filename)]   wctxactions.edit(self, repo.ui, repo, files)     def editlocal(self): @@ -142,7 +141,7 @@
  return   model = self.model()   repo = model.repo - path = repo.wjoin(hglib.fromunicode(filename)) + path = repo.wjoin(filename)   wctxactions.edit(self, repo.ui, repo, [path])     def revertfile(self): @@ -165,7 +164,7 @@
  repoviewer=self.window())   dlgdict[filename] = dlg   dlg.setWindowTitle(_('Hg file log viewer - %s') % filename) - dlg = dlgdict[filename] + dlg = dlgdict[filename]   dlg.goto(model._ctx.rev())   dlg.show()   dlg.raise_()