Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.6, 0.7, and 0.7.1

hg-crew-tip remove uses of revlog.count() and repo.workingctx()

Changeset 84a89173b9a1…

Parent 4b30a3efa4b9…

by Peter Arrenbrecht

Changes to 14 files · Browse files at 84a89173b9a1 Showing diff from parent 4b30a3efa4b9 Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​nautilus-thg.py Stacked
 
221
222
223
224
225
 
 
226
227
228
 
494
495
496
497
 
498
499
500
 
221
222
223
 
 
224
225
226
227
228
 
494
495
496
 
497
498
499
500
@@ -221,8 +221,8 @@
  items.append(item)   return items   - if len(repo.workingctx().parents()) > 1: - self.rev0 = repo.workingctx().parents()[0].rev() + if len(repo.changectx(None).parents()) > 1: + self.rev0 = repo.changectx(None).parents()[0].rev()   item = nautilus.MenuItem('HgNautilus::undomerge',   'Undo Merge',   'Clean checkout of original parent revision', @@ -494,7 +494,7 @@
  emblem, status = self._get_file_status(repo, localpath)     # Get the information from Mercurial - ctx = repo.workingctx().parents()[0] + ctx = repo.changectx(None).parents()[0]   try:   fctx = ctx.filectx(localpath)   rev = fctx.filelog().linkrev(fctx.filenode())
Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
258
259
260
261
 
262
263
264
 
258
259
260
 
261
262
263
264
@@ -258,7 +258,7 @@
  c = c2   crev = c.rev()   if crev is None: - crev = repo.changelog.count() + crev = len(repo.changelog)   orig = f   files = (f,)   while crev > startrev:
Change 1 of 3 Show Entire File hggtk/​commit.py Stacked
 
193
194
195
196
 
197
198
199
 
217
218
219
220
 
221
222
223
 
305
306
307
308
 
309
310
311
 
193
194
195
 
196
197
198
199
 
217
218
219
 
220
221
222
223
 
305
306
307
 
308
309
310
311
@@ -193,7 +193,7 @@
    def _check_merge(self):   # disable the checkboxes on the filelist if repo in merging state - merged = len(self.repo.workingctx().parents()) > 1 + merged = len(self.repo.changectx(None).parents()) > 1   cbcell = self.tree.get_column(0).get_cell_renderers()[0]   cbcell.set_property("activatable", not merged)   @@ -217,7 +217,7 @@
  if not self._ready_message():   return True   - if len(self.repo.workingctx().parents()) > 1: + if len(self.repo.changectx(None).parents()) > 1:   # as of Mercurial 1.0, merges must be committed without   # specifying file list.   self._hg_commit([]) @@ -305,7 +305,7 @@
    # move cwd to repo root if repo is merged, so we can show   # all the changed files - if len(repo.workingctx().parents()) > 1 and repo.root != cwd: + if len(repo.changectx(None).parents()) > 1 and repo.root != cwd:   cwd = repo.root   repo = hg.repository(u, path=cwd)   files = [cwd]
Change 1 of 1 Show Entire File hggtk/​datamine.py Stacked
 
378
379
380
381
 
382
383
384
 
378
379
380
 
381
382
383
384
@@ -378,7 +378,7 @@
  revision 'revid'.   '''   if revid == '.': - ctx = self.repo.workingctx().parents()[0] + ctx = self.repo.changectx(None).parents()[0]   try:   fctx = ctx.filectx(path)   except revlog.LookupError:
Change 1 of 6 Show Entire File hggtk/​history.py Stacked
 
294
295
296
297
 
298
299
300
 
417
418
419
420
 
421
422
423
 
503
504
505
506
 
507
508
509
 
512
513
514
515
 
516
517
518
519
520
521
 
522
523
524
 
528
529
530
531
 
532
533
534
 
573
574
575
576
 
577
578
579
 
294
295
296
 
297
298
299
300
 
417
418
419
 
420
421
422
423
 
503
504
505
 
506
507
508
509
 
512
513
514
 
515
516
517
518
519
520
 
521
522
523
524
 
528
529
530
 
531
532
533
534
 
573
574
575
 
576
577
578
579
@@ -294,7 +294,7 @@
  self.opts['revs'] = tagged   self.graphview.refresh(False, [], self.opts)   elif self._filter == "parents": - repo_parents = [x.rev() for x in self.repo.workingctx().parents()] + repo_parents = [x.rev() for x in self.repo.changectx(None).parents()]   self.opts['revs'] = [str(x) for x in repo_parents]   self.graphview.refresh(False, [], self.opts)   elif self._filter == "heads": @@ -417,7 +417,7 @@
  from backout import BackoutDialog   rev = self.currow[treemodel.REVID]   rev = short(self.repo.changelog.node(rev)) - parents = [x.node() for x in self.repo.workingctx().parents()] + parents = [x.node() for x in self.repo.changectx(None).parents()]   dialog = BackoutDialog(self.repo.root, rev)   dialog.set_transient_for(self)   dialog.show_all() @@ -503,7 +503,7 @@
    def _checkout(self, menuitem):   rev = self.currow[treemodel.REVID] - parents = [x.node() for x in self.repo.workingctx().parents()] + parents = [x.node() for x in self.repo.changectx(None).parents()]   dialog = UpdateDialog(self.cwd, rev)   dialog.set_transient_for(self)   dialog.show_all() @@ -512,13 +512,13 @@
  dialog.set_transient_for(None)     def checkout_completed(self, oldparents): - newparents = [x.node() for x in self.repo.workingctx().parents()] + newparents = [x.node() for x in self.repo.changectx(None).parents()]   if not oldparents == newparents:   self.reload_log()     def _merge(self, menuitem):   rev = self.currow[treemodel.REVID] - parents = [x.node() for x in self.repo.workingctx().parents()] + parents = [x.node() for x in self.repo.changectx(None).parents()]   node = short(self.repo.changelog.node(rev))   dialog = MergeDialog(self.repo.root, self.cwd, node)   dialog.set_transient_for(self) @@ -528,7 +528,7 @@
  dialog.set_transient_for(None)     def merge_completed(self, oldparents): - newparents = [x.node() for x in self.repo.workingctx().parents()] + newparents = [x.node() for x in self.repo.changectx(None).parents()]   if not oldparents == newparents:   self.reload_log()   @@ -573,7 +573,7 @@
    # disable/enable menus as required   parents = [self.repo.changelog.rev(x.node()) for x in - self.repo.workingctx().parents()] + self.repo.changectx(None).parents()]   can_merge = selrev not in parents and \   len(self.repo.heads()) > 1 and \   len(parents) < 2
Change 1 of 2 Show Entire File hggtk/​merge.py Stacked
 
140
141
142
143
 
144
145
146
 
160
161
162
163
 
164
165
166
 
140
141
142
 
143
144
145
146
 
160
161
162
 
163
164
165
166
@@ -140,7 +140,7 @@
  return None     # populate parent rev data - self._parents = [x.node() for x in self.repo.workingctx().parents()] + self._parents = [x.node() for x in self.repo.changectx(None).parents()]   self._parent_revs.set_sensitive(True)   self._parent_revs.set_text(", ".join([short(x) for x in self._parents]))   self._parent_revs.set_sensitive(False) @@ -160,7 +160,7 @@
    # populate revision data   heads = self.repo.heads() - tip = self.repo.changelog.node(nullrev+self.repo.changelog.count()) + tip = self.repo.changelog.node(nullrev+len(self.repo.changelog))   self._revlist.clear()   self._rev_input.set_text("")   for i, node in enumerate(heads):
Change 1 of 1 Show Entire File hggtk/​recovery.py Stacked
 
138
139
140
141
 
142
143
144
 
138
139
140
 
141
142
143
144
@@ -138,7 +138,7 @@
  except RepoError:   self.write("Unable to find repo at %s\n" % (self.root), False)   return - pl = repo.workingctx().parents() + pl = repo.changectx(None).parents()   cmd = ['update', '--clean', '--rev', str(pl[0].rev())]   self._exec_cmd(cmd, postfunc=self._notify)  
Change 1 of 1 Show Entire File hggtk/​revisions.py Stacked
 
108
109
110
111
 
112
113
114
 
108
109
110
 
111
112
113
114
@@ -108,7 +108,7 @@
  def tip(self, repo):   """ Show the tip revision """   repo.ui.pushbuffer() - cmdutil.show_changeset(repo.ui, repo, {}).show(nullrev+repo.changelog.count()) + cmdutil.show_changeset(repo.ui, repo, {}).show(nullrev+len(repo.changelog))   text = repo.ui.popbuffer()   return text  
Change 1 of 4 Show Entire File hggtk/​synch.py Stacked
 
42
43
44
45
 
46
47
48
 
218
219
220
221
 
222
223
224
 
226
227
228
229
 
230
231
232
 
235
236
237
238
 
239
240
241
242
243
244
245
 
246
247
248
 
42
43
44
 
45
46
47
48
 
218
219
220
 
221
222
223
224
 
226
227
228
 
229
230
231
232
 
235
236
237
 
238
239
240
241
242
243
244
 
245
246
247
248
@@ -42,7 +42,7 @@
  self.set_default_size(610, 400)     self.paths = self._get_paths() - self.origchangecount = self.repo.changelog.count() + self.origchangecount = len(self.repo.changelog)     # load the fetch extension explicitly   extensions.load(self.ui, 'fetch', None) @@ -218,7 +218,7 @@
  def update_buttons(self, *args):   self.buttonhbox.hide()   self.repo.invalidate() - tip = self.repo.changelog.count() + tip = len(self.repo.changelog)   if self.origchangecount == tip:   self.viewpulled.hide()   else: @@ -226,7 +226,7 @@
  self.viewpulled.show()     self.repo.dirstate.invalidate() - parent = self.repo.workingctx().parents()[0].rev() + parent = self.repo.changectx(None).parents()[0].rev()   if parent == tip-1:   self.updatetip.hide()   else: @@ -235,14 +235,14 @@
    def _view_pulled_changes(self, button):   from history import GLog - revs = (self.repo.changelog.count()-1, self.origchangecount) + revs = (len(self.repo.changelog)-1, self.origchangecount)   opts = {'revrange' : revs}   dialog = GLog(self.ui, self.repo, self.cwd, [], opts, False)   dialog.display()     def _update_to_tip(self, button):   self.repo.invalidate() - wc = self.repo.workingctx() + wc = self.repo.changectx(None)   pl = wc.parents()   p1, p2 = pl[0], self.repo.changectx('tip')   pa = p1.ancestor(p2)
Change 1 of 1 Show Entire File hggtk/​update.py Stacked
 
140
141
142
143
 
144
145
146
147
148
 
149
150
151
 
140
141
142
 
143
144
145
146
147
 
148
149
150
151
@@ -140,12 +140,12 @@
  return None     # populate parent rev data - self._parents = [x.node() for x in self.repo.workingctx().parents()] + self._parents = [x.node() for x in self.repo.changectx(None).parents()]   self._parent_revs.set_text(", ".join([short(x) for x in self._parents]))     # populate revision data   heads = self.repo.heads() - tip = self.repo.changelog.node(nullrev+self.repo.changelog.count()) + tip = self.repo.changelog.node(nullrev+len(self.repo.changelog))   self._revlist.clear()   for i, node in enumerate(heads):   status = "head %d" % (i+1)
Change 1 of 1 Show Entire File hggtk/​vis/​revgraph.py Stacked
 
90
91
92
93
 
94
95
96
 
90
91
92
 
93
94
95
96
@@ -90,7 +90,7 @@
  Graph the ancestry of a single file (log). Deletions show   up as breaks in the graph.   ''' - filerev = repo.file(path).count() - 1 + filerev = len(repo.file(path)) - 1   revs = []   rev_color = {}   nextcolor = 0
Change 1 of 1 Show Entire File hggtk/​vis/​treemodel.py Stacked
 
48
49
50
51
 
52
53
54
 
48
49
50
 
51
52
53
54
@@ -48,7 +48,7 @@
  gtk.GenericTreeModel.__init__(self)   self.revisions = {}   self.repo = repo - self.parents = [x.rev() for x in repo.workingctx().parents()] + self.parents = [x.rev() for x in repo.changectx(None).parents()]   self.heads = [repo.changelog.rev(x) for x in repo.heads()]   self.line_graph_data = graphdata   self.author_re = re.compile('<.*@.*>', 0)
Change 1 of 2 Show Entire File hggtk/​vis/​treeview.py Stacked
 
112
113
114
115
 
116
117
118
 
120
121
122
123
 
124
125
126
 
112
113
114
 
115
116
117
118
 
120
121
122
 
123
124
125
126
@@ -112,7 +112,7 @@
  node = b[pats]   start = self.repo.changelog.rev(node)   else: - start = self.repo.changelog.count() - 1 + start = len(self.repo.changelog) - 1   elif opts['revrange']:   if len(opts['revrange']) >= 2:   start, end = opts['revrange'] @@ -120,7 +120,7 @@
  start = opts['revrange'][0]   end = start   else: - start = self.repo.changelog.count() - 1 + start = len(self.repo.changelog) - 1   self.grapher = revision_grapher(self.repo, start, end, pats)   elif opts.get('revs', None):   self.grapher = dumb_log_generator(self.repo, opts['revs'])
Change 1 of 1 Show Entire File tortoise/​contextmenu.py Stacked
 
335
336
337
338
 
339
340
341
342
343
344
345
 
346
347
348
 
335
336
337
 
338
339
340
341
342
343
344
 
345
346
347
348
@@ -335,14 +335,14 @@
  self._update, icon="menucheckout.ico"))     can_merge = len(repo.heads()) > 1 and \ - len(repo.workingctx().parents()) < 2 + len(repo.changectx(None).parents()) < 2   result.append(TortoiseMenu(_("Merge Revisions"),   _("merge working directory with another revision"),   self._merge, icon="menumerge.ico",   state=can_merge))     # show un-merge menu per merge status of working directory - if len(repo.workingctx().parents()) > 1: + if len(repo.changectx(None).parents()) > 1:   result.append(TortoiseMenu(_("Undo Merge"),   _("Undo merge by updating to revision"),   self._merge, icon="menuunmerge.ico"))