mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
48e7592c3e
Summary: If an executable filenode was reused from p2 and mode hasn't been changed (i.e. a filenode was executable and it is still an executable after a merge) and and p1 didn't have this file at all then file will still be listed as changed just because manifest1.flags(fname) returns ''. After this diff if a filenode is reused then file will be listed as changed only if it's a parent from where this filenode was reused have different flags. So if filenode was reused from p1/p2 and p1/p2 has same flags and new filenode, then file is not listed. But if filenode was reused from p1 and p1 has different flags, then filenode won't be reused. It's possible that both new filenode is equal to both p1 and p2. In that case we'll compare only with p1's mode. Note that it's only get triggered during pushrebase, because during local commits `fctx.filenode()` is None Reviewed By: DurhamG Differential Revision: D14300214 fbshipit-source-id: 1bf6c4802cfce5db6654da673333a56389432617
139 lines
3.3 KiB
Perl
139 lines
3.3 KiB
Perl
$ . helpers-usechg.sh
|
|
$ . library.sh
|
|
|
|
Setup
|
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [ui]
|
|
> ssh = python "$RUNTESTDIR/dummyssh"
|
|
> username = nobody <no.reply@fb.com>
|
|
> [extensions]
|
|
> strip =
|
|
> EOF
|
|
|
|
$ log() {
|
|
> hg log -G -T "{desc} [{phase}:{node|short}] {bookmarks}" "$@"
|
|
> }
|
|
|
|
Set up server repository
|
|
|
|
$ hg init server
|
|
$ cd server
|
|
$ setconfig extensions.pushrebase=
|
|
$ echo foo > a
|
|
$ echo foo > b
|
|
$ hg commit -Am 'initial'
|
|
adding a
|
|
adding b
|
|
$ hg book -r . master_bookmark
|
|
|
|
Clone client repository
|
|
$ cd ..
|
|
$ hg clone ssh://user@dummy/server client -q
|
|
$ cd client
|
|
$ setconfig extensions.pushrebase=
|
|
$ setconfig extensions.remotenames=
|
|
|
|
Add new commit
|
|
$ cd ../server
|
|
$ hg up -q master_bookmark
|
|
$ echo 'bar' > a
|
|
$ hg commit -Am 'a => bar'
|
|
|
|
Create a merge commit that merges executable file in
|
|
$ cd ../client
|
|
$ hg up -q tip
|
|
$ log -r .
|
|
@ initial [public:2bb9d20e471c] master_bookmark
|
|
|
|
$ hg up -q null
|
|
$ echo ex > ex
|
|
$ chmod +x ex
|
|
$ hg ci -Aqm tomerge
|
|
$ log -r .
|
|
@ tomerge [draft:db9ca4f4d8f9]
|
|
|
|
$ hg up -q 2bb9d20e471c
|
|
$ hg merge -q db9ca4f4d8f9
|
|
$ hg ci -m merge
|
|
$ hg push -r . --to master_bookmark -q
|
|
|
|
Check that file list contains no changed files, because a file were just merged in
|
|
$ hg up -q tip
|
|
$ hg log -r . -T '{files}'
|
|
|
|
Create a merge commit that merges a file and then makes it executable
|
|
$ cd ../server
|
|
$ hg up -q master_bookmark
|
|
$ mkcommit randomservercommit
|
|
|
|
$ cd ../client
|
|
$ hg up -q null
|
|
$ echo no_exec > no_exec
|
|
$ hg ci -Aqm tomerge_no_exec
|
|
$ hg log -r . -T '{node}'
|
|
38806fbf9b2d528b5e65b29edbb249ace57ca52e (no-eol)
|
|
|
|
$ hg up -q 2bb9d20e471c
|
|
$ hg merge -q 38806fbf9b2d
|
|
$ chmod +x no_exec
|
|
$ hg ci -m merge
|
|
|
|
$ hg push -r . --to master_bookmark -q
|
|
$ hg up -q tip
|
|
$ hg log -r . -T '{files}'
|
|
no_exec (no-eol)
|
|
|
|
Create a merge commit that merges executable and non-executable files.
|
|
File list should be empty because we are keeping p1 flags
|
|
$ cd ../server
|
|
$ hg up -q master_bookmark
|
|
$ mkcommit randomservercommit2
|
|
|
|
$ cd ../client
|
|
$ hg up -q null
|
|
$ echo no_exec_2 > no_exec_2
|
|
$ hg ci -Aqm tomerge_no_exec
|
|
|
|
$ hg log -r . -T '{node}'
|
|
9c093b936a3cf120f340f16111bd80331029fd5c (no-eol)
|
|
$ hg up -q master_bookmark
|
|
$ echo no_exec_2 > no_exec_2
|
|
$ chmod +x no_exec_2
|
|
$ hg commit -Aqm 'exec commit'
|
|
$ hg merge -q 9c093b936a3cf120f340f16111bd80331029fd5c
|
|
warning: cannot merge flags for no_exec_2 without common ancestor - keeping local flags
|
|
|
|
$ hg ci -m merge
|
|
$ hg push -q -r . --to master_bookmark
|
|
$ hg up -q tip
|
|
$ hg log -r . -T '{files}'
|
|
|
|
Create a merge commit that merges executable and non-executable files.
|
|
File list should be non-empty because we are keeping p2 flags
|
|
$ cd ../server
|
|
$ hg up -q master_bookmark
|
|
$ mkcommit randomservercommit3
|
|
|
|
$ cd ../client
|
|
$ hg up -q null
|
|
$ echo no_exec_3 > no_exec_3
|
|
$ hg ci -Aqm tomerge_no_exec
|
|
|
|
$ hg log -r . -T '{node}'
|
|
84cb2313f1da1968f526b51ea263f81a6a9b9b1c (no-eol)
|
|
$ hg up -q master_bookmark
|
|
$ echo no_exec_3 > no_exec_3
|
|
$ chmod +x no_exec_3
|
|
$ hg commit -Aqm 'exec commit'
|
|
$ hg merge -q 84cb2313f1da1968f526b51ea263f81a6a9b9b1c
|
|
warning: cannot merge flags for no_exec_3 without common ancestor - keeping local flags
|
|
$ chmod -x no_exec_3
|
|
|
|
$ hg ci -m merge
|
|
$ hg push -q -r . --to master_bookmark
|
|
$ hg up -q tip
|
|
$ hg log -r . -T '{files}'
|
|
no_exec_3 (no-eol)
|