mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
30913031d4
The home of 'Abort' is 'error' not 'util' however, a lot of code seems to be confused about that and gives all the credit to 'util' instead of the hardworking 'error'. In a spirit of equity, we break the cycle of injustice and give back to 'error' the respect it deserves. And screw that 'util' poser. For great justice.
297 lines
6.5 KiB
Perl
297 lines
6.5 KiB
Perl
$ cat <<EOF > merge
|
|
> import sys, os
|
|
>
|
|
> try:
|
|
> import msvcrt
|
|
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
|
|
> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
|
|
> except ImportError:
|
|
> pass
|
|
>
|
|
> print "merging for", os.path.basename(sys.argv[1])
|
|
> EOF
|
|
$ HGMERGE="python ../merge"; export HGMERGE
|
|
|
|
$ hg init t
|
|
$ cd t
|
|
$ echo This is file a1 > a
|
|
$ hg add a
|
|
$ hg commit -m "commit #0"
|
|
$ echo This is file b1 > b
|
|
$ hg add b
|
|
$ hg commit -m "commit #1"
|
|
|
|
$ hg update 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
Test interrupted updates by exploiting our non-handling of directory collisions
|
|
|
|
$ mkdir b
|
|
$ hg up
|
|
abort: *: '$TESTTMP/t/b' (glob)
|
|
[255]
|
|
$ hg ci
|
|
abort: last update was interrupted
|
|
(use 'hg update' to get a consistent checkout)
|
|
[255]
|
|
$ hg sum
|
|
parent: 0:538afb845929
|
|
commit #0
|
|
branch: default
|
|
commit: (interrupted update)
|
|
update: 1 new changesets (update)
|
|
phases: 2 draft
|
|
$ rmdir b
|
|
$ hg up
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg sum
|
|
parent: 1:b8bb4a988f25 tip
|
|
commit #1
|
|
branch: default
|
|
commit: (clean)
|
|
update: (current)
|
|
phases: 2 draft
|
|
|
|
Prepare a basic merge
|
|
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo This is file c1 > c
|
|
$ hg add c
|
|
$ hg commit -m "commit #2"
|
|
created new head
|
|
$ echo This is file b1 > b
|
|
no merges expected
|
|
$ hg merge -P 1
|
|
changeset: 1:b8bb4a988f25
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: commit #1
|
|
|
|
$ hg merge 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg diff --nodates
|
|
diff -r 49035e18a8e6 b
|
|
--- /dev/null
|
|
+++ b/b
|
|
@@ -0,0 +1,1 @@
|
|
+This is file b1
|
|
$ hg status
|
|
M b
|
|
$ cd ..; rm -r t
|
|
|
|
$ hg init t
|
|
$ cd t
|
|
$ echo This is file a1 > a
|
|
$ hg add a
|
|
$ hg commit -m "commit #0"
|
|
$ echo This is file b1 > b
|
|
$ hg add b
|
|
$ hg commit -m "commit #1"
|
|
|
|
$ hg update 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo This is file c1 > c
|
|
$ hg add c
|
|
$ hg commit -m "commit #2"
|
|
created new head
|
|
$ echo This is file b2 > b
|
|
merge should fail
|
|
$ hg merge 1
|
|
b: untracked file differs
|
|
abort: untracked files in working directory differ from files in requested revision
|
|
[255]
|
|
merge of b expected
|
|
$ hg merge -f 1
|
|
merging b
|
|
merging for b
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg diff --nodates
|
|
diff -r 49035e18a8e6 b
|
|
--- /dev/null
|
|
+++ b/b
|
|
@@ -0,0 +1,1 @@
|
|
+This is file b2
|
|
$ hg status
|
|
M b
|
|
$ cd ..; rm -r t
|
|
|
|
$ hg init t
|
|
$ cd t
|
|
$ echo This is file a1 > a
|
|
$ hg add a
|
|
$ hg commit -m "commit #0"
|
|
$ echo This is file b1 > b
|
|
$ hg add b
|
|
$ hg commit -m "commit #1"
|
|
$ echo This is file b22 > b
|
|
$ hg commit -m "commit #2"
|
|
$ hg update 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo This is file c1 > c
|
|
$ hg add c
|
|
$ hg commit -m "commit #3"
|
|
created new head
|
|
|
|
Contents of b should be "this is file b1"
|
|
$ cat b
|
|
This is file b1
|
|
|
|
$ echo This is file b22 > b
|
|
merge fails
|
|
$ hg merge 2
|
|
abort: uncommitted changes
|
|
(use 'hg status' to list changes)
|
|
[255]
|
|
merge expected!
|
|
$ hg merge -f 2
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg diff --nodates
|
|
diff -r 85de557015a8 b
|
|
--- a/b
|
|
+++ b/b
|
|
@@ -1,1 +1,1 @@
|
|
-This is file b1
|
|
+This is file b22
|
|
$ hg status
|
|
M b
|
|
$ cd ..; rm -r t
|
|
|
|
$ hg init t
|
|
$ cd t
|
|
$ echo This is file a1 > a
|
|
$ hg add a
|
|
$ hg commit -m "commit #0"
|
|
$ echo This is file b1 > b
|
|
$ hg add b
|
|
$ hg commit -m "commit #1"
|
|
$ echo This is file b22 > b
|
|
$ hg commit -m "commit #2"
|
|
$ hg update 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo This is file c1 > c
|
|
$ hg add c
|
|
$ hg commit -m "commit #3"
|
|
created new head
|
|
$ echo This is file b33 > b
|
|
merge of b should fail
|
|
$ hg merge 2
|
|
abort: uncommitted changes
|
|
(use 'hg status' to list changes)
|
|
[255]
|
|
merge of b expected
|
|
$ hg merge -f 2
|
|
merging b
|
|
merging for b
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg diff --nodates
|
|
diff -r 85de557015a8 b
|
|
--- a/b
|
|
+++ b/b
|
|
@@ -1,1 +1,1 @@
|
|
-This is file b1
|
|
+This is file b33
|
|
$ hg status
|
|
M b
|
|
|
|
Test for issue2364
|
|
|
|
$ hg up -qC .
|
|
$ hg rm b
|
|
$ hg ci -md
|
|
$ hg revert -r -2 b
|
|
$ hg up -q -- -2
|
|
|
|
Test that updated files are treated as "modified", when
|
|
'merge.update()' is aborted before 'merge.recordupdates()' (= parents
|
|
aren't changed), even if none of mode, size and timestamp of them
|
|
isn't changed on the filesystem (see also issue4583).
|
|
|
|
$ cat > $TESTTMP/abort.py <<EOF
|
|
> # emulate aborting before "recordupdates()". in this case, files
|
|
> # are changed without updating dirstate
|
|
> from mercurial import extensions, merge, error
|
|
> def applyupdates(orig, *args, **kwargs):
|
|
> orig(*args, **kwargs)
|
|
> raise error.Abort('intentional aborting')
|
|
> def extsetup(ui):
|
|
> extensions.wrapfunction(merge, "applyupdates", applyupdates)
|
|
> EOF
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [fakedirstatewritetime]
|
|
> # emulate invoking dirstate.write() via repo.status()
|
|
> # at 2000-01-01 00:00
|
|
> fakenow = 200001010000
|
|
> EOF
|
|
|
|
(file gotten from other revision)
|
|
|
|
$ hg update -q -C 2
|
|
$ echo 'THIS IS FILE B5' > b
|
|
$ hg commit -m 'commit #5'
|
|
|
|
$ hg update -q -C 3
|
|
$ cat b
|
|
This is file b1
|
|
$ touch -t 200001010000 b
|
|
$ hg debugrebuildstate
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
|
|
> abort = $TESTTMP/abort.py
|
|
> EOF
|
|
$ hg merge 5
|
|
abort: intentional aborting
|
|
[255]
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fakedirstatewritetime = !
|
|
> abort = !
|
|
> EOF
|
|
|
|
$ cat b
|
|
THIS IS FILE B5
|
|
$ touch -t 200001010000 b
|
|
$ hg status -A b
|
|
M b
|
|
|
|
(file merged from other revision)
|
|
|
|
$ hg update -q -C 3
|
|
$ echo 'this is file b6' > b
|
|
$ hg commit -m 'commit #6'
|
|
created new head
|
|
|
|
$ cat b
|
|
this is file b6
|
|
$ touch -t 200001010000 b
|
|
$ hg debugrebuildstate
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
|
|
> abort = $TESTTMP/abort.py
|
|
> EOF
|
|
$ hg merge --tool internal:other 5
|
|
abort: intentional aborting
|
|
[255]
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fakedirstatewritetime = !
|
|
> abort = !
|
|
> EOF
|
|
|
|
$ cat b
|
|
THIS IS FILE B5
|
|
$ touch -t 200001010000 b
|
|
$ hg status -A b
|
|
M b
|
|
|
|
$ cd ..
|