Bazaar

Merge lp:~jeanfrancois.roy/bzr/url-safe-escape into lp:~bzr/bzr/trunk-old

  1. url-safe-escape
  2. Merge into trunk-old
Proposed by Jean-Francois Roy
Status: Rejected
Rejected by: John A Meinel
Proposed branch: lp:~jeanfrancois.roy/bzr/url-safe-escape
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 15 lines (has conflicts) 
Text conflict in bzrlib/urlutils.py
To merge this branch: bzr merge lp:~jeanfrancois.roy/bzr/url-safe-escape
Reviewer Review Type Date Requested Status
Andrew Bennetts Disapprove
Review via email: mp+3417@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jean-Francois Roy (jeanfrancois.roy) wrote :

This branch amends urlutils.escape to use urlutils._url_safe_characters as the set of characters that are safe. I have tested it using a patch to loggerhead redirecting all URL escaping and unescaping to urlutils.

It is a minor change which improves the usability of Bazaar.

Revision history for this message
Andrew Bennetts (spiv) wrote :

A more correct fix by jml has landed in bzr.dev.

review: Disapprove

Unmerged revisions

3984. By Jean-Francois Roy <email address hidden>

urlutils.escape now specifies urlutils._url_safe_characters as the list of safe characters to urllib.quote.

3983. By Canonical.com Patch Queue Manager <email address hidden>

(vila) Progress bar at socket level for http

3982. By Canonical.com Patch Queue Manager <email address hidden>

(mbp) better and less redundant debug flag docs

3981. By Canonical.com Patch Queue Manager <email address hidden>

Add client and server APIs for streamed request bodies.

3980. By Canonical.com Patch Queue Manager <email address hidden>

Workaround a bug in pdb.post_mortem. (Andrew Bennetts)

3979. By Canonical.com Patch Queue Manager <email address hidden>

(robertc) Use a list not a tuple for chunks returned from
 FullTextContentFactory objects,
 because otherwise code tries to assign to tuples. (Robert Collins)

3978. By Canonical.com Patch Queue Manager <email address hidden>

Faster log (Ian Clatworthy)

3977. By Canonical.com Patch Queue Manager <email address hidden>

(thumper) Refactor patch stat generation to make int values
 accessible.

3976. By Canonical.com Patch Queue Manager <email address hidden>

add stop-rule to iter_merge_sorted_revisions() (Ian Clatworthy)

3975. By Canonical.com Patch Queue Manager <email address hidden>

(Jelmer) Support symlinks with unicode characters in the symlink name.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/urlutils.py'
2--- bzrlib/urlutils.py 2009-03-23 14:59:43 +0000
3+++ bzrlib/urlutils.py 2009-03-24 21:35:31 +0000
4@@ -68,7 +68,11 @@
5 relpath = relpath.encode('utf-8')
6 # After quoting and encoding, the path should be perfectly
7 # safe as a plain ASCII string, str() just enforces this
8+<<<<<<< TREE
9 return str(urllib.quote(relpath, safe='/~'))
10+=======
11+ return str(urllib.quote(relpath, ''.join(_url_safe_characters)))
12+>>>>>>> MERGE-SOURCE
13
14
15 def file_relpath(base, path):