← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-06 06:48:25 UTC
  • mfrom: (4070.8.6 debug-config)
  • Revision ID: pqm@pqm.ubuntu.com-20090306064825-kbpwggw21dygeix6
(mbp) debug_flags configuration option

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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
 
    )
 
44
        deprecated_function,
 
45
        one_three
 
46
        )
46
47
from bzrlib.trace import mutter, note, warning
47
48
 
48
49
 
367
368
            if view_files:
368
369
                specific_files = view_files
369
370
                view_str = views.view_display_str(view_files)
370
 
                note("*** Ignoring files outside view. View is %s" % view_str)
 
371
                note("*** ignoring files outside view: %s" % view_str)
371
372
 
372
373
    # Get extra trees that ought to be searched for file-ids
373
374
    extra_trees = None
440
441
    return timestamp.format_patch_date(mtime)
441
442
 
442
443
 
 
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
 
443
451
def get_executable_change(old_is_x, new_is_x):
444
452
    descr = { True:"+x", False:"-x", None:"??" }
445
453
    if old_is_x != new_is_x: