This is an archive of the discontinued Mercurial Phabricator instance.

Differential D713

conflictinfo: add more information about the conflict-causing command
AbandonedPublic

Authored by phillco on Sep 14 2017, 2:10 PM.
Tags
None
Subscribers
durham, ryanmce

Details

Reviewers
ryanmce
durham
Group Reviewers
Restricted Project
Commits
rFBHGX44d0900950ee: conflictinfo: add more information about the conflict-causing command
Summary

In the old version of this extension it was too difficult to determine how to
resume or abort the command that generated conflicts. Let's add that
information so consumers can programatically continue or abort.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Sep 14 2017, 2:10 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 14 2017, 2:10 PM
ryanmce requested changes to this revision.Sep 14 2017, 2:19 PM
ryanmce added a subscriber: ryanmce.

Tests

This revision now requires changes to proceed.Sep 14 2017, 2:19 PM
phillco updated this revision to Diff 1824.Sep 14 2017, 2:31 PM
phillco added a comment.Sep 14 2017, 2:32 PM

Should've scrolled up, thanks!

phillco planned changes to this revision.Sep 14 2017, 2:33 PM
phillco updated this revision to Diff 1825.Sep 14 2017, 2:33 PM
phillco added inline comments.Sep 14 2017, 2:34 PM
tests/test-merge-conflictinfo.t
413

I'll see if Aadi was relying on this.

durham accepted this revision.Sep 14 2017, 8:23 PM
durham added a subscriber: durham.

Accepting to unblock, but I think we need to be careful about the possibility of data loss.

hgext3rd/conflictinfo.py
60

This one and updatestate's abort are a bit concerning because it can result in data loss. Is Nuclide actually running these commands for users? Or just telling users? If it's running the commands, maybe we should leave these 2 to_abort's out. Or have some flag that indicates these are not safe to run automatically.

phillco added inline comments.Sep 21 2017, 1:02 PM
hgext3rd/conflictinfo.py
60

It's to present buttons that let the user abort or continue after resolving conflicts, so I think in all cases there'll be data loss on abort. Not sure if update or merge is worse in that case.

ryanmce requested changes to this revision.Oct 13 2017, 9:58 AM

This needs to be rebased; requesting changes until that's done.

This revision now requires changes to proceed.Oct 13 2017, 9:58 AM
phillco updated this revision to Diff 3123.Oct 26 2017, 12:58 AM
phillco added a comment.Oct 26 2017, 12:59 AM

Rebased, and I made command = null if there is no conflict, just in case someone was reading it.

phillco updated this revision to Diff 3124.Oct 26 2017, 1:02 AM
phillco updated this revision to Diff 3125.Oct 26 2017, 1:20 AM
phillco abandoned this revision.Oct 30 2017, 11:54 PM

Landed

phillco reclaimed this revision.Oct 30 2017, 11:54 PM

meant to close not abandon

Revision Contents
Changeset List

PathPackages
Mhgext3rd/conflictinfo.py (33 lines)
Mtests/test-merge-conflictinfo.t (618 lines)

Diff 1822

hgext3rd/conflictinfo.py

testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
# `unfinishedstates` would be ideal for this except it does not include merge, # `unfinishedstates` would be ideal for this except it does not include merge,
# and doesn't expose the command to run to resume by itself (it instead exposes # and doesn't expose the command to run to resume by itself (it instead exposes
# a help string) # a help string)
# Note: order matters (consider rebase v. merge). # Note: order matters (consider rebase v. merge).
CONFLICTSTATES = [ CONFLICTSTATES = [
['graft', 'graftstate'], ['graftstate', {'cmd': 'graft',
['update', 'updatestate'], 'to_continue': 'graft --continue',
['evolve', 'evolvestate'], 'to_abort': 'graft --abort'}],
['rebase', 'rebasestate'], ['updatestate', {'cmd': 'update',
['histedit', 'histedit-state'], 'to_continue': 'update',
['unshelve', 'shelvedstate'], 'to_abort': 'update --clean'}],
['merge', 'merge/state'], ['rebasestate', {'cmd': 'rebase',
'to_continue': 'rebase --continue',
'to_abort': 'rebase --abort'}],
['mergestate', {'cmd': 'merge',
'to_continue': 'merge --continue',
'to_abort': 'update --clean'}],
durhamUnsubmitted
Not Done

This one and updatestate's abort are a bit concerning because it can result in data loss. Is Nuclide actually running these commands for users? Or just telling users? If it's running the commands, maybe we should leave these 2 to_abort's out. Or have some flag that indicates these are not safe to run automatically.

durham: This one and updatestate's abort are a bit concerning because it can result in data loss. Is…
phillcoAuthorUnsubmitted
Not Done

It's to present buttons that let the user abort or continue after resolving conflicts, so I think in all cases there'll be data loss on abort. Not sure if update or merge is worse in that case.

phillco: It's to present buttons that let the user abort or continue after resolving conflicts, so I…
['shelvedstate', {'cmd': 'unshelve',
'to_continue': 'unshelve --continue',
'to_abort': 'unshelve --abort'}],
['histedit-state', {'cmd': 'histedit',
'to_continue': 'histedit --continue',
'to_abort': 'histedit --abort'}],
] ]
def extsetup(ui): def extsetup(ui):
extensions.wrapcommand(commands.table, 'resolve', _resolve) extensions.wrapcommand(commands.table, 'resolve', _resolve)
# Returns which command got us into the conflicted merge state. Since these # Returns which command got us into the conflicted merge state. Since these
# states are mutually exclusive, we can use the existence of any one statefile # states are mutually exclusive, we can use the existence of any one statefile
# as proof of culpability. # as proof of culpability.
def _findconflictcommand(repo): def _findconflictcommand(repo):
for name, path in CONFLICTSTATES: for path, data in CONFLICTSTATES:
if repo.vfs.exists(path): if repo.vfs.exists(path):
return name return data
return None return None
# To become a block in commands.py/resolve(). # To become a block in commands.py/resolve().
def _resolve(orig, ui, repo, *pats, **opts): def _resolve(orig, ui, repo, *pats, **opts):
# This block is duplicated from commands.py to maintain behavior. # This block is duplicated from commands.py to maintain behavior.
flaglist = 'all mark unmark list no_status'.split() flaglist = 'all mark unmark list no_status'.split()
all, mark, unmark, show, nostatus = \ all, mark, unmark, show, nostatus = \
[opts.get(o) for o in flaglist] [opts.get(o) for o in flaglist]
for file in mergestate: for file in mergestate:
if not matcher(file): if not matcher(file):
continue continue
val = _summarizeconflicts(mergestate, file, workingctx) val = _summarizeconflicts(mergestate, file, workingctx)
if val is not None: if val is not None:
paths.append(val) paths.append(val)
cmd = _findconflictcommand(repo)
formatter.startitem() formatter.startitem()
formatter.write('conflicts', '%s\n', paths) formatter.write('conflicts', '%s\n', paths)
formatter.write('command', '%s\n', _findconflictcommand(repo)) formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
formatter.write('command_details', '%s\n', cmd)
formatter.end() formatter.end()
return 0 return 0
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)
# To become merge.summarizeconflicts(). # To become merge.summarizeconflicts().
def _summarizeconflicts(self, path, workingctx): def _summarizeconflicts(self, path, workingctx):
# 'd' = driver-resolved # 'd' = driver-resolved

tests/test-merge-conflictinfo.t

