( )⚙ D1051 conflictinfo: handle path conflicts

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1051

conflictinfo: handle path conflicts
ClosedPublic

Authored by mbthomas on Oct 13 2017, 5:49 AM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGX15215c1c699e: conflictinfo: handle path conflicts
Summary

Upstream recently added path conflicts as a concept. Update the
conflictinfo extension to understand and show path conflicts.

Path conflicts are different to other kinds of conflicts, so appear
in a separate list in the form:

"pathconflicts:" [{
    "path": "path/to/directory",
    "fileorigin": "local",   # or "remote"
    "renamedto": "path/to/renamedfile"
}]

Diff Detail

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

Event Timeline

mbthomas created this revision.Oct 13 2017, 5:49 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 13 2017, 5:49 AM
ryanmce accepted this revision.Oct 13 2017, 9:57 AM
ryanmce added a subscriber: ryanmce.

Thanks

This revision is now accepted and ready to land.Oct 13 2017, 9:57 AM
Closed by commit rFBHGX15215c1c699e: conflictinfo: handle path conflicts (authored by mbthomas). · Explain WhyOct 13 2017, 10:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2668

hgext3rd/conflictinfo.py

# </duplication> # </duplication>
if not show and opts.get('tool', '') == "internal:dumpjson": if not show and opts.get('tool', '') == "internal:dumpjson":
formatter = ui.formatter('resolve', {'template': 'json'}) formatter = ui.formatter('resolve', {'template': 'json'})
mergestate = mergemod.mergestate.read(repo) mergestate = mergemod.mergestate.read(repo)
matcher = scmutil.match(repo[None], pats, opts) matcher = scmutil.match(repo[None], pats, opts)
workingctx = repo[None] workingctx = repo[None]
paths = [] fileconflicts = []
for file in mergestate: pathconflicts = []
if not matcher(file): for path in mergestate:
if not matcher(path):
continue continue
val = _summarizeconflicts(mergestate, file, workingctx) info = _summarizefileconflicts(mergestate, path, workingctx)
if val is not None: if info is not None:
paths.append(val) fileconflicts.append(info)
info = _summarizepathconflicts(mergestate, path)
if info is not None:
pathconflicts.append(info)
formatter.startitem() formatter.startitem()
formatter.write('conflicts', '%s\n', paths) formatter.write('conflicts', '%s\n', fileconflicts)
formatter.write('pathconflicts', '%s\n', pathconflicts)
formatter.write('command', '%s\n', _findconflictcommand(repo)) formatter.write('command', '%s\n', _findconflictcommand(repo))
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.summarizefileconflicts().
def _summarizeconflicts(self, path, workingctx): def _summarizefileconflicts(self, path, workingctx):
# 'd' = driver-resolved # 'd' = driver-resolved
# 'r' = removed # 'r' = marked resolved
if self[path] in 'rd': # 'pr', 'pu' = path conflicts
if self[path] in ('d', 'r', 'pr', 'pu'):
return None return None
stateentry = self._state[path] stateentry = self._state[path]
localnode = stateentry[1] localnode = stateentry[1]
ancestorfile = stateentry[3] ancestorfile = stateentry[3]
ancestornode = stateentry[4] ancestornode = stateentry[4]
otherfile = stateentry[5] otherfile = stateentry[5]
othernode = stateentry[6] othernode = stateentry[6]
otherctx = self._repo[self._other] otherctx = self._repo[self._other]
extras = self.extras(path) extras = self.extras(path)
anccommitnode = extras.get('ancestorlinknode') anccommitnode = extras.get('ancestorlinknode')
ancestorctx = self._repo[anccommitnode] if anccommitnode else None ancestorctx = self._repo[anccommitnode] if anccommitnode else None
workingctx = self._filectxorabsent(localnode, workingctx, path) workingctx = self._filectxorabsent(localnode, workingctx, path)
otherctx = self._filectxorabsent(othernode, otherctx, otherfile) otherctx = self._filectxorabsent(othernode, otherctx, otherfile)
basectx = self._repo.filectx(ancestorfile, fileid=ancestornode, basectx = self._repo.filectx(ancestorfile, fileid=ancestornode,
changeid=ancestorctx) changeid=ancestorctx)
return _summarize(self._repo, workingctx, otherctx, basectx) return _summarize(self._repo, workingctx, otherctx, basectx)
# To become merge.summarizepathconflicts().
def _summarizepathconflicts(self, path):
# 'pu' = unresolved path conflict
if self[path] != 'pu':
return None
stateentry = self._state[path]
frename = stateentry[1]
forigin = stateentry[2]
return {
'path': path,
'fileorigin': 'local' if forigin == 'l' else 'remote',
'renamedto': frename,
}
# To become filemerge.summarize(). # To become filemerge.summarize().
def _summarize(repo, workingfilectx, otherctx, basectx): def _summarize(repo, workingfilectx, otherctx, basectx):
origfile = (None if workingfilectx.isabsent() else origfile = (None if workingfilectx.isabsent() else
scmutil.origpath(repo.ui, repo, repo.wjoin(workingfilectx.path()))) scmutil.origpath(repo.ui, repo, repo.wjoin(workingfilectx.path())))
def flags(context): def flags(context):
if isinstance(context, absentfilectx): if isinstance(context, absentfilectx):
return { return {

tests/test-merge-conflictinfo.t

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
[ [
{ {
"command": "merge", "command": "merge",
"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"}] "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"}],
"pathconflicts": []
} }
] ]
6) Only requested paths get dumped 6) Only requested paths get dumped
$ hg resolve --tool internal:dumpjson F2 $ hg resolve --tool internal:dumpjson F2
[ [
{ {
"command": "merge", "command": "merge",
"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"}] "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"}],
"pathconflicts": []
} }
] ]
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"
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
[ [
{ {
"command": "merge", "command": "merge",
"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"}] "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"}],
"pathconflicts": []
} }
] ]
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
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
[ [
{ {
"command": "merge", "command": "merge",
"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"}] "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"}],
"pathconflicts": []
} }
] ]
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
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",
"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"}],
"pathconflicts": []
} }
] ]
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 rm file $ hg rm file
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
[ [
{ {
"command": "merge", "command": "merge",
"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"}] "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"}],
"pathconflicts": []
} }
] ]
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
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",
"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"}],
"pathconflicts": []
} }
] ]
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 up -q 0 $ hg up -q 0
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
[ [
{ {
"command": null, "command": null,
"conflicts": [] "conflicts": [],
"pathconflicts": []
} }
] ]
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
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",
"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"}],
"pathconflicts": []
} }
] ]
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"
$ hg up -q 0 $ hg up -q 0
$ 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
[ [
{ {
"command": null, "command": null,
"conflicts": [] "conflicts": [],
"pathconflicts": []
} }
] ]
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
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",
"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"}],
"pathconflicts": []
} }
] ]
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
$ echo "this will cause problems" >> file/subfile $ echo "this will cause problems" >> file/subfile
| |
o (0) base o (0) base
affected: file affected: file
deleted: deleted:
$ 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' file: path conflict - a file or link has the same name as a directory
[255] the local file has been renamed to file~fd7d10c36158
resolve manually then use 'hg resolve --mark file'
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "update", "command": "rebase",
"conflicts": [] "conflicts": [],
"pathconflicts": [{"fileorigin": "local", "path": "file", "renamedto": "file~fd7d10c36158"}]
} }
] ]
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 up -q 0 $ hg up -q 0
| |
o (0) base o (0) base
affected: file affected: file
deleted: deleted:
$ 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) file: path conflict - a file or link has the same name as a directory
[255] the remote file has been renamed to file~ec87889f5f90
resolve manually then use 'hg resolve --mark file'
other [source] changed file~ec87889f5f90 which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "update", "command": "rebase",
"conflicts": [] "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~ec87889f5f90"}, "path": "file~ec87889f5f90"}],
"pathconflicts": [{"fileorigin": "remote", "path": "file", "renamedto": "file~ec87889f5f90"}]
} }
] ]
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"
$ hg up -q 0 $ hg up -q 0
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",
"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"}],
"pathconflicts": []
} }
] ]
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"
$ hg up -q 0 $ hg up -q 0
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",
"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"}],
"pathconflicts": []
} }
] ]
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
$ 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
change change
$ hg resolve --tool=internal:dumpjson --all $ hg resolve --tool=internal:dumpjson --all
[ [
{ {
"command": "rebase", "command": "rebase",
"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"}],
"pathconflicts": []
} }
] ]
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"
$ hg up -q 0 $ hg up -q 0
$ 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",
"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"}],
"pathconflicts": []
} }
] ]