Ponowne dodanie możliwości zmieniania wielkości paneli. Tym razem działa dużo lepiej...

[redakcja.git] / lib / hg.py

diff --git a/lib/hg.py b/lib/hg.py
index 535707d..d8b4679 100644 (file)
--- a/lib/hg.py
+++ b/lib/hg.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 import os
 import codecs
 # -*- coding: utf-8 -*-
 import os
 import codecs

-from mercurial import localrepo, ui, error, match, node
+from mercurial import localrepo, ui, error, match, node, encoding
+
+
+encoding.encoding = 'utf-8'

 
 
 class RepositoryDoesNotExist(Exception):
 
 
 class RepositoryDoesNotExist(Exception):


@@ -48,7 +51,7 @@ class Repository(object):
         if path not in self._pending_files:
             self._pending_files.append(path)
     
         if path not in self._pending_files:
             self._pending_files.append(path)
     

-    def commit(self, message='hgshelve auto commit', key=None, user=None):
+    def commit(self, message=u'hgshelve auto commit', key=None, user=None):

         """
         Commit unsynchronized data to disk.
         Arguments::
         """
         Commit unsynchronized data to disk.
         Arguments::


@@ -56,6 +59,11 @@ class Repository(object):
          - message: mercurial's changeset message
          - key: supply to sync only one key
         """
          - message: mercurial's changeset message
          - key: supply to sync only one key
         """

+        if isinstance(message, unicode):
+            message = message.encode('utf-8')
+        if isinstance(user, unicode):
+            user = user.encode('utf-8')
+        

         commited = False
         rev = None
         files_to_add = []
         commited = False
         rev = None
         files_to_add = []


@@ -67,7 +75,7 @@ class Repository(object):
             # will commit all keys
             pending_files = self._pending_files
         else:
             # will commit all keys
             pending_files = self._pending_files
         else:

-            if key not in self._pending_files:
+            if keys not in self._pending_files:

                 # key isn't changed
                 return None
             else:
                 # key isn't changed
                 return None
             else:


@@ -89,6 +97,9 @@ class Repository(object):
             self.repo.forget(files_to_remove)
         # ---- hg commit
         if files_to_commit:
             self.repo.forget(files_to_remove)
         # ---- hg commit
         if files_to_commit:

+            for i, f in enumerate(files_to_commit):
+                if isinstance(f, unicode):
+                    files_to_commit[i] = f.encode('utf-8')

             matcher = match.match(self.repo.root, self.repo.root, files_to_commit, default='path')
             rev = self.repo.commit(message, user=user, match=matcher)
             commited = True
             matcher = match.match(self.repo.root, self.repo.root, files_to_commit, default='path')
             rev = self.repo.commit(message, user=user, match=matcher)
             commited = True