Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 27135:cc9d49160adc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugmergestate: also recognize change/delete conflicts in the merge state We're going to use this for tests in upcoming patches.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 24 Nov 2015 18:26:21 -0800
parents cb5bdf65420f
children ea8e27e6098d
comparison
equal deleted inserted replaced
27134:cb5bdf65420f 27135:cc9d49160adc
2560 ui.write(('other: %s\n') % record) 2560 ui.write(('other: %s\n') % record)
2561 elif rtype == 'm': 2561 elif rtype == 'm':
2562 driver, mdstate = record.split('\0', 1) 2562 driver, mdstate = record.split('\0', 1)
2563 ui.write(('merge driver: %s (state "%s")\n') 2563 ui.write(('merge driver: %s (state "%s")\n')
2564 % (driver, mdstate)) 2564 % (driver, mdstate))
2565 elif rtype in 'FD': 2565 elif rtype in 'FDC':
2566 r = record.split('\0') 2566 r = record.split('\0')
2567 f, state, hash, lfile, afile, anode, ofile = r[0:7] 2567 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2568 if version == 1: 2568 if version == 1:
2569 onode = 'not stored in v1 format' 2569 onode = 'not stored in v1 format'
2570 flags = r[7] 2570 flags = r[7]
2571 else: 2571 else:
2572 onode, flags = r[7:9] 2572 onode, flags = r[7:9]
2573 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n') 2573 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2574 % (f, rtype, state, hash)) 2574 % (f, rtype, state, _hashornull(hash)))
2575 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) 2575 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2576 ui.write((' ancestor path: %s (node %s)\n') 2576 ui.write((' ancestor path: %s (node %s)\n')
2577 % (afile, _hashornull(anode))) 2577 % (afile, _hashornull(anode)))
2578 ui.write((' other path: %s (node %s)\n') 2578 ui.write((' other path: %s (node %s)\n')
2579 % (ofile, _hashornull(onode))) 2579 % (ofile, _hashornull(onode)))