Reverted toolbar/admin.py to previous state.

[redakcja.git] / lib / hg.py

diff --git a/lib/hg.py b/lib/hg.py
index 60e9f80..9e08e51 100644 (file)
--- a/lib/hg.py
+++ b/lib/hg.py
@@ -35,96 +35,31 @@ class Repository(object):
             return localrepo.localrepository(self.ui, path, create=1)
         raise RepositoryDoesNotExist("Repository %s does not exist." % path)
         
             return localrepo.localrepository(self.ui, path, create=1)
         raise RepositoryDoesNotExist("Repository %s does not exist." % path)
         

-    def all_files(self, branch='default'):
-        return self.in_branch(lambda: self._all_files(), branch)
+    def file_list(self, branch):
+        return self.in_branch(lambda: self._file_list(), branch)

 
 

-    def _all_files(self):
+    def _file_list(self):

         return list(self.repo[None])
     
         return list(self.repo[None])
     

-    def get_file(self, path, branch='default'):
+    def get_file(self, path, branch):

         return self.in_branch(lambda: self._get_file(path), branch)
 
     def _get_file(self, path):
         return self.repo.wread(path)
     
         return self.in_branch(lambda: self._get_file(path), branch)
 
     def _get_file(self, path):
         return self.repo.wread(path)
     

-    def add_file(self, path, value, branch='default'):
+    def add_file(self, path, value, branch):

         return self.in_branch(lambda: self._add_file(path, value), branch)
 
     def _add_file(self, path, value):
         return self.repo.wwrite(path, value.encode('utf-8'), [])
         return self.in_branch(lambda: self._add_file(path, value), branch)
 
     def _add_file(self, path, value):
         return self.repo.wwrite(path, value.encode('utf-8'), [])

-#        f = codecs.open(os.path.join(self.real_path, path), 'w', encoding='utf-8')
-#        f.write(value)
-#        f.close()
-#        if path not in self._pending_files:
-#            self._pending_files.append(path)

 
 

-    def _commit(self, message, user=None, key=None):
+    def _commit(self, message, user=None):

         return self.repo.commit(text=message, user=user)
     
         return self.repo.commit(text=message, user=user)
     

-    def _commit2(self, message, key=None, user=None):
-        """
-        Commit unsynchronized data to disk.
-        Arguments::
-
-         - 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 = []
-        files_to_remove = []
-        files_to_commit = []
-
-        # first of all, add absent data and clean removed
-        if key is None:
-            # will commit all keys
-            pending_files = self._pending_files
-        else:
-            if keys not in self._pending_files:
-                # key isn't changed
-                return None
-            else:
-                pending_files = [key]
-        for path in pending_files:
-            files_to_commit.append(path)
-            if path in self.all_files():
-                if not os.path.exists(os.path.join(self.real_path, path)):
-                    # file removed
-                    files_to_remove.append(path)
-            else:
-                # file added
-                files_to_add.append(path)
-        # hg add
-        if files_to_add:
-            self.repo.add(files_to_add)
-        # hg forget
-        if files_to_remove:
-            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
-        # clean pending keys
-        for key in pending_files:
-            self._pending_files.remove(key)
-        # if commited:
-            # reread keys
-            # self._keys = self.get_persisted_objects_keys()
-            # return node.hex(rev)
-
-    def commit(self, message, key=None, user=None, branch='default'):
+    def commit(self, message, branch, user=None):

         return self.in_branch(lambda: self._commit(message, key=key, user=user), branch)
 
         return self.in_branch(lambda: self._commit(message, key=key, user=user), branch)
 

-    def in_branch(self, action, bname='default'):
+    def in_branch(self, action, bname):

         wlock = self.repo.wlock()
         try:
             old = self._switch_to_branch(bname)
         wlock = self.repo.wlock()
         try:
             old = self._switch_to_branch(bname)


@@ -136,14 +71,30 @@ class Repository(object):
         finally:
             wlock.release()
 
         finally:
             wlock.release()
 

-    def _switch_to_branch(self, bname):
+    def _switch_to_branch(self, bname, create=True):

         wlock = self.repo.wlock()
         try:
             current = self.repo[None].branch()
             if current == bname:
                 return current
         wlock = self.repo.wlock()
         try:
             current = self.repo[None].branch()
             if current == bname:
                 return current

+            try:
+                tip = self.repo.branchtags()[bname]
+            except KeyError, ke:
+                if not create: raise ke
+                
+                # create the branch on the fly
+
+                # first switch to default branch
+                default_tip = self.repo.branchtags()['default']
+                mercurial.merge.update(self.repo, default_tip, False, True, None)
+
+                # set the dirstate to new branch
+                self.repo.dirstate.setbranch(bname)
+                self._commit('Initial commit for automatic branch "%s".' % bname, user="django-admin")
+
+                # collect the new tip
+                tip = self.repo.branchtags()[bname]

 
 

-            tip = self.repo.branchtags()[bname]

             upstats = mercurial.merge.update(self.repo, tip, False, True, None)
             return current
         except KeyError, ke:
             upstats = mercurial.merge.update(self.repo, tip, False, True, None)
             return current
         except KeyError, ke: