##// END OF EJS Templates
amend: fix amend with copies in extras...
amend: fix amend with copies in extras If copy information is stored only in the commit extras and not in filelogs, then they get lost on amend if the file wasn't also modified in the working copy. That's because we create `filectx` object from the old commit in those cases, and the `.copysource()` of such objects read only from the filelog. This patch fixes it by always creating a new `memfilectx` in these cases, passing the calculated copy information to it. Differential Revision: https://phab.mercurial-scm.org/D12387

File last commit:

r16556:f9262456 stable
r49833:877d7e1a stable
Show More
9diff
42 lines | 1.0 KiB | text/plain | TextLexer
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 #!/bin/rc
# 9diff - Mercurial extdiff wrapper for diff(1)
rfork e
Steven Stallion
plan9: mkfile and 9diff fixes...
r16556 fn getfiles {
cd $1 &&
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 for(f in `{du -as | awk '{print $2}'})
test -f $f && echo `{cleanname $f}
}
Steven Stallion
plan9: mkfile and 9diff fixes...
r16556 fn usage {
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 echo >[1=2] usage: 9diff [diff options] parent child root
exit usage
}
opts=()
while(~ $1 -*){
opts=($opts $1)
shift
}
if(! ~ $#* 3)
usage
# extdiff will set the parent and child to a single file if there is
# only one change. If there are multiple changes, directories will be
# set. diff(1) does not cope particularly with directories; instead we
# do the recursion ourselves and diff each file individually.
if(test -f $1)
diff $opts $1 $2
if not{
# extdiff will create a snapshot of the working copy to prevent
# conflicts during the diff. We circumvent this behavior by
# diffing against the repository root to produce plumbable
# output. This is antisocial.
for(f in `{sort -u <{getfiles $1} <{getfiles $2}}){
file1=$1/$f; test -f $file1 || file1=/dev/null
file2=$3/$f; test -f $file2 || file2=/dev/null
diff $opts $file1 $file2
}
}
exit ''