← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-05 19:12:37 UTC
  • mfrom: (3449.4.2 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080605191237-2306x0goo9pfh9to
(Lukáš Lalinský) Sanitize nick before using it as a patch filename for bzr send.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
148
148
        else:
149
149
            revno = branch.get_revision_id_to_revno_map().get(self.revision_id,
150
150
                ['merge'])
151
 
        return '%s-%s' % (branch.nick, '.'.join(str(n) for n in revno))
 
151
        nick = re.sub('(\W+)', '-', branch.nick).strip('-')
 
152
        return '%s-%s' % (nick, '.'.join(str(n) for n in revno))
152
153
 
153
154
    @staticmethod
154
155
    def _generate_diff(repository, revision_id, ancestor_id):