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

menuthg: cleanup variable names

Changeset 68de81651c48…

Parent 7591b40b10b9…

by Steve Borho

Changes to one file · Browse files at 68de81651c48 Showing diff from parent 7591b40b10b9 Diff from another changeset...

Change 1 of 3 Show Entire File tortoise/​menuthg.py Stacked
 
150
151
152
 
 
 
 
 
 
 
153
154
155
156
157
158
159
 
 
 
 
160
161
162
 
173
174
175
176
 
177
178
179
180
 
 
181
182
183
 
184
185
186
 
193
194
195
196
197
198
199
200
201
202
203
204
 
205
206
207
208
209
210
211
 
212
213
214
215
216
 
217
218
 
219
220
221
222
 
223
224
225
 
150
151
152
153
154
155
156
157
158
159
160
 
 
 
 
 
 
161
162
163
164
165
166
167
 
178
179
180
 
181
182
183
 
 
184
185
186
187
 
188
189
190
191
 
198
199
200
 
 
 
 
 
201
202
203
 
204
205
206
207
208
209
210
 
211
212
213
214
215
 
216
217
 
218
219
220
221
 
222
223
224
225
@@ -150,13 +150,18 @@
  self.handlers._init, icon="menucreaterepos.ico",   state=os.path.isdir(rpath)))   else: + canannotate = len(files) > 0 + hashgignore = False + for f in files: + if not os.path.isfile(f): + canannotate = False + if f.endswith('.hgignore'): + hashgignore = True   - for f in files: - if f.endswith('.hgignore'): - menu.append(TortoiseMenu(_("Edit Ignore Filter"), - _("Edit repository ignore filter"), - self.handlers._hgignore, icon="general.ico")) # needs ico - break + if hashgignore: # needs ico + menu.append(TortoiseMenu(_("Edit Ignore Filter"), + _("Edit repository ignore filter"), + self.handlers._hgignore, icon="general.ico"))     menu.append(TortoiseMenu(_("View File Status"),   _("Repository status"), @@ -173,14 +178,14 @@
  self.handlers._vdiff, icon="TortoiseMerge.ico",   state=has_vdiff))   - if len(files) == 0: + if len(files) == 0: # needs ico   menu.append(TortoiseMenu(_("Guess Renames"),   _("Detect renames and copies"), - self.handlers._guess_rename, icon="general.ico")) # needs ico - elif len(files) == 1: + self.handlers._guess_rename, icon="general.ico")) + elif len(files) == 1: # needs ico   menu.append(TortoiseMenu(_("Rename File"),   _("Rename file or directory"), - self.handlers._rename, icon="general.ico")) # needs ico + self.handlers._rename, icon="general.ico"))     menu.append(TortoiseMenu(_("Add Files"),   _("Add files to Hg repository"), @@ -193,33 +198,28 @@
  self.handlers._revert, icon="menurevert.ico"))     # we can only annotate file but not directories - annotatible = len(files) > 0 - for f in files: - if not os.path.isfile(f): - annotatible = False - break   menu.append(TortoiseMenu(_("Annotate Files"),   _("show changeset information per file line"),   self.handlers._annotate, icon="menublame.ico", - state=annotatible)) + state=canannotate))     menu.append(TortoiseMenuSep())   menu.append(TortoiseMenu(_("Update To Revision"),   _("update working directory"),   self.handlers._update, icon="menucheckout.ico"))   - can_merge = len(repo.heads()) > 1 and \ + canmerge = len(repo.heads()) > 1 and \   len(repo.changectx(None).parents()) < 2   menu.append(TortoiseMenu(_("Merge Revisions"),   _("merge working directory with another revision"),   self.handlers._merge, icon="menumerge.ico", - state=can_merge)) + state=canmerge))   - in_merge = len(repo.changectx(None).parents()) > 1 + inmerge = len(repo.changectx(None).parents()) > 1   menu.append(TortoiseMenu(_("Undo Merge"),   _("Undo merge by updating to revision"),   self.handlers._merge, icon="menuunmerge.ico", - state=in_merge)) + state=inmerge))     menu.append(TortoiseMenuSep())