commit 15bfa564b9db08fb277a343a3d0a01d377800606 Author: Matthew Wang Date: Thu Jan 31 15:27:17 2013 +0800   Default width is now 80  diff --git a/src/cdiff.py b/src/cdiff.py index 13f725f..bf15ef1 100755 --- a/src/cdiff.py +++ b/src/cdiff.py @@ -128,9 +128,7 @@ class Diff(object): 128  yield self._markup_common(' ' + old[1]) 128  yield self._markup_common(' ' + old[1]) 129  129  130  def markup_side_by_side(self, width): 130  def markup_side_by_side(self, width): 131  """width of 0 means infinite width, None means auto detect. Returns a 131  """Returns a generator""" 132  generator   133  """   134  def _normalize(line): 132  def _normalize(line): 135  return line.replace('\t', ' ' * 8).replace('\n', '') 133  return line.replace('\t', ' ' * 8).replace('\n', '') 136  134  @@ -147,7 +145,8 @@ class Diff(object): 147  return markup 145  return markup 148  146  149  # Setup line width and number width 147  # Setup line width and number width 150  if not width: width = 80 148  if width <= 0:   149  width = 80 151  (start, offset) = self._hunks[-1].get_old_addr() 150  (start, offset) = self._hunks[-1].get_old_addr() 152  max1 = start + offset - 1 151  max1 = start + offset - 1 153  (start, offset) = self._hunks[-1].get_new_addr() 152  (start, offset) = self._hunks[-1].get_new_addr() @@ -430,13 +429,10 @@ if __name__ == '__main__': 430  parser = optparse.OptionParser(usage) 429  parser = optparse.OptionParser(usage) 431  parser.add_option('-s', '--side-by-side', action='store_true', 430  parser.add_option('-s', '--side-by-side', action='store_true', 432  help=('show in side-by-side mode')) 431  help=('show in side-by-side mode')) 433  parser.add_option('-w', '--width', type='int', default=None, 432  parser.add_option('-w', '--width', type='int', default=80, 434  help='set line width (side-by-side mode only)') 433  help='set line width (side-by-side mode only), default is 80') 435  opts, args = parser.parse_args() 434  opts, args = parser.parse_args() 436    437  if opts.width and opts.width < 0:   438  opts.width = 0   439  435  440  if len(args) >= 1: 436  if len(args) >= 1: 441  diff_hdl = open(args[0], 'r') 437  diff_hdl = open(args[0], 'r') 442  elif sys.stdin.isatty(): 438  elif sys.stdin.isatty():