← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Robert Collins
  • Date: 2009-03-27 04:10:25 UTC
  • mfrom: (4208 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4216.
  • Revision ID: robertc@robertcollins.net-20090327041025-rgutx4q03xo4pq6l
Resolve NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import difflib
18
18
import os
41
41
""")
42
42
 
43
43
from bzrlib.symbol_versioning import (
44
 
        deprecated_function,
45
 
        one_three
46
 
        )
 
44
    deprecated_function,
 
45
    )
47
46
from bzrlib.trace import mutter, note, warning
48
47
 
49
48
 
441
440
    return timestamp.format_patch_date(mtime)
442
441
 
443
442
 
444
 
@deprecated_function(one_three)
445
 
def get_prop_change(meta_modified):
446
 
    if meta_modified:
447
 
        return " (properties changed)"
448
 
    else:
449
 
        return  ""
450
 
 
451
443
def get_executable_change(old_is_x, new_is_x):
452
444
    descr = { True:"+x", False:"-x", None:"??" }
453
445
    if old_is_x != new_is_x: