← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
 
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
 
1
# Copyright (C) 2005-2010 Canonical Ltd.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
from bzrlib import (
32
32
    branch as _mod_branch,
33
33
    bzrdir,
34
 
    commands,
 
34
    cmdline,
35
35
    errors,
36
36
    osutils,
37
37
    patiencediff,
683
683
    @classmethod
684
684
    def from_string(klass, command_string, old_tree, new_tree, to_file,
685
685
                    path_encoding='utf-8'):
686
 
        command_template = commands.shlex_split_unicode(command_string)
 
686
        command_template = cmdline.split(command_string)
687
687
        if '@' not in command_string:
688
688
            command_template.extend(['@old_path', '@new_path'])
689
689
        return klass(command_template, old_tree, new_tree, to_file,