/docs/MyDocs

To get this branch, use:
bzr branch http://darksoft.org/webbzr/docs/MyDocs

« back to all changes in this revision

Viewing changes to Development/autotools/trac/fixes/0.10/trac-bazaar-ds-escape.patch

  • Committer: Suren A. Chilingaryan
  • Date: 2009-04-09 03:21:08 UTC
  • Revision ID: csa@dside.dyndns.org-20090409032108-w4edamdh4adrgdu3
import

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -dPNur trunk-new/tracbzr/backend.py trunk-ds/tracbzr/backend.py
 
2
--- trunk-new/tracbzr/backend.py        2008-04-04 14:12:05.000000000 +0000
 
3
+++ trunk-ds/tracbzr/backend.py 2008-04-04 14:18:44.000000000 +0000
 
4
@@ -158,7 +158,7 @@
 
5
         """
 
6
         if branch is None:
 
7
             # No "safe" chars (make sure "/" is escaped)
 
8
-            return self._escape(revid)
 
9
+            return self._escape(revid, ':')
 
10
         relpath = self.branch_path(branch)
 
11
         try:
 
12
             return '%s,%s' % (urllib.quote(relpath, ':'),
 
13
@@ -173,8 +173,8 @@
 
14
                 return self._escape(revid, ':')
 
15
 
 
16
     @staticmethod
 
17
-    def _escape(string):
 
18
-        return urllib.quote(string, '')
 
19
+    def _escape(string, safe=''):
 
20
+        return urllib.quote(string, safe)
 
21
 
 
22
     @staticmethod
 
23
     def _string_rev_revid(relpath, revid):
 
24
@@ -1105,7 +1105,7 @@
 
25
            else:
 
26
                neighbor = bzr_repo.get_changeset(neighbor_revid).revision
 
27
                self.revision.timestamp = neighbor.timestamp
 
28
-               versioncontrol.Changeset.__init__(self, urllib.quote(revid),
 
29
+               versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(branch, revid),
 
30
                                             '', '', self.revision.timestamp)
 
31
         else:
 
32
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)