Zapamiętywanie proporcji paneli.

[redakcja.git] / lib / hg.py

diff --git a/lib/hg.py b/lib/hg.py
index a2702f6..2b885b3 100644 (file)
--- a/lib/hg.py
+++ b/lib/hg.py
@@ -3,10 +3,8 @@ import os
 import codecs
 from mercurial import localrepo, ui, error, match, node, encoding
 
 import codecs
 from mercurial import localrepo, ui, error, match, node, encoding
 

-

 encoding.encoding = 'utf-8'
 
 encoding.encoding = 'utf-8'
 

-

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


@@ -75,7 +73,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:


@@ -97,6 +95,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


@@ -107,4 +108,22 @@ class Repository(object):
             # reread keys
             # self._keys = self.get_persisted_objects_keys()
             # return node.hex(rev)
             # reread keys
             # self._keys = self.get_persisted_objects_keys()
             # return node.hex(rev)

-            
\ No newline at end of file
+
+    def in_branch(self, branch_name, action):
+        wlock = self.repo.wlock()
+        try:
+            current_branch = self.repo[None].branch()
+            self.repo.dirstate.setbranch(branch_name)
+            try:
+                # do some stuff
+                action()
+            finally:
+                self.repo.dirstate.setbranch(current_branch)
+        finally:
+            wlock.release()
+
+    def write_lock(self):
+        """Returns w write lock to the repository."""
+        return self.repo.wlock()
+
+