Bazaar GTK+ Frontends

Merge lp://staging/~toshio/bzr-gtk/handle-dirty-patches into lp://staging/bzr-gtk/gtk2

  1. handle-dirty-patches
  2. Merge into gtk2
Proposed by Toshio Kuratomi
Status: Merged
Merge reported by: Jelmer Vernooij
Merged at revision: not available
Proposed branch: lp://staging/~toshio/bzr-gtk/handle-dirty-patches
Merge into: lp://staging/bzr-gtk/gtk2
Diff against target: 37 lines (+4/-3)
2 files modified
bzr-handle-patch (+1/-1)
diff.py (+3/-2)
To merge this branch: bzr merge lp://staging/~toshio/bzr-gtk/handle-dirty-patches
Reviewer Review Type Date Requested Status
Bazaar GTK maintainers Pending
Review via email: mp+18856@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Toshio Kuratomi (toshio) wrote :

Fix for traceback when applying a patch that has non-patch content. Need to have a fix applied to bzrlib before this is applied.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

We shouldn't pass allow_dirty to parse_patches() unless the version of bzr is recent enough.

Revision history for this message
Toshio Kuratomi (toshio) wrote :

Updated. I used inspect.getargspec() as it seems more pythonic to check that the function we're calling supports the argument. We could compare to bzrlib.version_info instead if you don't like inspect but the fix doesn't show up in bzrlib until 2.2b1.

Revision history for this message
Toshio Kuratomi (toshio) wrote :

"doesn't show up in bzrlib until 2.2b1."... so distributions that backport the fix to bzr-2.0.x or 2.1.x would need to patch this section of code disable the version check. Whereas using getargspec() will just work if the fix is backported.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I can live with getargspec. I'll merge, sorry about the delay.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Nevermind, it was already merged :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: