Merge lp://staging/~thisfred/u1db/combine-mapping-1 into lp://staging/u1db
Proposed by
Eric Casteleijn
| Status: | Rejected |
|---|---|
| Rejected by: | Eric Casteleijn |
| Proposed branch: | lp://staging/~thisfred/u1db/combine-mapping-1 |
| Merge into: | lp://staging/u1db |
| Diff against target: |
286 lines (+168/-34) 4 files modified
CMakeLists.txt (+5/-0) u1db/query_parser.py (+94/-34) u1db/tests/test_backends.py (+28/-0) u1db/tests/test_query_parser.py (+41/-0) |
| To merge this branch: | bzr merge lp://staging/~thisfred/u1db/combine-mapping-1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Changed the Python query parser to be a little more versatile. It now allows for arbitrary numbers and types of arguments, which combine() will need.
Description of the change
Changed the Python query parser to be a little more versatile. It now allows for arbitrary numbers and types of arguments, which combine() will need.
Next step: do the same for C, which will definitely be a more interesting challenge.
To post a comment you must log in.
Revision history for this message
| Eric Casteleijn (thisfred) wrote | # |
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Rejecting this, in favor of newer branch.