From: zuber <marek@stepniowski.com>
Date: Tue, 22 Sep 2009 10:20:49 +0000 (+0200)
Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/bc0fad2273183ef161248876a961dd31e4b250fb?hp=9a761497081506a237bcec3319f2608ea7fb4004

Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
---

diff --git a/apps/toolbar/fixtures/przyciski.xml b/apps/toolbar/fixtures/przyciski.xml
index f359d669..8dc5f27a 100755
--- a/apps/toolbar/fixtures/przyciski.xml
+++ b/apps/toolbar/fixtures/przyciski.xml
@@ -148,7 +148,7 @@
   <object pk="4" model="toolbar.button">
     <field type="CharField" name="label">Podstawowa</field>
     <field type="SlugField" name="slug">basic_correction</field>
-    <field type="TextField" name="params">[["fulltextregexp", {"exprs": [["\ufeff", ""], ["$[\\s]*\\d+[\\s]*^", ""], ["-\\s*^", ""], ["\\,\\.\\.|\\.\\,\\.|\\.\\.\\,", "..."]]}], ["lineregexp", {"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+|\\s+(\")", "$1"], ["(\\d)[\u2014-](\\d)", "$1--$2"], ["\u2014", "---"], ["&lt;(/?)P([aert])", "&lt;$1p$2"], ["([^\\.])(\\s*)&lt;/p", "$1.$2&lt;/p"]]}]]</field>
+    <field type="TextField" name="params">[["fulltextregexp", {"exprs": [["\ufeff", ""], ["$[\\s]*\\d+[\\s]*^", ""], ["-\\s*^", ""], ["\\,\\.\\.|\\.\\,\\.|\\.\\.\\,", "..."]]}], ["lineregexp", {"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+|\\s+(\")", "$1"], ["(\\d)[\u2014-](\\d)", "$1--$2"], ["\u2014", "---"], ["&lt;(/?)P([aert])", "&lt;$1p$2"], ["([^\\.])(\\s*)&lt;/p", "$1.$2&lt;/p"], ["([,\\.:;!\\?])([^\\s\\\\])", "$1 $2"], ["([^\\s])\\s+([,\\.:;!\\?])", "$1$2"]]}]]</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">macro</field>
     <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
@@ -990,7 +990,7 @@
   <object pk="2" model="toolbar.button">
     <field type="CharField" name="label">Zamień dywiz</field>
     <field type="SlugField" name="slug">zamien_dywiz</field>
-    <field type="TextField" name="params">{"exprs": [["(\\s)-(\\s)", "$1---$2"], ["^(\\s*)-(\\s)", "$1---$2"], ["(\\s)-(\\s*)$", "$1---$2"], ["(\\d)[\u2014-](\\d)", "$1--$2"], ["\u2014", "---"]]}</field>
+    <field type="TextField" name="params">{"exprs": [["(\\s)-(\\s)", "$1---$2"], ["^(\\s*)-(\\s)", "$1---$2"], ["(\\s)-(\\s*)$", "$1---$2"], ["(\\d)[\u2014\u2013\u2010-](\\d)", "$1--$2"], ["\u2014\u2013\u2010", "---"]]}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
     <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
@@ -1015,39 +1015,49 @@
   </object>
   <object pk="insert_tag" model="toolbar.scriptlet">
     <field type="TextField" name="code">var texteditor = panel.texteditor;
-
 var text = texteditor.selection();
-
-var out = '&lt;'+params.tag;
-
+var start_tag = '&lt;'+params.tag;
 for (var attr in params.attrs) {
-
-    out += ' '+attr+'="' + params.attrs[attr] + '"';
-
+    start_tag += ' '+attr+'="' + params.attrs[attr] + '"';
 };
+start_tag += '&gt;';
+var end_tag = '&lt;/'+params.tag+'&gt;';
+
+if(text.length &gt; 0) {
+// tokenize
+var output = ''
+var token = ''
+for(var index=0; index &lt; text.length; index++)
+{
+    if (text[index].match(/\s/)) { // whitespace
+        token += text[index];
+    }
+    else { // character
+        output += token;
+        if(output == token) output += start_tag;
+        token = ''
+        output += text[index];
+    }
+}
 
-out += '&gt;';
-
-out += text;
-
-out += '&lt;/' + params.tag + '&gt;';
-
- 
-
-texteditor.replaceSelection(out);
-
+if( output[output.length-1] == '\\' ) {
+    output = output.substr(0, output.length-1) + end_tag + '\\';
+} else {
+    output += end_tag;
+}
+output += token;
+}
+else {
+ output = start_tag + end_tag;
+}
 
+texteditor.replaceSelection(output);
 
 if (text.length == 0) {
-
     var pos = texteditor.cursorPosition();
-
     texteditor.selectLines(pos.line, pos.character + params.tag.length + 2);
-
 }
 
-
-
 panel.fireEvent('contentChanged');</field>
   </object>
   <object pk="lineregexp" model="toolbar.scriptlet">
diff --git a/lib/wlrepo/backend_mercurial.py b/lib/wlrepo/backend_mercurial.py
index 12711222..11ecfc79 100644
--- a/lib/wlrepo/backend_mercurial.py
+++ b/lib/wlrepo/backend_mercurial.py
@@ -161,6 +161,9 @@ class MercurialLibrary(wlrepo.Library):
 
     def _filectx(self, fileid, branchid):
         return self._hgrepo.filectx(fileid, changeid=branchid)
+
+    def _changectx(self, nodeid):
+        return self._hgrepo.changectx(nodeid)
     
     #
     # BASIC BRANCH routines
@@ -239,7 +242,7 @@ class MercurialCabinet(wlrepo.Cabinet):
         if selector is not None:
             raise NotImplementedException()
 
-        return MercurialShelf(self, self._hgtip())
+        return MercurialShelf(self, self._library._changectx(self._branchname))
 
     def documents(self):        
         return self._execute_in_branch(action=lambda l, c: (e[1] for e in l._filelist()))
@@ -432,17 +435,20 @@ class MercurialDocument(wlrepo.Document):
 
 class MercurialShelf(wlrepo.Shelf):
 
-    def __init__(self, cabinet, revision):
+    def __init__(self, cabinet, changectx):
         super(MercurialShelf, self).__init__(cabinet)
-        self._revision = revision
+        self._changectx = changectx        
 
     @property
     def _rev(self):
-        return _revision
+        return self._changectx.node()
 
     def __str__(self):
-        return to_hex(self._revision)
+        return self._changectx.hex()
+
 
+    def ancestorof(self, other):
+        pass
 
 class MergeStatus(object):
     def __init__(self, mstatus):