Commits

Henrik Stuart committed 620025e

misc fixes to support hg 2.1-rc

  • Participants
  • Parent commits ea59c4d
  • Branches hgtk-default

Comments (0)

Files changed (5)

tortoisehg/hgtk/hgignore.py

         try:
             f = util.atomictempfile(self.ignorefile, 'wb',
                                     createmode=None)
-            f.writelines(out)
+            f.write(''.join(out))
             f.close()
         except EnvironmentError, e:
             dialog.error_dialog(self, _('Unable to write .hgignore file'),

tortoisehg/hgtk/history.py

         dialog.connect('destroy', refresh)
         self.show_dialog(dialog)
 
-    def current_bookmark(self, menuitem):
-        oldlen = len(self.repo)
-        oldbookmarks = self.repo._bookmarks
-        oldcurrent = self.repo._bookmarkcurrent
-        rev = str(self.currevid)
-        bmark = self.get_rev_tag(rev, include=oldbookmarks)
-
-        def refresh(*args):
-            self.refresh_on_current_marker_change(oldlen, oldbookmarks, oldcurrent,
-                                                  self.repo._bookmarks,
-                                                  self.repo._bookmarkcurrent)
-
-        dialog = bookmark.BookmarkDialog(self.repo, bookmark.TYPE_CURRENT,
-                                         bmark, rev)
-        dialog.connect('destroy', refresh)
-        self.show_dialog(dialog)
-
     def bisect_reset(self, menuitem):
         commands.bisect(ui=self.ui,
                         repo=self.repo,

tortoisehg/util/cachethg.py

         for p in excs.split(';'):
             path = p.strip()
             if path:
-                excludepath.append(path)
+                excludepaths.append(path)
     except EnvironmentError:
         pass
 except ImportError:

tortoisehg/util/hglib.py

     (change e764f24a45ee in mercurial).
     '''
 
-    try:
-        return cmdutil.export(repo, revs, template, fp, switch_parent, opts)
-    except AttributeError:
-        from mercurial import patch
-        return patch.export(repo, revs, template, fp, switch_parent, opts)
+    return cmdutil.export(repo, revs, template, fp, switch_parent, opts)

tortoisehg/util/prej.py

 # Where possible, it has been tied back into the current Mercurial
 # sources.
 
+import sys
+
 from mercurial.i18n import _
 from mercurial import demandimport
 demandimport.disable()