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

hggtk: remove imports of mercurial.node

Changeset 4e6c43d2f3fa…

Parent fddc8aaccfda…

by Steve Borho

Changes to 4 files · Browse files at 4e6c43d2f3fa Showing diff from parent fddc8aaccfda Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​commit.py Stacked
 
14
15
16
17
18
19
20
 
682
683
684
685
686
687
 
688
689
690
 
14
15
16
 
17
18
19
 
681
682
683
 
 
 
684
685
686
687
@@ -14,7 +14,6 @@
 import tempfile  import cStringIO   -from mercurial.node import hex, nullrev  from mercurial import ui, hg, util, patch    from thgutil.i18n import _ @@ -682,9 +681,7 @@
  def _get_tip_rev(self, refresh=False):   if refresh:   self.repo.invalidate() - cl = self.repo.changelog - tip = cl.node(nullrev + len(cl)) - return hex(tip) + return self.repo['tip'].node()     def _get_qnew_name(self):   return self.qnew_name and self.qnew_name.get_text().strip() or ''
Change 1 of 2 Show Entire File hggtk/​gdialog.py Stacked
 
15
16
17
18
19
20
21
 
442
443
444
445
 
 
446
447
448
449
 
450
451
452
453
454
455
456
 
457
458
459
 
15
16
17
 
18
19
20
 
441
442
443
 
444
445
446
447
448
 
449
450
451
452
453
454
455
 
456
457
458
459
@@ -15,7 +15,6 @@
 import gtk  import atexit   -from mercurial.node import short  from mercurial import cmdutil, util, ui, hg, commands  from hgext import extdiff   @@ -442,18 +441,19 @@
  snapshot files as of some revision   (adapted from Extdiff extension)   ''' - mf = repo.changectx(node).manifest() + ctx = repo[node] + mf = ctx.manifest()   dirname = os.path.basename(repo.root)   if dirname == "":   dirname = "root" - dirname = '%s.%s' % (dirname, short(node)) + dirname = '%s.%s' % (dirname, str(ctx))   base = os.path.join(tmproot, dirname)   try:   os.mkdir(base)   except:   pass   ui.note(_('making snapshot of %d files from rev %s\n') % - (len(files), short(node))) + (len(files), str(ctx)))   for fn in files:   if not fn in mf:   # skipping new file after a merge ?
Change 1 of 3 Show Entire File hggtk/​tagadd.py Stacked
 
9
10
11
12
13
14
15
 
218
219
220
221
222
223
 
 
 
 
224
225
226
227
 
228
229
230
 
236
237
238
239
 
240
 
9
10
11
 
12
13
14
 
217
218
219
 
 
 
220
221
222
223
224
225
 
 
226
227
228
229
 
235
236
237
 
238
239
@@ -9,7 +9,6 @@
 import traceback    from mercurial import hg, ui, util -from mercurial.node import short, nullid    from thgutil.i18n import _  from thgutil import hglib @@ -218,13 +217,13 @@
  def _add_hg_tag(self, name, revision, message, local, user=None,   date=None, force=False):   if name in self.repo.tags() and not force: - raise util.Abort(_('a tag named "%s" already exists') - % name) - r = self.repo.changectx(revision).node() + raise util.Abort(_('a tag named "%s" already exists') % name) + + ctx = self.repo[revision] + r = ctx.node()     if not message: - message = _('Added tag %s for changeset %s') % (name, short(r)) - + message = _('Added tag %s for changeset %s') % (name, str(ctx))   if name in self.repo.tags() and not force:   raise util.Abort(_("Tag '%s' already exist") % name)   @@ -236,5 +235,5 @@
    if not message:   message = _('Removed tag %s') % name - r = self.repo.changectx(nullid).node() + r = self.repo[-1].node()   self.repo.tag(name, r, message, local, user, date)
Change 1 of 2 Show Entire File hggtk/​visdiff.py Stacked
 
15
16
17
18
19
20
21
 
34
35
36
37
 
38
39
40
 
15
16
17
 
18
19
20
 
33
34
35
 
36
37
38
39
@@ -15,7 +15,6 @@
 import shutil  import tempfile   -from mercurial.node import short  from mercurial import hg, ui, cmdutil, util    from thgutil.i18n import _ @@ -34,7 +33,7 @@
  dirname = os.path.basename(repo.root)   if dirname == "":   dirname = "root" - dirname = '%s.%s' % (dirname, short(node)) + dirname = '%s.%s' % (dirname, str(repo[node]))   base = os.path.join(tmproot, dirname)   os.mkdir(base)   ctx = repo[node]