cdiff.py 28KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791
  1. #!/usr/bin/env python
  2. # -*- coding: utf-8 -*-
  3. """
  4. Term based tool to view *colored*, *incremental* diff in a *Git/Mercurial/Svn*
  5. workspace or from stdin, with *side by side* and *auto pager* support. Requires
  6. python (>= 2.5.0) and ``less``.
  7. """
  8. META_INFO = {
  9. 'version' : '0.9.6',
  10. 'license' : 'BSD-3',
  11. 'author' : 'Matthew Wang',
  12. 'email' : 'mattwyl(@)gmail(.)com',
  13. 'url' : 'https://github.com/ymattw/cdiff',
  14. 'keywords' : 'colored incremental side-by-side diff',
  15. 'description' : ('View colored, incremental diff in a workspace or from '
  16. 'stdin, with side by side and auto pager support')
  17. }
  18. import sys
  19. if sys.hexversion < 0x02050000:
  20. raise SystemExit("*** Requires python >= 2.5.0") # pragma: no cover
  21. # Python < 2.6 does not have next()
  22. try:
  23. next
  24. except NameError:
  25. def next(obj): return obj.next()
  26. import os
  27. import re
  28. import signal
  29. import subprocess
  30. import select
  31. import difflib
  32. try:
  33. unicode
  34. except NameError:
  35. unicode = str
  36. COLORS = {
  37. 'reset' : '\x1b[0m',
  38. 'underline' : '\x1b[4m',
  39. 'reverse' : '\x1b[7m',
  40. 'red' : '\x1b[31m',
  41. 'green' : '\x1b[32m',
  42. 'yellow' : '\x1b[33m',
  43. 'blue' : '\x1b[34m',
  44. 'magenta' : '\x1b[35m',
  45. 'cyan' : '\x1b[36m',
  46. 'lightred' : '\x1b[1;31m',
  47. 'lightgreen' : '\x1b[1;32m',
  48. 'lightyellow' : '\x1b[1;33m',
  49. 'lightblue' : '\x1b[1;34m',
  50. 'lightmagenta' : '\x1b[1;35m',
  51. 'lightcyan' : '\x1b[1;36m',
  52. }
  53. # Keys for revision control probe, diff and log with diff
  54. VCS_INFO = {
  55. 'Git': {
  56. 'probe' : ['git', 'rev-parse'],
  57. 'diff' : ['git', 'diff', '--no-ext-diff'],
  58. 'log' : ['git', 'log', '--patch'],
  59. },
  60. 'Mercurial': {
  61. 'probe' : ['hg', 'summary'],
  62. 'diff' : ['hg', 'diff'],
  63. 'log' : ['hg', 'log', '--patch'],
  64. },
  65. 'Svn': {
  66. 'probe' : ['svn', 'info'],
  67. 'diff' : ['svn', 'diff'],
  68. 'log' : ['svn', 'log', '--diff', '--use-merge-history'],
  69. },
  70. }
  71. def colorize(text, start_color, end_color='reset'):
  72. return COLORS[start_color] + text + COLORS[end_color]
  73. class Hunk(object):
  74. def __init__(self, hunk_headers, hunk_meta, old_addr, new_addr):
  75. self._hunk_headers = hunk_headers
  76. self._hunk_meta = hunk_meta
  77. self._old_addr = old_addr # tuple (start, offset)
  78. self._new_addr = new_addr # tuple (start, offset)
  79. self._hunk_list = [] # list of tuple (attr, line)
  80. def append(self, hunk_line):
  81. """hunk_line is a 2-element tuple: (attr, text), where attr is:
  82. '-': old, '+': new, ' ': common
  83. """
  84. self._hunk_list.append(hunk_line)
  85. def mdiff(self):
  86. r"""The difflib._mdiff() function returns an interator which returns a
  87. tuple: (from line tuple, to line tuple, boolean flag)
  88. from/to line tuple -- (line num, line text)
  89. line num -- integer or None (to indicate a context separation)
  90. line text -- original line text with following markers inserted:
  91. '\0+' -- marks start of added text
  92. '\0-' -- marks start of deleted text
  93. '\0^' -- marks start of changed text
  94. '\1' -- marks end of added/deleted/changed text
  95. boolean flag -- None indicates context separation, True indicates
  96. either "from" or "to" line contains a change, otherwise False.
  97. """
  98. return difflib._mdiff(self._get_old_text(), self._get_new_text())
  99. def _get_old_text(self):
  100. out = []
  101. for (attr, line) in self._hunk_list:
  102. if attr != '+':
  103. out.append(line)
  104. return out
  105. def _get_new_text(self):
  106. out = []
  107. for (attr, line) in self._hunk_list:
  108. if attr != '-':
  109. out.append(line)
  110. return out
  111. class UnifiedDiff(object):
  112. def __init__(self, headers, old_path, new_path, hunks):
  113. self._headers = headers
  114. self._old_path = old_path
  115. self._new_path = new_path
  116. self._hunks = hunks
  117. def is_old_path(self, line):
  118. return line.startswith('--- ')
  119. def is_new_path(self, line):
  120. return line.startswith('+++ ')
  121. def is_hunk_meta(self, line):
  122. """Minimal valid hunk meta is like '@@ -1 +1 @@', note extra chars
  123. might occur after the ending @@, e.g. in git log. '## ' usually
  124. indicates svn property changes in output from `svn log --diff`
  125. """
  126. return (line.startswith('@@ -') and line.find(' @@') >= 8) or \
  127. (line.startswith('## -') and line.find(' ##') >= 8)
  128. def parse_hunk_meta(self, hunk_meta):
  129. # @@ -3,7 +3,6 @@
  130. a = hunk_meta.split()[1].split(',') # -3 7
  131. if len(a) > 1:
  132. old_addr = (int(a[0][1:]), int(a[1]))
  133. else:
  134. # @@ -1 +1,2 @@
  135. old_addr = (int(a[0][1:]), 0)
  136. b = hunk_meta.split()[2].split(',') # +3 6
  137. if len(b) > 1:
  138. new_addr = (int(b[0][1:]), int(b[1]))
  139. else:
  140. # @@ -0,0 +1 @@
  141. new_addr = (int(b[0][1:]), 0)
  142. return (old_addr, new_addr)
  143. def parse_hunk_line(self, line):
  144. return (line[0], line[1:])
  145. def is_old(self, line):
  146. """Exclude old path and header line from svn log --diff output, allow
  147. '----' likely to see in diff from yaml file
  148. """
  149. return line.startswith('-') and not self.is_old_path(line) and \
  150. not re.match(r'^-{72}$', line.rstrip())
  151. def is_new(self, line):
  152. return line.startswith('+') and not self.is_new_path(line)
  153. def is_common(self, line):
  154. return line.startswith(' ')
  155. def is_eof(self, line):
  156. # \ No newline at end of file
  157. # \ No newline at end of property
  158. return line.startswith(r'\ No newline at end of')
  159. def is_only_in_dir(self, line):
  160. return line.startswith('Only in ')
  161. def is_binary_differ(self, line):
  162. return re.match('^Binary files .* differ$', line.rstrip())
  163. class PatchStream(object):
  164. def __init__(self, diff_hdl):
  165. self._diff_hdl = diff_hdl
  166. self._stream_header_size = 0
  167. self._stream_header = []
  168. # Test whether stream is empty by read 1 line
  169. line = self._diff_hdl.readline()
  170. if not line:
  171. self._is_empty = True
  172. else:
  173. self._stream_header.append(line)
  174. self._stream_header_size += 1
  175. self._is_empty = False
  176. def is_empty(self):
  177. return self._is_empty
  178. def read_stream_header(self, stream_header_size):
  179. """Returns a small chunk for patch type detect, suppose to call once"""
  180. for i in range(1, stream_header_size):
  181. line = self._diff_hdl.readline()
  182. if not line:
  183. break
  184. self._stream_header.append(line)
  185. self._stream_header_size += 1
  186. return self._stream_header
  187. def __iter__(self):
  188. for line in self._stream_header:
  189. yield line
  190. for line in self._diff_hdl:
  191. yield line
  192. class PatchStreamForwarder(object):
  193. """A blocking stream forwarder use `select` and line buffered mode. Feed
  194. input stream to a diff format translator and read output stream from it.
  195. Note input stream is non-seekable, and upstream has eaten some lines.
  196. """
  197. def __init__(self, istream, translator):
  198. assert isinstance(istream, PatchStream)
  199. assert isinstance(translator, subprocess.Popen)
  200. self._istream = iter(istream)
  201. self._in = translator.stdin
  202. self._out = translator.stdout
  203. def _can_read(self, timeout=0):
  204. return select.select([self._out.fileno()], [], [], timeout)[0]
  205. def _forward_line(self):
  206. try:
  207. line = next(self._istream)
  208. self._in.write(line)
  209. except StopIteration:
  210. self._in.close()
  211. def __iter__(self):
  212. while True:
  213. if self._can_read():
  214. line = self._out.readline()
  215. if line:
  216. yield line
  217. else:
  218. return
  219. elif not self._in.closed:
  220. self._forward_line()
  221. class DiffParser(object):
  222. def __init__(self, stream):
  223. header = [decode(line) for line in stream.read_stream_header(100)]
  224. size = len(header)
  225. if size >= 4 and (header[0].startswith('*** ') and
  226. header[1].startswith('--- ') and
  227. header[2].rstrip() == '***************' and
  228. header[3].startswith('*** ') and
  229. header[3].rstrip().endswith(' ****')):
  230. # For context diff, try use `filterdiff` to translate it to unified
  231. # format and provide a new stream
  232. #
  233. self._type = 'context'
  234. try:
  235. # Use line buffered mode so that to readline() in block mode
  236. self._translator = subprocess.Popen(
  237. ['filterdiff', '--format=unified'], stdin=subprocess.PIPE,
  238. stdout=subprocess.PIPE, bufsize=1)
  239. except OSError:
  240. raise SystemExit('*** Context diff support depends on '
  241. 'filterdiff')
  242. self._stream = PatchStreamForwarder(stream, self._translator)
  243. return
  244. for n in range(size):
  245. if header[n].startswith('--- ') and (n < size - 1) and \
  246. header[n+1].startswith('+++ '):
  247. self._type = 'unified'
  248. self._stream = stream
  249. break
  250. else:
  251. # `filterdiff` translates unknown diff to nothing, fall through to
  252. # unified diff give cdiff a chance to show everything as headers
  253. #
  254. sys.stderr.write("*** unknown format, fall through to 'unified'\n")
  255. self._type = 'unified'
  256. self._stream = stream
  257. def get_diff_generator(self):
  258. """parse all diff lines, construct a list of UnifiedDiff objects"""
  259. diff = UnifiedDiff([], None, None, [])
  260. headers = []
  261. for line in self._stream:
  262. line = decode(line)
  263. if diff.is_old_path(line):
  264. # FIXME: '--- ' breaks here, better to probe next line
  265. if diff._old_path and diff._new_path and diff._hunks:
  266. # See a new diff, yield previous diff if exists
  267. yield diff
  268. diff = UnifiedDiff(headers, line, None, [])
  269. headers = []
  270. elif diff.is_new_path(line) and diff._old_path:
  271. diff._new_path = line
  272. elif diff.is_hunk_meta(line):
  273. hunk_meta = line
  274. try:
  275. old_addr, new_addr = diff.parse_hunk_meta(hunk_meta)
  276. except (IndexError, ValueError):
  277. raise RuntimeError('invalid hunk meta: %s' % hunk_meta)
  278. hunk = Hunk(headers, hunk_meta, old_addr, new_addr)
  279. headers = []
  280. diff._hunks.append(hunk)
  281. elif diff._hunks and not headers and (diff.is_old(line) or
  282. diff.is_new(line) or
  283. diff.is_common(line)):
  284. diff._hunks[-1].append(diff.parse_hunk_line(line))
  285. elif diff.is_eof(line):
  286. # ignore
  287. pass
  288. elif diff.is_only_in_dir(line) or \
  289. diff.is_binary_differ(line):
  290. # 'Only in foo:' and 'Binary files ... differ' are considered
  291. # as separate diffs, so yield current diff, then this line
  292. #
  293. if diff._old_path and diff._new_path and diff._hunks:
  294. # Current diff is comppletely constructed
  295. yield diff
  296. headers.append(line)
  297. yield UnifiedDiff(headers, '', '', [])
  298. headers = []
  299. diff = UnifiedDiff([], None, None, [])
  300. else:
  301. # All other non-recognized lines are considered as headers or
  302. # hunk headers respectively
  303. #
  304. headers.append(line)
  305. # Validate and yield the last patch set if it is not yielded yet
  306. if diff._old_path:
  307. assert diff._new_path is not None
  308. if diff._hunks:
  309. assert len(diff._hunks[-1]._hunk_meta) > 0
  310. assert len(diff._hunks[-1]._hunk_list) > 0
  311. yield diff
  312. if headers:
  313. # Tolerate dangling headers, just yield a UnifiedDiff object with
  314. # only header lines
  315. #
  316. yield UnifiedDiff(headers, '', '', [])
  317. class DiffMarker(object):
  318. def markup(self, diffs, side_by_side=False, width=0):
  319. """Returns a generator"""
  320. if side_by_side:
  321. for diff in diffs:
  322. for line in self._markup_side_by_side(diff, width):
  323. yield line
  324. else:
  325. for diff in diffs:
  326. for line in self._markup_traditional(diff):
  327. yield line
  328. def _markup_traditional(self, diff):
  329. """Returns a generator"""
  330. for line in diff._headers:
  331. yield self._markup_header(line)
  332. yield self._markup_old_path(diff._old_path)
  333. yield self._markup_new_path(diff._new_path)
  334. for hunk in diff._hunks:
  335. for hunk_header in hunk._hunk_headers:
  336. yield self._markup_hunk_header(hunk_header)
  337. yield self._markup_hunk_meta(hunk._hunk_meta)
  338. for old, new, changed in hunk.mdiff():
  339. if changed:
  340. if not old[0]:
  341. # The '+' char after \x00 is kept
  342. # DEBUG: yield 'NEW: %s %s\n' % (old, new)
  343. line = new[1].strip('\x00\x01')
  344. yield self._markup_new(line)
  345. elif not new[0]:
  346. # The '-' char after \x00 is kept
  347. # DEBUG: yield 'OLD: %s %s\n' % (old, new)
  348. line = old[1].strip('\x00\x01')
  349. yield self._markup_old(line)
  350. else:
  351. # DEBUG: yield 'CHG: %s %s\n' % (old, new)
  352. yield self._markup_old('-') + \
  353. self._markup_mix(old[1], 'red')
  354. yield self._markup_new('+') + \
  355. self._markup_mix(new[1], 'green')
  356. else:
  357. yield self._markup_common(' ' + old[1])
  358. def _markup_side_by_side(self, diff, width):
  359. """Returns a generator"""
  360. wrap_char = colorize('>', 'lightmagenta')
  361. def _normalize(line):
  362. return line.replace(
  363. '\t', ' ' * 8).replace('\n', '').replace('\r', '')
  364. def _fit_with_marker(text, markup_fn, width, pad=False):
  365. """Wrap or pad input pure text, then markup"""
  366. if len(text) > width:
  367. return markup_fn(text[:(width - 1)]) + wrap_char
  368. elif pad:
  369. pad_len = width - len(text)
  370. return '%s%*s' % (markup_fn(text), pad_len, '')
  371. else:
  372. return markup_fn(text)
  373. def _fit_with_marker_mix(text, base_color, width, pad=False):
  374. """Wrap or pad input text which contains mdiff tags, markup at the
  375. meantime, note only left side need to set `pad`
  376. """
  377. out = [COLORS[base_color]]
  378. count = 0
  379. tag_re = re.compile(r'\x00[+^-]|\x01')
  380. while text and count < width:
  381. if text.startswith('\x00-'): # del
  382. out.append(COLORS['reverse'] + COLORS[base_color])
  383. text = text[2:]
  384. elif text.startswith('\x00+'): # add
  385. out.append(COLORS['reverse'] + COLORS[base_color])
  386. text = text[2:]
  387. elif text.startswith('\x00^'): # change
  388. out.append(COLORS['underline'] + COLORS[base_color])
  389. text = text[2:]
  390. elif text.startswith('\x01'): # reset
  391. out.append(COLORS['reset'] + COLORS[base_color])
  392. text = text[1:]
  393. else:
  394. # FIXME: utf-8 wchar might break the rule here, e.g.
  395. # u'\u554a' takes double width of a single letter, also
  396. # this depends on your terminal font. I guess audience of
  397. # this tool never put that kind of symbol in their code :-)
  398. #
  399. out.append(text[0])
  400. count += 1
  401. text = text[1:]
  402. if count == width and tag_re.sub('', text):
  403. # Was stripped: output fulfil and still has normal char in text
  404. out[-1] = COLORS['reset'] + wrap_char
  405. elif count < width and pad:
  406. pad_len = width - count
  407. out.append('%s%*s' % (COLORS['reset'], pad_len, ''))
  408. else:
  409. out.append(COLORS['reset'])
  410. return ''.join(out)
  411. # Set up number width, note last hunk might be empty
  412. try:
  413. (start, offset) = diff._hunks[-1]._old_addr
  414. max1 = start + offset - 1
  415. (start, offset) = diff._hunks[-1]._new_addr
  416. max2 = start + offset - 1
  417. except IndexError:
  418. max1 = max2 = 0
  419. num_width = max(len(str(max1)), len(str(max2)))
  420. # Set up line width
  421. if width <= 0:
  422. # Autodetection of text width according to terminal size
  423. try:
  424. # Each line is like "nnn TEXT nnn TEXT\n", so width is half of
  425. # [terminal size minus the line number columns and 3 separating
  426. # spaces
  427. #
  428. width = (terminal_size()[0] - num_width * 2 - 3) // 2
  429. except Exception:
  430. # If terminal detection failed, set back to default
  431. width = 80
  432. # Setup lineno and line format
  433. left_num_fmt = colorize('%%(left_num)%ds' % num_width, 'yellow')
  434. right_num_fmt = colorize('%%(right_num)%ds' % num_width, 'yellow')
  435. line_fmt = left_num_fmt + ' %(left)s ' + COLORS['reset'] + \
  436. right_num_fmt + ' %(right)s\n'
  437. # yield header, old path and new path
  438. for line in diff._headers:
  439. yield self._markup_header(line)
  440. yield self._markup_old_path(diff._old_path)
  441. yield self._markup_new_path(diff._new_path)
  442. # yield hunks
  443. for hunk in diff._hunks:
  444. for hunk_header in hunk._hunk_headers:
  445. yield self._markup_hunk_header(hunk_header)
  446. yield self._markup_hunk_meta(hunk._hunk_meta)
  447. for old, new, changed in hunk.mdiff():
  448. if old[0]:
  449. left_num = str(hunk._old_addr[0] + int(old[0]) - 1)
  450. else:
  451. left_num = ' '
  452. if new[0]:
  453. right_num = str(hunk._new_addr[0] + int(new[0]) - 1)
  454. else:
  455. right_num = ' '
  456. left = _normalize(old[1])
  457. right = _normalize(new[1])
  458. if changed:
  459. if not old[0]:
  460. left = '%*s' % (width, ' ')
  461. right = right.rstrip('\x01')
  462. if right.startswith('\x00+'):
  463. right = right[2:]
  464. right = _fit_with_marker(
  465. right, self._markup_new, width)
  466. elif not new[0]:
  467. left = left.rstrip('\x01')
  468. if left.startswith('\x00-'):
  469. left = left[2:]
  470. left = _fit_with_marker(left, self._markup_old, width)
  471. right = ''
  472. else:
  473. left = _fit_with_marker_mix(left, 'red', width, 1)
  474. right = _fit_with_marker_mix(right, 'green', width)
  475. else:
  476. left = _fit_with_marker(
  477. left, self._markup_common, width, 1)
  478. right = _fit_with_marker(right, self._markup_common, width)
  479. yield line_fmt % {
  480. 'left_num': left_num,
  481. 'left': left,
  482. 'right_num': right_num,
  483. 'right': right
  484. }
  485. def _markup_header(self, line):
  486. return colorize(line, 'cyan')
  487. def _markup_old_path(self, line):
  488. return colorize(line, 'yellow')
  489. def _markup_new_path(self, line):
  490. return colorize(line, 'yellow')
  491. def _markup_hunk_header(self, line):
  492. return colorize(line, 'lightcyan')
  493. def _markup_hunk_meta(self, line):
  494. return colorize(line, 'lightblue')
  495. def _markup_common(self, line):
  496. return colorize(line, 'reset')
  497. def _markup_old(self, line):
  498. return colorize(line, 'lightred')
  499. def _markup_new(self, line):
  500. return colorize(line, 'green')
  501. def _markup_mix(self, line, base_color):
  502. del_code = COLORS['reverse'] + COLORS[base_color]
  503. add_code = COLORS['reverse'] + COLORS[base_color]
  504. chg_code = COLORS['underline'] + COLORS[base_color]
  505. rst_code = COLORS['reset'] + COLORS[base_color]
  506. line = line.replace('\x00-', del_code)
  507. line = line.replace('\x00+', add_code)
  508. line = line.replace('\x00^', chg_code)
  509. line = line.replace('\x01', rst_code)
  510. return colorize(line, base_color)
  511. def markup_to_pager(stream, opts):
  512. """Pipe unified diff stream to pager (less).
  513. Note: have to create pager Popen object before the translator Popen object
  514. in PatchStreamForwarder, otherwise the `stdin=subprocess.PIPE` would cause
  515. trouble to the translator pipe (select() never see EOF after input stream
  516. ended), most likely python bug 12607 (http://bugs.python.org/issue12607)
  517. which was fixed in python 2.7.3.
  518. See issue #30 (https://github.com/ymattw/cdiff/issues/30) for more
  519. information.
  520. """
  521. pager_cmd = ['less']
  522. if not os.getenv('LESS'):
  523. # Args stolen from git source: github.com/git/git/blob/master/pager.c
  524. pager_cmd.extend(['-FRSX', '--shift 1'])
  525. pager = subprocess.Popen(
  526. pager_cmd, stdin=subprocess.PIPE, stdout=sys.stdout)
  527. diffs = DiffParser(stream).get_diff_generator()
  528. marker = DiffMarker()
  529. color_diff = marker.markup(diffs, side_by_side=opts.side_by_side,
  530. width=opts.width)
  531. for line in color_diff:
  532. pager.stdin.write(line.encode('utf-8'))
  533. pager.stdin.close()
  534. pager.wait()
  535. def check_command_status(arguments):
  536. """Return True if command returns 0."""
  537. try:
  538. return subprocess.call(
  539. arguments, stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0
  540. except OSError:
  541. return False
  542. def revision_control_diff(args):
  543. """Return diff from revision control system."""
  544. for _, ops in VCS_INFO.items():
  545. if check_command_status(ops['probe']):
  546. return subprocess.Popen(
  547. ops['diff'] + args, stdout=subprocess.PIPE).stdout
  548. def revision_control_log(args):
  549. """Return log from revision control system."""
  550. for _, ops in VCS_INFO.items():
  551. if check_command_status(ops['probe']):
  552. return subprocess.Popen(
  553. ops['log'] + args, stdout=subprocess.PIPE).stdout
  554. def decode(line):
  555. """Decode UTF-8 if necessary."""
  556. if isinstance(line, unicode):
  557. return line
  558. for encoding in ['utf-8', 'latin1']:
  559. try:
  560. return line.decode(encoding)
  561. except UnicodeDecodeError:
  562. pass
  563. return '*** cdiff: undecodable bytes ***\n'
  564. def terminal_size():
  565. """Returns terminal size. Taken from https://gist.github.com/marsam/7268750
  566. but removed win32 support which depends on 3rd party extension.
  567. """
  568. width, height = None, None
  569. try:
  570. import struct, fcntl, termios
  571. s = struct.pack('HHHH', 0, 0, 0, 0)
  572. x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
  573. height, width = struct.unpack('HHHH', x)[0:2]
  574. except (IOError, AttributeError):
  575. pass
  576. return width, height
  577. def main():
  578. signal.signal(signal.SIGPIPE, signal.SIG_DFL)
  579. signal.signal(signal.SIGINT, signal.SIG_DFL)
  580. from optparse import (OptionParser, BadOptionError, AmbiguousOptionError,
  581. OptionGroup)
  582. class PassThroughOptionParser(OptionParser):
  583. """Stop parsing on first unknown option (e.g. --cached, -U10) and pass
  584. them down. Note the `opt_str` in exception object does not give us
  585. chance to take the full option back, e.g. for '-U10' it will only
  586. contain '-U' and the '10' part will be lost. Ref: http://goo.gl/IqY4A
  587. (on stackoverflow). My hack is to try parse and insert a '--' in place
  588. and parse again. Let me know if someone has better solution.
  589. """
  590. def _process_args(self, largs, rargs, values):
  591. left = largs[:]
  592. right = rargs[:]
  593. try:
  594. OptionParser._process_args(self, left, right, values)
  595. except (BadOptionError, AmbiguousOptionError):
  596. parsed_num = len(rargs) - len(right) - 1
  597. rargs.insert(parsed_num, '--')
  598. OptionParser._process_args(self, largs, rargs, values)
  599. supported_vcs = sorted(VCS_INFO.keys())
  600. usage = """%prog [options] [file|dir ...]"""
  601. parser = PassThroughOptionParser(
  602. usage=usage, description=META_INFO['description'],
  603. version='%%prog %s' % META_INFO['version'])
  604. parser.add_option(
  605. '-s', '--side-by-side', action='store_true',
  606. help='enable side-by-side mode')
  607. parser.add_option(
  608. '-w', '--width', type='int', default=80, metavar='N',
  609. help='set text width for side-by-side mode, 0 for auto detection, '
  610. 'default is 80')
  611. parser.add_option(
  612. '-l', '--log', action='store_true',
  613. help='show log with changes from revision control')
  614. parser.add_option(
  615. '-c', '--color', default='auto', metavar='M',
  616. help="""colorize mode 'auto' (default), 'always', or 'never'""")
  617. # Hack: use OptionGroup text for extra help message after option list
  618. option_group = OptionGroup(
  619. parser, "Note", ("Option parser will stop on first unknown option "
  620. "and pass them down to underneath revision control"))
  621. parser.add_option_group(option_group)
  622. opts, args = parser.parse_args()
  623. if opts.log:
  624. diff_hdl = revision_control_log(args)
  625. if not diff_hdl:
  626. sys.stderr.write(('*** Not in a supported workspace, supported '
  627. 'are: %s\n') % ', '.join(supported_vcs))
  628. return 1
  629. elif sys.stdin.isatty():
  630. diff_hdl = revision_control_diff(args)
  631. if not diff_hdl:
  632. sys.stderr.write(('*** Not in a supported workspace, supported '
  633. 'are: %s\n\n') % ', '.join(supported_vcs))
  634. parser.print_help()
  635. return 1
  636. else:
  637. diff_hdl = (sys.stdin.buffer if hasattr(sys.stdin, 'buffer')
  638. else sys.stdin)
  639. stream = PatchStream(diff_hdl)
  640. # Don't let empty diff pass thru
  641. if stream.is_empty():
  642. return 0
  643. if opts.color == 'always' or \
  644. (opts.color == 'auto' and sys.stdout.isatty()):
  645. markup_to_pager(stream, opts)
  646. else:
  647. # pipe out stream untouched to make sure it is still a patch
  648. byte_output = (sys.stdout.buffer if hasattr(sys.stdout, 'buffer')
  649. else sys.stdout)
  650. for line in stream:
  651. byte_output.write(line)
  652. if diff_hdl is not sys.stdin:
  653. diff_hdl.close()
  654. return 0
  655. if __name__ == '__main__':
  656. sys.exit(main())
  657. # vim:set et sts=4 sw=4 tw=79: