style.py (5747:ffded3077c63) style.py (5792:72c3f3e914c1)
1#! /usr/bin/env python
2# Copyright (c) 2006 The Regents of The University of Michigan
3# Copyright (c) 2007 The Hewlett-Packard Development Company
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 290 unchanged lines hidden (view full) ---

299 if ui.verbose:
300 ui.write(">>%s<<\n" % line[-1])
301 ok = False
302
303 if not ok:
304 if prompt(fname):
305 return True
306
1#! /usr/bin/env python
2# Copyright (c) 2006 The Regents of The University of Michigan
3# Copyright (c) 2007 The Hewlett-Packard Development Company
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 290 unchanged lines hidden (view full) ---

299 if ui.verbose:
300 ui.write(">>%s<<\n" % line[-1])
301 ok = False
302
303 if not ok:
304 if prompt(fname):
305 return True
306
307 wctx = repo.workingctx()
307 try:
308 wctx = repo.workingctx()
309 except:
310 from mercurial import context
311 wctx = context.workingctx(repo)
312
308 for fname in modified:
309 if skip(fname):
310 continue
311
312 if not whitespace_file(fname):
313 continue
314
315 fctx = wctx.filectx(fname)

--- 130 unchanged lines hidden --- 		313 for fname in modified:
314 if skip(fname):
315 continue
316
317 if not whitespace_file(fname):
318 continue
319
320 fctx = wctx.filectx(fname)

--- 130 unchanged lines hidden ---