warning: conflicts while merging F1! (edit, then use 'hg resolve --mark') warning: conflicts while merging F1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging F2! (edit, then use 'hg resolve --mark') warning: conflicts while merging F2! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 2 files unresolved 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1] [1]
5) Get the paths: 5) Get the paths:
$ hg resolve --tool internal:dumpjson --all $ hg resolve --tool internal:dumpjson --all
[ [** Unknown exception encountered with possibly-broken third-party extension conflictinfo
{ ** which supports versions None.None of Mercurial.
"command": "merge", ** Please disable conflictinfo and try your action again.
"conflicts": [{"base": {"contents": "Unconflicted base, F1\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "Second conflicted version, F1\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "First conflicted version, F1\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "<<<<<<< working copy: 13124abb51b9 b - test: second version, b\nSecond conflicted version, F1\n=======\nFirst conflicted version, F1\n>>>>>>> merge rev: 6dd692b7db4a a - test: first version, a\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/basic/F1"}, "path": "F1"}, {"base": {"contents": "Unconflicted base, F2\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "Second conflicted version, F2\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "First conflicted version, F2\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "<<<<<<< working copy: 13124abb51b9 b - test: second version, b\nSecond conflicted version, F2\n=======\nFirst conflicted version, F2\n>>>>>>> merge rev: 6dd692b7db4a a - test: first version, a\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/basic/F2"}, "path": "F2"}] ** If that fixes the bug please report it to the extension author.
} ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
] ** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
[1]
6) Only requested paths get dumped 6) Only requested paths get dumped
$ hg resolve --tool internal:dumpjson F2 $ hg resolve --tool internal:dumpjson F2
[ [** Unknown exception encountered with possibly-broken third-party extension conflictinfo
{ ** which supports versions None.None of Mercurial.
"command": "merge", ** Please disable conflictinfo and try your action again.
"conflicts": [{"base": {"contents": "Unconflicted base, F2\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "Second conflicted version, F2\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "First conflicted version, F2\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "<<<<<<< working copy: 13124abb51b9 b - test: second version, b\nSecond conflicted version, F2\n=======\nFirst conflicted version, F2\n>>>>>>> merge rev: 6dd692b7db4a a - test: first version, a\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/basic/F2"}, "path": "F2"}] ** If that fixes the bug please report it to the extension author.
} ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
] ** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
[1]
7) Ensure the paths point to the right contents: 7) Ensure the paths point to the right contents:
$ getcontents() { # Usage: getcontents <path> <version> $ getcontents() { # Usage: getcontents <path> <version>
> local script="import sys, json; print json.load(sys.stdin)[0][\"conflicts\"][$1][\"$2\"][\"contents\"]" > local script="import sys, json; print json.load(sys.stdin)[0][\"conflicts\"][$1][\"$2\"][\"contents\"]"
> local result=`hg resolve --tool internal:dumpjson --all | python -c "$script"` > local result=`hg resolve --tool internal:dumpjson --all | python -c "$script"`
> echo "$result" > echo "$result"
> } > }
$ echo `getcontents 0 "base"` $ echo `getcontents 0 "base"`
Unconflicted base, F1 ** Unknown exception encountered with possibly-broken third-party extension conflictinfo
** which supports versions None.None of Mercurial.
** Please disable conflictinfo and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 291, in load
**kw)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 339, in loads
return _default_decoder.decode(s)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 364, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 380, in raw_decode
obj, end = self.scan_once(s, idx)
ValueError: Expecting object: line 1 column 1 (char 0)
$ echo `getcontents 0 "other"` $ echo `getcontents 0 "other"`
First conflicted version, F1 ** Unknown exception encountered with possibly-broken third-party extension conflictinfo
** which supports versions None.None of Mercurial.
** Please disable conflictinfo and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 291, in load
**kw)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 339, in loads
return _default_decoder.decode(s)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 364, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 380, in raw_decode
obj, end = self.scan_once(s, idx)
ValueError: Expecting object: line 1 column 1 (char 0)
$ echo `getcontents 0 "local"` $ echo `getcontents 0 "local"`
Second conflicted version, F1 ** Unknown exception encountered with possibly-broken third-party extension conflictinfo
** which supports versions None.None of Mercurial.
** Please disable conflictinfo and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 291, in load
**kw)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 339, in loads
return _default_decoder.decode(s)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 364, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 380, in raw_decode
obj, end = self.scan_once(s, idx)
ValueError: Expecting object: line 1 column 1 (char 0)
$ echo `getcontents 1 "base"` $ echo `getcontents 1 "base"`
Unconflicted base, F2 ** Unknown exception encountered with possibly-broken third-party extension conflictinfo
** which supports versions None.None of Mercurial.
** Please disable conflictinfo and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 291, in load
**kw)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 339, in loads
return _default_decoder.decode(s)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 364, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 380, in raw_decode
obj, end = self.scan_once(s, idx)
ValueError: Expecting object: line 1 column 1 (char 0)
$ echo `getcontents 1 "other"` $ echo `getcontents 1 "other"`
First conflicted version, F2 ** Unknown exception encountered with possibly-broken third-party extension conflictinfo
** which supports versions None.None of Mercurial.
** Please disable conflictinfo and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 291, in load
**kw)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 339, in loads
return _default_decoder.decode(s)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 364, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 380, in raw_decode
obj, end = self.scan_once(s, idx)
ValueError: Expecting object: line 1 column 1 (char 0)
$ echo `getcontents 1 "local"` $ echo `getcontents 1 "local"`
Second conflicted version, F2 ** Unknown exception encountered with possibly-broken third-party extension conflictinfo
** which supports versions None.None of Mercurial.
** Please disable conflictinfo and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 291, in load
**kw)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/__init__.py", line 339, in loads
return _default_decoder.decode(s)
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 364, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/local/Cellar/python/2.7.13/Frameworks/Python.framework/Versions/2.7/lib/python2.7/json/decoder.py", line 380, in raw_decode
obj, end = self.scan_once(s, idx)
ValueError: Expecting object: line 1 column 1 (char 0)
Tests merge conflict corner cases (file-to-directory, binary-to-symlink, etc.) Tests merge conflict corner cases (file-to-directory, binary-to-symlink, etc.)
"other" == source "other" == source
"local" == dest "local" == dest
Setup Setup
$ cd .. $ cd ..
$ rm -rf basic $ rm -rf basic
$ hg merge 2 -f $ hg merge 2 -f
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [** Unknown exception encountered with possibly-broken third-party extension conflictinfo
{ ** which supports versions None.None of Mercurial.
"command": "merge", ** Please disable conflictinfo and try your action again.
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "some local changes\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "other change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "<<<<<<< working copy: fd7d10c36158 - test: dest\nsome local changes\n=======\nother change\n>>>>>>> merge rev: 9b65ba2922f0 - test: source\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/file"}, "path": "file"}] ** If that fixes the bug please report it to the extension author.
} ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
] ** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: rebase, conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
[1]
Test case 0b: Like #0 but with a corner case: source deleted, local changed Test case 0b: Like #0 but with a corner case: source deleted, local changed
*and* had local changes using merge -f. *and* had local changes using merge -f.
tldr: Since we couldn't premerge, the working copy is left alone. tldr: Since we couldn't premerge, the working copy is left alone.
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "dest" $ hg commit -Aqm "dest"
$ hg merge 2 -f $ hg merge 2 -f
local [working copy] changed file which other [merge rev] deleted local [working copy] changed file which other [merge rev] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [** Unknown exception encountered with possibly-broken third-party extension conflictinfo
{ ** which supports versions None.None of Mercurial.
"command": "merge", ** Please disable conflictinfo and try your action again.
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "some local changes\n", "exists": true, "isexec": true, "issymlink": false}, "other": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "output": {"contents": "some local changes\n", "exists": true, "isexec": true, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/file"}, "path": "file"}] ** If that fixes the bug please report it to the extension author.
} ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
] ** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: rebase, conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
[1]
Test case 1: Source deleted, dest changed Test case 1: Source deleted, dest changed
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "dest" $ hg commit -Aqm "dest"
$ hg up -q 0 $ hg up -q 0
$ hg rm file $ hg rm file
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
local [dest] changed file which other [source] deleted local [dest] changed file which other [source] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/file"}, "path": "file"}]
} }
] ]
Test case 1b: Like #1 but with a merge, with local changes Test case 1b: Like #1 but with a merge, with local changes
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "dest" $ hg commit -Aqm "dest"
$ hg up -q 0 $ hg up -q 0
$ hg merge 2 -f $ hg merge 2 -f
local [working copy] changed file which other [merge rev] deleted local [working copy] changed file which other [merge rev] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [** Unknown exception encountered with possibly-broken third-party extension conflictinfo
{ ** which supports versions None.None of Mercurial.
"command": "merge", ** Please disable conflictinfo and try your action again.
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "some local changes\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "output": {"contents": "some local changes\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] ** If that fixes the bug please report it to the extension author.
} ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
] ** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: rebase, conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
[1]
Test case 2: Source changed, dest deleted Test case 2: Source changed, dest deleted
$ cd .. $ cd ..
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
$ hg up -q 0 $ hg up -q 0
$ hg rm file $ hg rm file
$ hg commit -Aqm "dest" $ hg commit -Aqm "dest"
other [source] changed file which local [dest] deleted other [source] changed file which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": null, "exists": false, "isexec": null, "issymlink": null, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": null, "exists": false, "isexec": null, "issymlink": null, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}]
} }
] ]
Test case 3: Source changed, dest moved Test case 3: Source changed, dest moved
$ cd .. $ cd ..
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
$ hg rebase -d 2 -s 1 $ hg rebase -d 2 -s 1
rebasing 1:ec87889f5f90 "source" rebasing 1:ec87889f5f90 "source"
merging file_newloc and file to file_newloc merging file_newloc and file to file_newloc
saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/ec87889f5f90-e39a76b8-rebase.hg (glob) saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/ec87889f5f90-e39a76b8-rebase.hg (glob)
$ hg up -q 2 # source $ hg up -q 2 # source
$ cat file_newloc # Should follow: $ cat file_newloc # Should follow:
change change
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [** Unknown exception encountered with possibly-broken third-party extension conflictinfo
{ ** which supports versions None.None of Mercurial.
"command": null, ** Please disable conflictinfo and try your action again.
"conflicts": [] ** If that fixes the bug please report it to the extension author.
} ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
] ** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: rebase, conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
[1]
Test case 4: Source changed, dest moved (w/o copytracing) Test case 4: Source changed, dest moved (w/o copytracing)
$ cd .. $ cd ..
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
$ hg up -q 0 $ hg up -q 0
$ hg mv file file_newloc $ hg mv file file_newloc
$ hg commit -Aqm "dest" $ hg commit -Aqm "dest"
other [source] changed file which local [dest] deleted other [source] changed file which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": null, "exists": false, "isexec": null, "issymlink": null, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": null, "exists": false, "isexec": null, "issymlink": null, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}]
} }
] ]
Test case 5: Source moved, dest changed Test case 5: Source moved, dest changed
$ cd .. $ cd ..
$ reset $ reset
$ hg mv file file_newloc $ hg mv file file_newloc
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
rebasing 1:e6e7483a8950 "source" rebasing 1:e6e7483a8950 "source"
merging file and file_newloc to file_newloc merging file and file_newloc to file_newloc
saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/e6e7483a8950-8e128ac2-rebase.hg (glob) saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/e6e7483a8950-8e128ac2-rebase.hg (glob)
$ hg up 2 $ hg up 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat file_newloc $ cat file_newloc
change change
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [** Unknown exception encountered with possibly-broken third-party extension conflictinfo
{ ** which supports versions None.None of Mercurial.
"command": null, ** Please disable conflictinfo and try your action again.
phillcoAuthorUnsubmitted
Not Done

I'll see if Aadi was relying on this.

phillco: I'll see if Aadi was relying on this.
"conflicts": [] ** If that fixes the bug please report it to the extension author.
} ** Python 2.7.13 (default, Dec 18 2016, 07:03:39) [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)]
] ** Mercurial Distributed SCM (version 4.3.1+284-9738c53b697f+20170825)
** Extensions loaded: rebase, conflictinfo
Traceback (most recent call last):
File "/Users/phillco/hg-committed/hg", line 47, in <module>
dispatch.run()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 163, in dispatch
ret = _runcatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 303, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 311, in _callcatch
return scmutil.callcatch(ui, func)
File "/Users/phillco/hg-committed/mercurial/scmutil.py", line 150, in callcatch
return func()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 293, in _runcatchfunc
return _dispatch(req)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 900, in _dispatch
cmdpats, cmdoptions)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 662, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 908, in _runcommand
return cmdfunc()
File "/Users/phillco/hg-committed/mercurial/dispatch.py", line 897, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/hg-committed/mercurial/util.py", line 1118, in check
return func(*args, **kwargs)
File "/Users/phillco/src/hg/fb-hgext/hgext3rd/conflictinfo.py", line 115, in _resolve
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
TypeError: 'NoneType' object has no attribute '__getitem__'
[1]
Test case 6: Source moved, dest changed (w/o copytracing) Test case 6: Source moved, dest changed (w/o copytracing)
$ cd .. $ cd ..
$ reset $ reset
$ hg mv file file_newloc $ hg mv file file_newloc
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
$ hg up -q 0 $ hg up -q 0
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "dest" $ hg commit -Aqm "dest"
local [dest] changed file which other [source] deleted local [dest] changed file which other [source] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": null, "exists": false, "isexec": null, "issymlink": null}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}]
} }
] ]
Test case 7: Source is a directory, dest is a file (base is still a file) Test case 7: Source is a directory, dest is a file (base is still a file)
$ cd .. $ cd ..
$ reset $ reset
$ hg rm file $ hg rm file
$ mkdir file # "file" is a stretch $ mkdir file # "file" is a stretch
$ hg rebase -d 2 -s 1 $ hg rebase -d 2 -s 1
rebasing 1:ed93aeac6b3c "source" rebasing 1:ed93aeac6b3c "source"
abort: Not a directory: '$TESTTMP/cornercases/foo/foo/foo/foo/file/subfile' abort: Not a directory: '$TESTTMP/cornercases/foo/foo/foo/foo/file/subfile'
[255] [255]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "update", "command": "update",
"command_details": {"cmd": "update", "to_abort": "update --clean", "to_continue": "update"},
"conflicts": [] "conflicts": []
} }
] ]
Test case 8: Source is a file, dest is a directory (base is still a file) Test case 8: Source is a file, dest is a directory (base is still a file)
$ cd .. $ cd ..
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
$ hg rebase -d 2 -s 1 $ hg rebase -d 2 -s 1
rebasing 1:ec87889f5f90 "source" rebasing 1:ec87889f5f90 "source"
abort: (Is a directory|Operation not permitted): '\$TESTTMP/cornercases/foo/foo/foo/foo/file' (re) abort: (Is a directory|Operation not permitted): '\$TESTTMP/cornercases/foo/foo/foo/foo/file' (re)
[255] [255]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "update", "command": "update",
"command_details": {"cmd": "update", "to_abort": "update --clean", "to_continue": "update"},
"conflicts": [] "conflicts": []
} }
] ]
Test case 9: Source is a binary file, dest is a file (base is still a file) Test case 9: Source is a binary file, dest is a file (base is still a file)
$ cd .. $ cd ..
$ reset $ reset
$ python -c 'f = open("file", "w"); f.write("\x00")' $ python -c 'f = open("file", "w"); f.write("\x00")'
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ cat -v file # The local version should be left in the working copy $ cat -v file # The local version should be left in the working copy
change change
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "\u0000", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "\u0000", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}]
} }
] ]
Test case 10: Source is a file, dest is a binary file (base is still a file) Test case 10: Source is a file, dest is a binary file (base is still a file)
$ cd .. $ cd ..
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ cat -v file $ cat -v file
^@ (no-eol) ^@ (no-eol)
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "\u0000", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "\u0000", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "\u0000", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "\u0000", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}]
} }
] ]
Test case 11: Source is a symlink, dest is a file (base is still a file) Test case 11: Source is a symlink, dest is a file (base is still a file)
$ cd .. $ cd ..
$ reset $ reset
$ rm file $ rm file
$ ln -s somepath file $ ln -s somepath file
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ cat -v file $ cat -v file
change change
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "somepath", "exists": true, "isexec": false, "issymlink": true}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "other": {"contents": "somepath", "exists": true, "isexec": false, "issymlink": true}, "output": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}]
} }
] ]
Test case 12: Source is a file, dest is a symlink (base is still a file) Test case 12: Source is a file, dest is a symlink (base is still a file)
$ cd .. $ cd ..
$ reset $ reset
$ echo "change" > file $ echo "change" > file
$ hg commit -Aqm "source" $ hg commit -Aqm "source"
$ test -f file && echo "Exists" || echo "Does not exist" $ test -f file && echo "Exists" || echo "Does not exist"
Does not exist Does not exist
$ ls file $ ls file
file file
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"command_details": {"cmd": "rebase", "to_abort": "rebase --abort", "to_continue": "rebase --continue"},
"conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "somepath", "exists": true, "isexec": false, "issymlink": true}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "somepath", "exists": true, "isexec": false, "issymlink": true, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}] "conflicts": [{"base": {"contents": "base\n", "exists": true, "isexec": false, "issymlink": false}, "local": {"contents": "somepath", "exists": true, "isexec": false, "issymlink": true}, "other": {"contents": "change\n", "exists": true, "isexec": false, "issymlink": false}, "output": {"contents": "somepath", "exists": true, "isexec": false, "issymlink": true, "path": "$TESTTMP/cornercases/foo/foo/foo/foo/file"}, "path": "file"}]
} }
] ]