2010-08-12 17:54:41 +04:00
|
|
|
$ hg init a
|
|
|
|
$ mkdir a/d1
|
|
|
|
$ mkdir a/d1/d2
|
|
|
|
$ echo line 1 > a/a
|
|
|
|
$ echo line 1 > a/d1/d2/a
|
|
|
|
$ hg --cwd a ci -Ama
|
|
|
|
adding a
|
|
|
|
adding d1/d2/a
|
|
|
|
|
|
|
|
$ echo line 2 >> a/a
|
|
|
|
$ hg --cwd a ci -u someone -d '1 0' -m'second change'
|
|
|
|
|
2011-10-21 20:10:43 +04:00
|
|
|
import with no args:
|
|
|
|
|
|
|
|
$ hg --cwd a import
|
|
|
|
abort: need at least one patch to import
|
|
|
|
[255]
|
2010-08-12 17:54:41 +04:00
|
|
|
|
2011-04-30 20:31:28 +04:00
|
|
|
generate patches for the test
|
|
|
|
|
|
|
|
$ hg --cwd a export tip > exported-tip.patch
|
|
|
|
$ hg --cwd a diff -r0:1 > diffed-tip.patch
|
|
|
|
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
import exported patch
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is not invoked, if the patch contains the
|
|
|
|
commit message and '--edit' is not specified)
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-05-10 19:49:36 +04:00
|
|
|
$ HGEDITOR=cat hg --cwd b import ../exported-tip.patch
|
2011-04-30 20:31:28 +04:00
|
|
|
applying ../exported-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
|
2013-02-09 01:54:17 +04:00
|
|
|
message and committer and date should be same
|
2010-08-12 17:54:41 +04:00
|
|
|
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg --cwd b tip
|
|
|
|
changeset: 1:1d4bd90af0e4
|
|
|
|
tag: tip
|
2010-08-12 17:54:41 +04:00
|
|
|
user: someone
|
2011-04-30 20:31:28 +04:00
|
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
|
|
summary: second change
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
import exported patch with external patcher
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is invoked, if the '--edit' is specified,
|
|
|
|
regardless of the commit message in the patch)
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ cat > dummypatch.py <<EOF
|
|
|
|
> print 'patching file a'
|
|
|
|
> file('a', 'wb').write('line2\n')
|
|
|
|
> EOF
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-05-10 19:49:36 +04:00
|
|
|
$ HGEDITOR=cat hg --config ui.patch='python ../dummypatch.py' --cwd b import --edit ../exported-tip.patch
|
2011-04-30 20:31:28 +04:00
|
|
|
applying ../exported-tip.patch
|
2014-05-10 19:49:36 +04:00
|
|
|
second change
|
|
|
|
|
|
|
|
|
|
|
|
HG: Enter commit message. Lines beginning with 'HG:' are removed.
|
|
|
|
HG: Leave message empty to abort commit.
|
|
|
|
HG: --
|
|
|
|
HG: user: someone
|
|
|
|
HG: branch 'default'
|
|
|
|
HG: changed a
|
2010-08-12 17:54:41 +04:00
|
|
|
$ cat b/a
|
|
|
|
line2
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
import of plain diff should fail without message
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is invoked, if the patch doesn't contain
|
|
|
|
the commit message, regardless of '--edit')
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-08-16 05:43:59 +04:00
|
|
|
$ cat > $TESTTMP/editor.sh <<EOF
|
|
|
|
> env | grep HGEDITFORM
|
|
|
|
> cat \$1
|
|
|
|
> EOF
|
|
|
|
$ HGEDITOR="sh $TESTTMP/editor.sh" hg --cwd b import ../diffed-tip.patch
|
2011-04-30 20:31:28 +04:00
|
|
|
applying ../diffed-tip.patch
|
2014-08-16 05:43:59 +04:00
|
|
|
HGEDITFORM=import.normal.normal
|
2014-05-10 19:49:36 +04:00
|
|
|
|
|
|
|
|
|
|
|
HG: Enter commit message. Lines beginning with 'HG:' are removed.
|
|
|
|
HG: Leave message empty to abort commit.
|
|
|
|
HG: --
|
|
|
|
HG: user: test
|
|
|
|
HG: branch 'default'
|
|
|
|
HG: changed a
|
2010-08-12 17:54:41 +04:00
|
|
|
abort: empty commit message
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2014-08-23 18:03:50 +04:00
|
|
|
|
|
|
|
Test avoiding editor invocation at applying the patch with --exact,
|
|
|
|
even if commit message is empty
|
|
|
|
|
|
|
|
$ echo a >> b/a
|
|
|
|
$ hg --cwd b commit -m ' '
|
|
|
|
$ hg --cwd b tip -T "{node}\n"
|
|
|
|
d8804f3f5396d800812f579c8452796a5993bdb2
|
|
|
|
$ hg --cwd b export -o ../empty-log.diff .
|
|
|
|
$ hg --cwd b update -q -C ".^1"
|
|
|
|
$ hg --cwd b --config extensions.strip= strip -q tip
|
|
|
|
$ HGEDITOR=cat hg --cwd b import --exact ../empty-log.diff
|
|
|
|
applying ../empty-log.diff
|
|
|
|
$ hg --cwd b tip -T "{node}\n"
|
|
|
|
d8804f3f5396d800812f579c8452796a5993bdb2
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
import of plain diff should be ok with message
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg --cwd b import -mpatch ../diffed-tip.patch
|
|
|
|
applying ../diffed-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
import of plain diff with specific date and user
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is not invoked, if
|
|
|
|
'--message'/'--logfile' is specified and '--edit' is not)
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg --cwd b import -mpatch -d '1 0' -u 'user@nowhere.net' ../diffed-tip.patch
|
|
|
|
applying ../diffed-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg -R b tip -pv
|
|
|
|
changeset: 1:ca68f19f3a40
|
|
|
|
tag: tip
|
|
|
|
user: user@nowhere.net
|
|
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
|
|
files: a
|
|
|
|
description:
|
|
|
|
patch
|
|
|
|
|
|
|
|
|
|
|
|
diff -r 80971e65b431 -r ca68f19f3a40 a
|
|
|
|
--- a/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/a Thu Jan 01 00:00:01 1970 +0000
|
|
|
|
@@ -1,1 +1,2 @@
|
|
|
|
line 1
|
|
|
|
+line 2
|
|
|
|
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
import of plain diff should be ok with --no-commit
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is not invoked, if '--no-commit' is
|
|
|
|
specified, regardless of '--edit')
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-05-10 19:49:36 +04:00
|
|
|
$ HGEDITOR=cat hg --cwd b import --no-commit --edit ../diffed-tip.patch
|
2011-04-30 20:31:28 +04:00
|
|
|
applying ../diffed-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg --cwd b diff --nodates
|
|
|
|
diff -r 80971e65b431 a
|
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
|
|
|
@@ -1,1 +1,2 @@
|
|
|
|
line 1
|
|
|
|
+line 2
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
2010-10-10 00:13:08 +04:00
|
|
|
import of malformed plain diff should fail
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-04-30 20:31:28 +04:00
|
|
|
$ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch
|
2010-10-10 00:13:08 +04:00
|
|
|
$ hg --cwd b import -mpatch ../broken.patch
|
|
|
|
applying ../broken.patch
|
|
|
|
abort: bad hunk #1
|
|
|
|
[255]
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
hg -R repo import
|
|
|
|
put the clone in a subdir - having a directory named "a"
|
|
|
|
used to hide a bug.
|
|
|
|
|
|
|
|
$ mkdir dir
|
|
|
|
$ hg clone -r0 a dir/b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd dir
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg -R b import ../exported-tip.patch
|
|
|
|
applying ../exported-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ cd ..
|
|
|
|
$ rm -r dir
|
|
|
|
|
|
|
|
|
|
|
|
import from stdin
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg --cwd b import - < exported-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
applying patch from stdin
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
import two patches in one stream
|
|
|
|
|
|
|
|
$ hg init b
|
|
|
|
$ hg --cwd a export 0:tip | hg --cwd b import -
|
|
|
|
applying patch from stdin
|
|
|
|
$ hg --cwd a id
|
|
|
|
1d4bd90af0e4 tip
|
|
|
|
$ hg --cwd b id
|
|
|
|
1d4bd90af0e4 tip
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
override commit message
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg --cwd b import -m 'override' - < exported-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
applying patch from stdin
|
|
|
|
$ hg --cwd b tip | grep override
|
|
|
|
summary: override
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
$ cat > mkmsg.py <<EOF
|
|
|
|
> import email.Message, sys
|
|
|
|
> msg = email.Message.Message()
|
2011-04-30 20:31:28 +04:00
|
|
|
> patch = open(sys.argv[1], 'rb').read()
|
|
|
|
> msg.set_payload('email commit message\n' + patch)
|
2010-08-12 17:54:41 +04:00
|
|
|
> msg['Subject'] = 'email patch'
|
|
|
|
> msg['From'] = 'email patcher'
|
2011-11-16 06:45:14 +04:00
|
|
|
> file(sys.argv[2], 'wb').write(msg.as_string())
|
2010-08-12 17:54:41 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
|
|
|
|
plain diff in email, subject, message body
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-11-16 06:45:14 +04:00
|
|
|
$ python mkmsg.py diffed-tip.patch msg.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg --cwd b import ../msg.patch
|
|
|
|
applying ../msg.patch
|
|
|
|
$ hg --cwd b tip | grep email
|
|
|
|
user: email patcher
|
|
|
|
summary: email patch
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
plain diff in email, no subject, message body
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ grep -v '^Subject:' msg.patch | hg --cwd b import -
|
|
|
|
applying patch from stdin
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
plain diff in email, subject, no message body
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ grep -v '^email ' msg.patch | hg --cwd b import -
|
|
|
|
applying patch from stdin
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
plain diff in email, no subject, no message body, should fail
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -
|
|
|
|
applying patch from stdin
|
|
|
|
abort: empty commit message
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-12 17:54:41 +04:00
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
hg export in email, should use patch header
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-11-16 06:45:14 +04:00
|
|
|
$ python mkmsg.py exported-tip.patch msg.patch
|
|
|
|
$ cat msg.patch | hg --cwd b import -
|
2010-08-12 17:54:41 +04:00
|
|
|
applying patch from stdin
|
|
|
|
$ hg --cwd b tip | grep second
|
|
|
|
summary: second change
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
subject: duplicate detection, removal of [PATCH]
|
|
|
|
The '---' tests the gitsendmail handling without proper mail headers
|
|
|
|
|
|
|
|
$ cat > mkmsg2.py <<EOF
|
|
|
|
> import email.Message, sys
|
|
|
|
> msg = email.Message.Message()
|
2011-04-30 20:31:28 +04:00
|
|
|
> patch = open(sys.argv[1], 'rb').read()
|
|
|
|
> msg.set_payload('email patch\n\nnext line\n---\n' + patch)
|
2010-08-12 17:54:41 +04:00
|
|
|
> msg['Subject'] = '[PATCH] email patch'
|
|
|
|
> msg['From'] = 'email patcher'
|
2011-11-16 06:45:14 +04:00
|
|
|
> file(sys.argv[2], 'wb').write(msg.as_string())
|
2010-08-12 17:54:41 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
|
|
|
|
plain diff in email, [PATCH] subject, message body with subject
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-11-16 06:45:14 +04:00
|
|
|
$ python mkmsg2.py diffed-tip.patch msg.patch
|
|
|
|
$ cat msg.patch | hg --cwd b import -
|
2010-08-12 17:54:41 +04:00
|
|
|
applying patch from stdin
|
|
|
|
$ hg --cwd b tip --template '{desc}\n'
|
|
|
|
email patch
|
|
|
|
|
|
|
|
next line
|
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Issue963: Parent of working dir incorrect after import of multiple
|
|
|
|
patches and rollback
|
|
|
|
|
|
|
|
We weren't backing up the correct dirstate file when importing many
|
|
|
|
patches: import patch1 patch2; rollback
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ echo line 3 >> a/a
|
|
|
|
$ hg --cwd a ci -m'third change'
|
|
|
|
$ hg --cwd a export -o '../patch%R' 1 2
|
|
|
|
$ hg clone -qr0 a b
|
|
|
|
$ hg --cwd b parents --template 'parent: {rev}\n'
|
|
|
|
parent: 0
|
2011-10-02 05:30:49 +04:00
|
|
|
$ hg --cwd b import -v ../patch1 ../patch2
|
2010-08-12 17:54:41 +04:00
|
|
|
applying ../patch1
|
2011-10-02 05:30:49 +04:00
|
|
|
patching file a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing files:
|
2011-10-02 05:30:49 +04:00
|
|
|
a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing manifest
|
|
|
|
committing changelog
|
2011-10-02 05:30:49 +04:00
|
|
|
created 1d4bd90af0e4
|
2010-08-12 17:54:41 +04:00
|
|
|
applying ../patch2
|
2011-10-02 05:30:49 +04:00
|
|
|
patching file a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing files:
|
2011-10-02 05:30:49 +04:00
|
|
|
a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing manifest
|
|
|
|
committing changelog
|
2011-10-02 05:30:49 +04:00
|
|
|
created 6d019af21222
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg --cwd b rollback
|
import: wrap a transaction around the whole command
Now 'rollback' after 'import' is less surprising: it rolls back all of
the imported changesets, not just the last one. As an extra added
benefit, you don't need 'rollback -f' after 'import --bypass', which
was an undesired side effect of fixing issue2998 (f9f52d71c33b)..
Note that this is a different take on issue963, which complained that
rollback after importing multiple patches returned the working dir
parent to the starting point, not to the second-last patch applied.
Since we now rollback the entire import, returning the working dir to
the starting point is entirely logical. So this change also undoes
b12d79024900, the fix to issue963, and updates its tests accordingly.
Bottom line: rollback after import was weird before issue963,
understandable since the fix for issue963, and even better now.
2011-10-02 22:34:28 +04:00
|
|
|
repository tip rolled back to revision 0 (undo import)
|
|
|
|
working directory now based on revision 0
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg --cwd b parents --template 'parent: {rev}\n'
|
import: wrap a transaction around the whole command
Now 'rollback' after 'import' is less surprising: it rolls back all of
the imported changesets, not just the last one. As an extra added
benefit, you don't need 'rollback -f' after 'import --bypass', which
was an undesired side effect of fixing issue2998 (f9f52d71c33b)..
Note that this is a different take on issue963, which complained that
rollback after importing multiple patches returned the working dir
parent to the starting point, not to the second-last patch applied.
Since we now rollback the entire import, returning the working dir to
the starting point is entirely logical. So this change also undoes
b12d79024900, the fix to issue963, and updates its tests accordingly.
Bottom line: rollback after import was weird before issue963,
understandable since the fix for issue963, and even better now.
2011-10-02 22:34:28 +04:00
|
|
|
parent: 0
|
localrepo: restore dirstate to one before rollbacking if not parent-gone
'localrepository.rollback()' explicilty restores dirstate, only if at
least one of current parents of the working directory is removed at
rollbacking (a.k.a "parent-gone").
After DirstateTransactionPlan, 'dirstate.write()' will cause marking
'.hg/dirstate' as a file to be restored at rollbacking.
https://mercurial.selenic.com/wiki/DirstateTransactionPlan
Then, 'transaction.rollback()' restores '.hg/dirstate' regardless of
parents of the working directory at that time, and this causes
unexpected dirstate changes if not "parent-gone" (e.g. "hg update" to
another branch after "hg commit" or so, then "hg rollback").
To avoid such situation, this patch restores dirstate to one before
rollbacking if not "parent-gone".
before:
b1. restore dirstate explicitly, if "parent-gone"
after:
a1. save dirstate before actual rollbacking via dirstateguard
a2. restore dirstate via 'transaction.rollback()'
a3. if "parent-gone"
- discard backup (a1)
- restore dirstate from 'undo.dirstate'
a4. otherwise, restore dirstate from backup (a1)
Even though restoring dirstate at (a3) after (a2) seems redundant,
this patch keeps this existing code path, because:
- it isn't ensured that 'dirstate.write()' was invoked at least once
while transaction running
If not, '.hg/dirstate' isn't restored at (a2).
In addition to it, rude 3rd party extension invoking
'dirstate.write()' without 'repo' while transaction running (see
subsequent patches for detail) may break consistency of a file
backup-ed by transaction.
- this patch mainly focuses on changes for DirstateTransactionPlan
Restoring dirstate at (a3) itself should be cheaper enough than
rollbacking itself. Redundancy will be removed in next step.
Newly added test is almost meaningless at this point. It will be used
to detect regression while implementing delayed dirstate write out.
2015-10-13 22:25:43 +03:00
|
|
|
|
|
|
|
Test that "hg rollback" doesn't restore dirstate to one at the
|
|
|
|
beginning of the rollbacked transaction in not-"parent-gone" case.
|
|
|
|
|
|
|
|
invoking pretxncommit hook will cause marking '.hg/dirstate' as a file
|
|
|
|
to be restored at rollbacking, after DirstateTransactionPlan (see wiki
|
|
|
|
page for detail).
|
|
|
|
|
|
|
|
$ hg --cwd b branch -q foobar
|
|
|
|
$ hg --cwd b commit -m foobar
|
|
|
|
$ hg --cwd b update 0 -q
|
|
|
|
$ hg --cwd b import ../patch1 ../patch2 --config hooks.pretxncommit=true
|
|
|
|
applying ../patch1
|
|
|
|
applying ../patch2
|
|
|
|
$ hg --cwd b update -q 1
|
|
|
|
$ hg --cwd b rollback -q
|
|
|
|
$ hg --cwd b parents --template 'parent: {rev}\n'
|
|
|
|
parent: 1
|
|
|
|
|
cmdutil: make in-memory changes visible to external editor (issue4378)
Before this patch, external editor process for the commit log can't
view some in-memory changes (especially, of dirstate), because they
aren't written out until the end of transaction (or wlock).
This causes unexpected output of Mercurial commands spawned from that
editor process.
To make in-memory changes visible to external editor process, this
patch does:
- write (or schedule to write) in-memory dirstate changes, and
- set HG_PENDING environment variable, if:
- a transaction is running, and
- there are in-memory changes to be visible
"hg diff" spawned from external editor process for "hg qrefresh"
shows:
- "changes newly imported into the topmost" before ab68b153ce34(*)
- "all changes recorded in the topmost by refreshing" after this patch
(*) ab68b153ce34 changed steps invoking editor process
Even though backward compatibility may be broken, the latter behavior
looks reasonable, because "hg diff" spawned from the editor process
consistently shows "what changes new revision records" regardless of
invocation context.
In fact, issue4378 itself should be resolved by b46029eb5b29, which
made 'repo.transaction()' write in-memory dirstate changes out
explicitly before starting transaction. It also made "hg qrefresh"
imply 'dirstate.write()' before external editor invocation in call
chain below.
- mq.queue.refresh
- strip.strip
- repair.strip
- localrepository.transaction
- dirstate.write
- localrepository.commit
- invoke external editor
Though, this patch has '(issue4378)' in own summary line to indicate
that issues like issue4378 should be fixed by this.
BTW, this patch adds '-m' option to a 'hg ci --amend' execution in
'test-commit-amend.t', to avoid invoking external editor process.
In this case, "unsure" states may be changed to "clean" according to
timestamp or so on. These changes should be written into pending file,
if external editor invocation is required,
Then, writing dirstate changes out breaks stability of test, because
it shows "transaction abort!/rollback completed" occasionally.
Aborting after editor process invocation while commands below may
cause similar instability of tests, too (AFAIK, there is no more such
one, at this revision)
- commit --amend
- without --message/--logfile
- import
- without --message/--logfile,
- without --no-commit,
- without --bypass,
- one of below, and
- patch has no description text, or
- with --edit
- aborting at the 1st patch, which adds or removes file(s)
- if it only changes existing files, status is checked only for
changed files by 'scmutil.matchfiles()', and transition from
"unsure" to "normal" in dirstate doesn't occur (= dirstate
isn't changed, and written out)
- aborting at the 2nd or later patch implies other pending
changes (e.g. changelog), and always causes showing
"transaction abort!/rollback completed"
2015-10-16 19:15:34 +03:00
|
|
|
$ hg --cwd b update -q -C 0
|
|
|
|
$ hg --cwd b --config extensions.strip= strip -q 1
|
|
|
|
|
|
|
|
Test visibility of in-memory distate changes inside transaction to
|
|
|
|
external process
|
|
|
|
|
|
|
|
$ echo foo > a/foo
|
|
|
|
$ hg --cwd a commit -A -m 'adding foo' foo
|
|
|
|
$ hg --cwd a export -o '../patch%R' 3
|
|
|
|
|
|
|
|
$ cat > $TESTTMP/checkvisibility.sh <<EOF
|
|
|
|
> echo "===="
|
|
|
|
> hg parents --template "VISIBLE {rev}:{node|short}\n"
|
|
|
|
> hg status -amr
|
|
|
|
> # test that pending changes are hidden
|
|
|
|
> unset HG_PENDING
|
|
|
|
> hg parents --template "ACTUAL {rev}:{node|short}\n"
|
|
|
|
> hg status -amr
|
|
|
|
> echo "===="
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
== test visibility to external editor
|
|
|
|
|
|
|
|
$ (cd b && sh "$TESTTMP/checkvisibility.sh")
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
====
|
|
|
|
|
|
|
|
$ HGEDITOR="sh $TESTTMP/checkvisibility.sh" hg --cwd b import -v --edit ../patch1 ../patch2 ../patch3
|
|
|
|
applying ../patch1
|
|
|
|
patching file a
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
committing files:
|
|
|
|
a
|
|
|
|
committing manifest
|
|
|
|
committing changelog
|
|
|
|
created 1d4bd90af0e4
|
|
|
|
applying ../patch2
|
|
|
|
patching file a
|
|
|
|
====
|
|
|
|
VISIBLE 1:1d4bd90af0e4
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
committing files:
|
|
|
|
a
|
|
|
|
committing manifest
|
|
|
|
committing changelog
|
|
|
|
created 6d019af21222
|
|
|
|
applying ../patch3
|
|
|
|
patching file foo
|
|
|
|
adding foo
|
|
|
|
====
|
|
|
|
VISIBLE 2:6d019af21222
|
|
|
|
A foo
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
committing files:
|
|
|
|
foo
|
|
|
|
committing manifest
|
|
|
|
committing changelog
|
|
|
|
created 55e3f75b2378
|
|
|
|
|
|
|
|
$ hg --cwd b rollback -q
|
|
|
|
|
|
|
|
(content of file "a" is already changed and it should be recognized as
|
|
|
|
"M", even though dirstate is restored to one before "hg import")
|
|
|
|
|
|
|
|
$ (cd b && sh "$TESTTMP/checkvisibility.sh")
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
$ hg --cwd b revert --no-backup a
|
|
|
|
$ rm -f b/foo
|
|
|
|
|
2015-10-16 19:15:34 +03:00
|
|
|
== test visibility to precommit external hook
|
|
|
|
|
|
|
|
$ cat >> b/.hg/hgrc <<EOF
|
|
|
|
> [hooks]
|
|
|
|
> precommit.visibility = sh $TESTTMP/checkvisibility.sh
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ (cd b && sh "$TESTTMP/checkvisibility.sh")
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
====
|
|
|
|
|
|
|
|
$ hg --cwd b import ../patch1 ../patch2 ../patch3
|
|
|
|
applying ../patch1
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
applying ../patch2
|
|
|
|
====
|
|
|
|
VISIBLE 1:1d4bd90af0e4
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
applying ../patch3
|
|
|
|
====
|
|
|
|
VISIBLE 2:6d019af21222
|
|
|
|
A foo
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
|
|
|
|
$ hg --cwd b rollback -q
|
|
|
|
$ (cd b && sh "$TESTTMP/checkvisibility.sh")
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
$ hg --cwd b revert --no-backup a
|
|
|
|
$ rm -f b/foo
|
|
|
|
|
|
|
|
$ cat >> b/.hg/hgrc <<EOF
|
|
|
|
> [hooks]
|
|
|
|
> precommit.visibility =
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
== test visibility to pretxncommit external hook
|
|
|
|
|
|
|
|
$ cat >> b/.hg/hgrc <<EOF
|
|
|
|
> [hooks]
|
|
|
|
> pretxncommit.visibility = sh $TESTTMP/checkvisibility.sh
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ (cd b && sh "$TESTTMP/checkvisibility.sh")
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
====
|
|
|
|
|
|
|
|
$ hg --cwd b import ../patch1 ../patch2 ../patch3
|
|
|
|
applying ../patch1
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
applying ../patch2
|
|
|
|
====
|
|
|
|
VISIBLE 1:1d4bd90af0e4
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
applying ../patch3
|
|
|
|
====
|
|
|
|
VISIBLE 2:6d019af21222
|
|
|
|
A foo
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
|
|
|
|
$ hg --cwd b rollback -q
|
|
|
|
$ (cd b && sh "$TESTTMP/checkvisibility.sh")
|
|
|
|
====
|
|
|
|
VISIBLE 0:80971e65b431
|
|
|
|
M a
|
|
|
|
ACTUAL 0:80971e65b431
|
|
|
|
M a
|
|
|
|
====
|
|
|
|
$ hg --cwd b revert --no-backup a
|
|
|
|
$ rm -f b/foo
|
|
|
|
|
|
|
|
$ cat >> b/.hg/hgrc <<EOF
|
|
|
|
> [hooks]
|
|
|
|
> pretxncommit.visibility =
|
|
|
|
> EOF
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
$ rm -r b
|
|
|
|
|
|
|
|
|
|
|
|
importing a patch in a subdirectory failed at the commit stage
|
|
|
|
|
|
|
|
$ echo line 2 >> a/d1/d2/a
|
|
|
|
$ hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change'
|
|
|
|
|
|
|
|
hg import in a subdirectory
|
|
|
|
|
|
|
|
$ hg clone -r0 a b
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2010-09-22 01:44:13 +04:00
|
|
|
$ hg --cwd a export tip > tmp
|
2011-04-30 20:31:28 +04:00
|
|
|
$ sed -e 's/d1\/d2\///' < tmp > subdir-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ dir=`pwd`
|
|
|
|
$ cd b/d1/d2 2>&1 > /dev/null
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg import ../../../subdir-tip.patch
|
|
|
|
applying ../../../subdir-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ cd "$dir"
|
|
|
|
|
|
|
|
message should be 'subdir change'
|
|
|
|
committer should be 'someoneelse'
|
|
|
|
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg --cwd b tip
|
|
|
|
changeset: 1:3577f5aea227
|
|
|
|
tag: tip
|
2010-08-12 17:54:41 +04:00
|
|
|
user: someoneelse
|
2011-04-30 20:31:28 +04:00
|
|
|
date: Thu Jan 01 00:00:01 1970 +0000
|
|
|
|
summary: subdir change
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
should be empty
|
|
|
|
|
|
|
|
$ hg --cwd b status
|
|
|
|
|
|
|
|
|
|
|
|
Test fuzziness (ambiguous patch location, fuzz=2)
|
|
|
|
|
|
|
|
$ hg init fuzzy
|
|
|
|
$ cd fuzzy
|
|
|
|
$ echo line1 > a
|
|
|
|
$ echo line0 >> a
|
|
|
|
$ echo line3 >> a
|
|
|
|
$ hg ci -Am adda
|
|
|
|
adding a
|
|
|
|
$ echo line1 > a
|
|
|
|
$ echo line2 >> a
|
|
|
|
$ echo line0 >> a
|
|
|
|
$ echo line3 >> a
|
|
|
|
$ hg ci -m change a
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg export tip > fuzzy-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg up -C 0
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo line1 > a
|
|
|
|
$ echo line0 >> a
|
|
|
|
$ echo line1 >> a
|
|
|
|
$ echo line0 >> a
|
|
|
|
$ hg ci -m brancha
|
|
|
|
created new head
|
2015-06-18 23:42:40 +03:00
|
|
|
$ hg import --config patch.fuzz=0 -v fuzzy-tip.patch
|
|
|
|
applying fuzzy-tip.patch
|
|
|
|
patching file a
|
|
|
|
Hunk #1 FAILED at 0
|
|
|
|
1 out of 1 hunks FAILED -- saving rejects to file a.rej
|
|
|
|
abort: patch failed to apply
|
|
|
|
[255]
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg import --no-commit -v fuzzy-tip.patch
|
|
|
|
applying fuzzy-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
patching file a
|
2012-02-13 20:22:35 +04:00
|
|
|
Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
|
2011-10-02 05:30:49 +04:00
|
|
|
applied to working directory
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg revert -a
|
|
|
|
reverting a
|
|
|
|
|
2010-10-22 01:04:34 +04:00
|
|
|
|
|
|
|
import with --no-commit should have written .hg/last-message.txt
|
|
|
|
|
2010-11-08 03:55:32 +03:00
|
|
|
$ cat .hg/last-message.txt
|
|
|
|
change (no-eol)
|
2010-10-22 01:04:34 +04:00
|
|
|
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
test fuzziness with eol=auto
|
|
|
|
|
2011-04-30 20:31:28 +04:00
|
|
|
$ hg --config patch.eol=auto import --no-commit -v fuzzy-tip.patch
|
|
|
|
applying fuzzy-tip.patch
|
2010-08-12 17:54:41 +04:00
|
|
|
patching file a
|
2012-02-13 20:22:35 +04:00
|
|
|
Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
|
2011-10-02 05:30:49 +04:00
|
|
|
applied to working directory
|
2010-08-12 17:54:41 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
Test hunk touching empty files (issue906)
|
|
|
|
|
|
|
|
$ hg init empty
|
|
|
|
$ cd empty
|
|
|
|
$ touch a
|
|
|
|
$ touch b1
|
|
|
|
$ touch c1
|
|
|
|
$ echo d > d
|
|
|
|
$ hg ci -Am init
|
|
|
|
adding a
|
|
|
|
adding b1
|
|
|
|
adding c1
|
|
|
|
adding d
|
|
|
|
$ echo a > a
|
|
|
|
$ echo b > b1
|
|
|
|
$ hg mv b1 b2
|
|
|
|
$ echo c > c1
|
|
|
|
$ hg copy c1 c2
|
|
|
|
$ rm d
|
|
|
|
$ touch d
|
|
|
|
$ hg diff --git
|
|
|
|
diff --git a/a b/a
|
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+a
|
|
|
|
diff --git a/b1 b/b2
|
|
|
|
rename from b1
|
|
|
|
rename to b2
|
|
|
|
--- a/b1
|
|
|
|
+++ b/b2
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+b
|
|
|
|
diff --git a/c1 b/c1
|
|
|
|
--- a/c1
|
|
|
|
+++ b/c1
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+c
|
|
|
|
diff --git a/c1 b/c2
|
|
|
|
copy from c1
|
|
|
|
copy to c2
|
|
|
|
--- a/c1
|
|
|
|
+++ b/c2
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+c
|
|
|
|
diff --git a/d b/d
|
|
|
|
--- a/d
|
|
|
|
+++ b/d
|
|
|
|
@@ -1,1 +0,0 @@
|
|
|
|
-d
|
|
|
|
$ hg ci -m empty
|
|
|
|
$ hg export --git tip > empty.diff
|
|
|
|
$ hg up -C 0
|
|
|
|
4 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
|
$ hg import empty.diff
|
|
|
|
applying empty.diff
|
|
|
|
$ for name in a b1 b2 c1 c2 d; do
|
|
|
|
> echo % $name file
|
|
|
|
> test -f $name && cat $name
|
|
|
|
> done
|
|
|
|
% a file
|
|
|
|
a
|
|
|
|
% b1 file
|
|
|
|
% b2 file
|
|
|
|
b
|
|
|
|
% c1 file
|
|
|
|
c
|
|
|
|
% c2 file
|
|
|
|
c
|
|
|
|
% d file
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
Test importing a patch ending with a binary file removal
|
|
|
|
|
|
|
|
$ hg init binaryremoval
|
|
|
|
$ cd binaryremoval
|
|
|
|
$ echo a > a
|
2014-10-15 23:35:59 +04:00
|
|
|
$ $PYTHON -c "file('b', 'wb').write('a\x00b')"
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg ci -Am addall
|
|
|
|
adding a
|
|
|
|
adding b
|
|
|
|
$ hg rm a
|
|
|
|
$ hg rm b
|
|
|
|
$ hg st
|
|
|
|
R a
|
|
|
|
R b
|
|
|
|
$ hg ci -m remove
|
|
|
|
$ hg export --git . > remove.diff
|
|
|
|
$ cat remove.diff | grep git
|
|
|
|
diff --git a/a b/a
|
|
|
|
diff --git a/b b/b
|
|
|
|
$ hg up -C 0
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg import remove.diff
|
|
|
|
applying remove.diff
|
|
|
|
$ hg manifest
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Issue927: test update+rename with common name
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg init t
|
|
|
|
$ cd t
|
|
|
|
$ touch a
|
|
|
|
$ hg ci -Am t
|
|
|
|
adding a
|
|
|
|
$ echo a > a
|
|
|
|
|
|
|
|
Here, bfile.startswith(afile)
|
|
|
|
|
|
|
|
$ hg copy a a2
|
|
|
|
$ hg ci -m copya
|
|
|
|
$ hg export --git tip > copy.diff
|
|
|
|
$ hg up -C 0
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg import copy.diff
|
|
|
|
applying copy.diff
|
|
|
|
|
|
|
|
a should contain an 'a'
|
|
|
|
|
|
|
|
$ cat a
|
|
|
|
a
|
|
|
|
|
|
|
|
and a2 should have duplicated it
|
|
|
|
|
|
|
|
$ cat a2
|
|
|
|
a
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
test -p0
|
|
|
|
|
|
|
|
$ hg init p0
|
|
|
|
$ cd p0
|
|
|
|
$ echo a > a
|
|
|
|
$ hg ci -Am t
|
|
|
|
adding a
|
2012-10-08 17:35:16 +04:00
|
|
|
$ hg import -p foo
|
|
|
|
abort: invalid value 'foo' for option -p, expected int
|
|
|
|
[255]
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg import -p0 - << EOF
|
|
|
|
> foobar
|
|
|
|
> --- a Sat Apr 12 22:43:58 2008 -0400
|
|
|
|
> +++ a Sat Apr 12 22:44:05 2008 -0400
|
|
|
|
> @@ -1,1 +1,1 @@
|
|
|
|
> -a
|
|
|
|
> +bb
|
|
|
|
> EOF
|
|
|
|
applying patch from stdin
|
|
|
|
$ hg status
|
|
|
|
$ cat a
|
|
|
|
bb
|
2015-03-10 04:22:24 +03:00
|
|
|
|
|
|
|
test --prefix
|
|
|
|
|
|
|
|
$ mkdir -p dir/dir2
|
|
|
|
$ echo b > dir/dir2/b
|
|
|
|
$ hg ci -Am b
|
|
|
|
adding dir/dir2/b
|
|
|
|
$ hg import -p2 --prefix dir - << EOF
|
|
|
|
> foobar
|
|
|
|
> --- drop1/drop2/dir2/b
|
|
|
|
> +++ drop1/drop2/dir2/b
|
|
|
|
> @@ -1,1 +1,1 @@
|
|
|
|
> -b
|
|
|
|
> +cc
|
|
|
|
> EOF
|
|
|
|
applying patch from stdin
|
|
|
|
$ hg status
|
|
|
|
$ cat dir/dir2/b
|
|
|
|
cc
|
2010-08-12 17:54:41 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
test paths outside repo root
|
|
|
|
|
|
|
|
$ mkdir outside
|
|
|
|
$ touch outside/foo
|
|
|
|
$ hg init inside
|
|
|
|
$ cd inside
|
|
|
|
$ hg import - <<EOF
|
|
|
|
> diff --git a/a b/b
|
|
|
|
> rename from ../outside/foo
|
|
|
|
> rename to bar
|
|
|
|
> EOF
|
|
|
|
applying patch from stdin
|
2012-06-08 17:11:05 +04:00
|
|
|
abort: path contains illegal component: ../outside/foo (glob)
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-12 17:54:41 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
test import with similarity and git and strip (issue295 et al.)
|
|
|
|
|
|
|
|
$ hg init sim
|
|
|
|
$ cd sim
|
|
|
|
$ echo 'this is a test' > a
|
|
|
|
$ hg ci -Ama
|
|
|
|
adding a
|
|
|
|
$ cat > ../rename.diff <<EOF
|
|
|
|
> diff --git a/foo/a b/foo/a
|
|
|
|
> deleted file mode 100644
|
|
|
|
> --- a/foo/a
|
|
|
|
> +++ /dev/null
|
|
|
|
> @@ -1,1 +0,0 @@
|
|
|
|
> -this is a test
|
|
|
|
> diff --git a/foo/b b/foo/b
|
|
|
|
> new file mode 100644
|
|
|
|
> --- /dev/null
|
|
|
|
> +++ b/foo/b
|
|
|
|
> @@ -0,0 +1,2 @@
|
|
|
|
> +this is a test
|
|
|
|
> +foo
|
|
|
|
> EOF
|
|
|
|
$ hg import --no-commit -v -s 1 ../rename.diff -p2
|
|
|
|
applying ../rename.diff
|
|
|
|
patching file a
|
|
|
|
patching file b
|
|
|
|
adding b
|
|
|
|
recording removal of a as rename to b (88% similar)
|
2011-10-02 05:30:49 +04:00
|
|
|
applied to working directory
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg st -C
|
|
|
|
A b
|
|
|
|
a
|
|
|
|
R a
|
|
|
|
$ hg revert -a
|
|
|
|
undeleting a
|
|
|
|
forgetting b
|
|
|
|
$ rm b
|
|
|
|
$ hg import --no-commit -v -s 100 ../rename.diff -p2
|
|
|
|
applying ../rename.diff
|
|
|
|
patching file a
|
|
|
|
patching file b
|
|
|
|
adding b
|
2011-10-02 05:30:49 +04:00
|
|
|
applied to working directory
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg st -C
|
|
|
|
A b
|
|
|
|
R a
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Issue1495: add empty file from the end of patch
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg init addemptyend
|
|
|
|
$ cd addemptyend
|
|
|
|
$ touch a
|
|
|
|
$ hg addremove
|
|
|
|
adding a
|
|
|
|
$ hg ci -m "commit"
|
|
|
|
$ cat > a.patch <<EOF
|
import: wrap a transaction around the whole command
Now 'rollback' after 'import' is less surprising: it rolls back all of
the imported changesets, not just the last one. As an extra added
benefit, you don't need 'rollback -f' after 'import --bypass', which
was an undesired side effect of fixing issue2998 (f9f52d71c33b)..
Note that this is a different take on issue963, which complained that
rollback after importing multiple patches returned the working dir
parent to the starting point, not to the second-last patch applied.
Since we now rollback the entire import, returning the working dir to
the starting point is entirely logical. So this change also undoes
b12d79024900, the fix to issue963, and updates its tests accordingly.
Bottom line: rollback after import was weird before issue963,
understandable since the fix for issue963, and even better now.
2011-10-02 22:34:28 +04:00
|
|
|
> add a, b
|
2010-08-12 17:54:41 +04:00
|
|
|
> diff --git a/a b/a
|
|
|
|
> --- a/a
|
|
|
|
> +++ b/a
|
|
|
|
> @@ -0,0 +1,1 @@
|
|
|
|
> +a
|
|
|
|
> diff --git a/b b/b
|
|
|
|
> new file mode 100644
|
|
|
|
> EOF
|
|
|
|
$ hg import --no-commit a.patch
|
|
|
|
applying a.patch
|
|
|
|
|
import: wrap a transaction around the whole command
Now 'rollback' after 'import' is less surprising: it rolls back all of
the imported changesets, not just the last one. As an extra added
benefit, you don't need 'rollback -f' after 'import --bypass', which
was an undesired side effect of fixing issue2998 (f9f52d71c33b)..
Note that this is a different take on issue963, which complained that
rollback after importing multiple patches returned the working dir
parent to the starting point, not to the second-last patch applied.
Since we now rollback the entire import, returning the working dir to
the starting point is entirely logical. So this change also undoes
b12d79024900, the fix to issue963, and updates its tests accordingly.
Bottom line: rollback after import was weird before issue963,
understandable since the fix for issue963, and even better now.
2011-10-02 22:34:28 +04:00
|
|
|
apply a good patch followed by an empty patch (mainly to ensure
|
|
|
|
that dirstate is *not* updated when import crashes)
|
|
|
|
$ hg update -q -C .
|
|
|
|
$ rm b
|
|
|
|
$ touch empty.patch
|
|
|
|
$ hg import a.patch empty.patch
|
|
|
|
applying a.patch
|
|
|
|
applying empty.patch
|
|
|
|
transaction abort!
|
|
|
|
rollback completed
|
|
|
|
abort: empty.patch: no diffs found
|
|
|
|
[255]
|
|
|
|
$ hg tip --template '{rev} {desc|firstline}\n'
|
|
|
|
0 commit
|
|
|
|
$ hg -q status
|
|
|
|
M a
|
|
|
|
$ cd ..
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
create file when source is not /dev/null
|
|
|
|
|
|
|
|
$ cat > create.patch <<EOF
|
|
|
|
> diff -Naur proj-orig/foo proj-new/foo
|
|
|
|
> --- proj-orig/foo 1969-12-31 16:00:00.000000000 -0800
|
|
|
|
> +++ proj-new/foo 2009-07-17 16:50:45.801368000 -0700
|
|
|
|
> @@ -0,0 +1,1 @@
|
|
|
|
> +a
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
some people have patches like the following too
|
|
|
|
|
|
|
|
$ cat > create2.patch <<EOF
|
|
|
|
> diff -Naur proj-orig/foo proj-new/foo
|
|
|
|
> --- proj-orig/foo.orig 1969-12-31 16:00:00.000000000 -0800
|
|
|
|
> +++ proj-new/foo 2009-07-17 16:50:45.801368000 -0700
|
|
|
|
> @@ -0,0 +1,1 @@
|
|
|
|
> +a
|
|
|
|
> EOF
|
|
|
|
$ hg init oddcreate
|
|
|
|
$ cd oddcreate
|
|
|
|
$ hg import --no-commit ../create.patch
|
|
|
|
applying ../create.patch
|
|
|
|
$ cat foo
|
|
|
|
a
|
|
|
|
$ rm foo
|
|
|
|
$ hg revert foo
|
|
|
|
$ hg import --no-commit ../create2.patch
|
|
|
|
applying ../create2.patch
|
|
|
|
$ cat foo
|
|
|
|
a
|
|
|
|
|
2012-06-11 03:38:32 +04:00
|
|
|
$ cd ..
|
2010-08-12 17:54:41 +04:00
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Issue1859: first line mistaken for email headers
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg init emailconfusion
|
|
|
|
$ cd emailconfusion
|
|
|
|
$ cat > a.patch <<EOF
|
|
|
|
> module: summary
|
|
|
|
>
|
|
|
|
> description
|
|
|
|
>
|
|
|
|
>
|
|
|
|
> diff -r 000000000000 -r 9b4c1e343b55 test.txt
|
|
|
|
> --- /dev/null
|
|
|
|
> +++ b/a
|
|
|
|
> @@ -0,0 +1,1 @@
|
|
|
|
> +a
|
|
|
|
> EOF
|
|
|
|
$ hg import -d '0 0' a.patch
|
|
|
|
applying a.patch
|
|
|
|
$ hg parents -v
|
|
|
|
changeset: 0:5a681217c0ad
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
files: a
|
|
|
|
description:
|
|
|
|
module: summary
|
|
|
|
|
|
|
|
description
|
|
|
|
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
2012-06-11 03:38:32 +04:00
|
|
|
in commit message
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg init commitconfusion
|
|
|
|
$ cd commitconfusion
|
|
|
|
$ cat > a.patch <<EOF
|
|
|
|
> module: summary
|
|
|
|
>
|
|
|
|
> --- description
|
|
|
|
>
|
|
|
|
> diff --git a/a b/a
|
|
|
|
> new file mode 100644
|
|
|
|
> --- /dev/null
|
|
|
|
> +++ b/a
|
|
|
|
> @@ -0,0 +1,1 @@
|
|
|
|
> +a
|
|
|
|
> EOF
|
|
|
|
> hg import -d '0 0' a.patch
|
|
|
|
> hg parents -v
|
|
|
|
> cd ..
|
|
|
|
>
|
|
|
|
> echo '% tricky header splitting'
|
|
|
|
> cat > trickyheaders.patch <<EOF
|
|
|
|
> From: User A <user@a>
|
|
|
|
> Subject: [PATCH] from: tricky!
|
|
|
|
>
|
|
|
|
> # HG changeset patch
|
|
|
|
> # User User B
|
|
|
|
> # Date 1266264441 18000
|
|
|
|
> # Branch stable
|
|
|
|
> # Node ID f2be6a1170ac83bf31cb4ae0bad00d7678115bc0
|
|
|
|
> # Parent 0000000000000000000000000000000000000000
|
|
|
|
> from: tricky!
|
|
|
|
>
|
|
|
|
> That is not a header.
|
|
|
|
>
|
|
|
|
> diff -r 000000000000 -r f2be6a1170ac foo
|
|
|
|
> --- /dev/null
|
|
|
|
> +++ b/foo
|
|
|
|
> @@ -0,0 +1,1 @@
|
|
|
|
> +foo
|
|
|
|
> EOF
|
|
|
|
applying a.patch
|
|
|
|
changeset: 0:f34d9187897d
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
files: a
|
|
|
|
description:
|
|
|
|
module: summary
|
|
|
|
|
|
|
|
|
|
|
|
% tricky header splitting
|
|
|
|
|
|
|
|
$ hg init trickyheaders
|
|
|
|
$ cd trickyheaders
|
|
|
|
$ hg import -d '0 0' ../trickyheaders.patch
|
|
|
|
applying ../trickyheaders.patch
|
|
|
|
$ hg export --git tip
|
|
|
|
# HG changeset patch
|
|
|
|
# User User B
|
|
|
|
# Date 0 0
|
2013-02-09 01:54:17 +04:00
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
2010-08-12 17:54:41 +04:00
|
|
|
# Node ID eb56ab91903632294ac504838508cb370c0901d2
|
|
|
|
# Parent 0000000000000000000000000000000000000000
|
|
|
|
from: tricky!
|
|
|
|
|
|
|
|
That is not a header.
|
|
|
|
|
|
|
|
diff --git a/foo b/foo
|
|
|
|
new file mode 100644
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/foo
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+foo
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Issue2102: hg export and hg import speak different languages
|
2010-08-12 17:54:41 +04:00
|
|
|
|
|
|
|
$ hg init issue2102
|
|
|
|
$ cd issue2102
|
|
|
|
$ mkdir -p src/cmd/gc
|
|
|
|
$ touch src/cmd/gc/mksys.bash
|
|
|
|
$ hg ci -Am init
|
|
|
|
adding src/cmd/gc/mksys.bash
|
|
|
|
$ hg import - <<EOF
|
|
|
|
> # HG changeset patch
|
|
|
|
> # User Rob Pike
|
|
|
|
> # Date 1216685449 25200
|
|
|
|
> # Node ID 03aa2b206f499ad6eb50e6e207b9e710d6409c98
|
|
|
|
> # Parent 93d10138ad8df586827ca90b4ddb5033e21a3a84
|
|
|
|
> help management of empty pkg and lib directories in perforce
|
|
|
|
>
|
|
|
|
> R=gri
|
|
|
|
> DELTA=4 (4 added, 0 deleted, 0 changed)
|
|
|
|
> OCL=13328
|
|
|
|
> CL=13328
|
|
|
|
>
|
|
|
|
> diff --git a/lib/place-holder b/lib/place-holder
|
|
|
|
> new file mode 100644
|
|
|
|
> --- /dev/null
|
|
|
|
> +++ b/lib/place-holder
|
|
|
|
> @@ -0,0 +1,2 @@
|
|
|
|
> +perforce does not maintain empty directories.
|
|
|
|
> +this file helps.
|
|
|
|
> diff --git a/pkg/place-holder b/pkg/place-holder
|
|
|
|
> new file mode 100644
|
|
|
|
> --- /dev/null
|
|
|
|
> +++ b/pkg/place-holder
|
|
|
|
> @@ -0,0 +1,2 @@
|
|
|
|
> +perforce does not maintain empty directories.
|
|
|
|
> +this file helps.
|
|
|
|
> diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash
|
|
|
|
> old mode 100644
|
|
|
|
> new mode 100755
|
|
|
|
> EOF
|
|
|
|
applying patch from stdin
|
2012-06-08 17:11:05 +04:00
|
|
|
|
|
|
|
#if execbit
|
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg sum
|
|
|
|
parent: 1:d59915696727 tip
|
|
|
|
help management of empty pkg and lib directories in perforce
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 2 draft
|
2012-06-08 17:11:05 +04:00
|
|
|
|
2010-08-12 17:54:41 +04:00
|
|
|
$ hg diff --git -c tip
|
|
|
|
diff --git a/lib/place-holder b/lib/place-holder
|
|
|
|
new file mode 100644
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/lib/place-holder
|
|
|
|
@@ -0,0 +1,2 @@
|
|
|
|
+perforce does not maintain empty directories.
|
|
|
|
+this file helps.
|
|
|
|
diff --git a/pkg/place-holder b/pkg/place-holder
|
|
|
|
new file mode 100644
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/pkg/place-holder
|
|
|
|
@@ -0,0 +1,2 @@
|
|
|
|
+perforce does not maintain empty directories.
|
|
|
|
+this file helps.
|
|
|
|
diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash
|
|
|
|
old mode 100644
|
|
|
|
new mode 100755
|
2012-06-08 17:11:05 +04:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
$ hg sum
|
|
|
|
parent: 1:28f089cc9ccc tip
|
|
|
|
help management of empty pkg and lib directories in perforce
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-06-02 05:41:07 +03:00
|
|
|
phases: 2 draft
|
2012-06-08 17:11:05 +04:00
|
|
|
|
|
|
|
$ hg diff --git -c tip
|
|
|
|
diff --git a/lib/place-holder b/lib/place-holder
|
|
|
|
new file mode 100644
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/lib/place-holder
|
|
|
|
@@ -0,0 +1,2 @@
|
|
|
|
+perforce does not maintain empty directories.
|
|
|
|
+this file helps.
|
|
|
|
diff --git a/pkg/place-holder b/pkg/place-holder
|
|
|
|
new file mode 100644
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/pkg/place-holder
|
|
|
|
@@ -0,0 +1,2 @@
|
|
|
|
+perforce does not maintain empty directories.
|
|
|
|
+this file helps.
|
|
|
|
|
|
|
|
/* The mode change for mksys.bash is missing here, because on platforms */
|
|
|
|
/* that don't support execbits, mode changes in patches are ignored when */
|
|
|
|
/* they are imported. This is obviously also the reason for why the hash */
|
|
|
|
/* in the created changeset is different to the one you see above the */
|
|
|
|
/* #else clause */
|
|
|
|
|
|
|
|
#endif
|
2010-08-12 17:54:41 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
diff lines looking like headers
|
|
|
|
|
|
|
|
$ hg init difflineslikeheaders
|
|
|
|
$ cd difflineslikeheaders
|
|
|
|
$ echo a >a
|
|
|
|
$ echo b >b
|
|
|
|
$ echo c >c
|
|
|
|
$ hg ci -Am1
|
|
|
|
adding a
|
|
|
|
adding b
|
|
|
|
adding c
|
|
|
|
|
|
|
|
$ echo "key: value" >>a
|
|
|
|
$ echo "key: value" >>b
|
|
|
|
$ echo "foo" >>c
|
|
|
|
$ hg ci -m2
|
|
|
|
|
|
|
|
$ hg up -C 0
|
|
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg diff --git -c1 >want
|
|
|
|
$ hg diff -c1 | hg import --no-commit -
|
|
|
|
applying patch from stdin
|
|
|
|
$ hg diff --git >have
|
|
|
|
$ diff want have
|
|
|
|
$ cd ..
|
|
|
|
|
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Prior to this patch "hg diff -U0", i.e., zero lines of context, would
output hunk headers with a start line one greater than what GNU patch
and git output. Guido van Rossum documents the unified diff format[1]
as having a start line value "one lower than one would expect" for
zero length hunks.
Comparing the behaviour of the three systems prior to this patch in
transforming
c1
c3
to
c1
c2
c3
- GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "git diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@"
After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@".
Since "hg export --config diff.unified=0" outputs zero-context unified
diffs, "hg import" has also been updated to account for start lines
one less than expected for zero length hunk ranges.
[1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293
2011-11-10 04:55:59 +04:00
|
|
|
import a unified diff with no lines of context (diff -U0)
|
|
|
|
|
|
|
|
$ hg init diffzero
|
|
|
|
$ cd diffzero
|
|
|
|
$ cat > f << EOF
|
|
|
|
> c2
|
|
|
|
> c4
|
|
|
|
> c5
|
|
|
|
> EOF
|
|
|
|
$ hg commit -Am0
|
|
|
|
adding f
|
|
|
|
|
|
|
|
$ hg import --no-commit - << EOF
|
|
|
|
> # HG changeset patch
|
|
|
|
> # User test
|
|
|
|
> # Date 0 0
|
|
|
|
> # Node ID f4974ab632f3dee767567b0576c0ec9a4508575c
|
|
|
|
> # Parent 8679a12a975b819fae5f7ad3853a2886d143d794
|
|
|
|
> 1
|
|
|
|
> diff -r 8679a12a975b -r f4974ab632f3 f
|
|
|
|
> --- a/f Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
> +++ b/f Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
> @@ -0,0 +1,1 @@
|
|
|
|
> +c1
|
|
|
|
> @@ -1,0 +3,1 @@
|
|
|
|
> +c3
|
|
|
|
> @@ -3,1 +4,0 @@
|
|
|
|
> -c5
|
|
|
|
> EOF
|
|
|
|
applying patch from stdin
|
|
|
|
|
|
|
|
$ cat f
|
|
|
|
c1
|
|
|
|
c2
|
|
|
|
c3
|
|
|
|
c4
|
2012-02-13 19:47:31 +04:00
|
|
|
|
2012-06-11 03:38:32 +04:00
|
|
|
$ cd ..
|
|
|
|
|
2012-05-12 11:10:01 +04:00
|
|
|
no segfault while importing a unified diff which start line is zero but chunk
|
|
|
|
size is non-zero
|
|
|
|
|
|
|
|
$ hg init startlinezero
|
|
|
|
$ cd startlinezero
|
|
|
|
$ echo foo > foo
|
|
|
|
$ hg commit -Amfoo
|
|
|
|
adding foo
|
|
|
|
|
|
|
|
$ hg import --no-commit - << EOF
|
|
|
|
> diff a/foo b/foo
|
|
|
|
> --- a/foo
|
|
|
|
> +++ b/foo
|
|
|
|
> @@ -0,1 +0,1 @@
|
|
|
|
> foo
|
|
|
|
> EOF
|
|
|
|
applying patch from stdin
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2012-02-13 19:47:31 +04:00
|
|
|
Test corner case involving fuzz and skew
|
|
|
|
|
|
|
|
$ hg init morecornercases
|
|
|
|
$ cd morecornercases
|
|
|
|
|
|
|
|
$ cat > 01-no-context-beginning-of-file.diff <<EOF
|
|
|
|
> diff --git a/a b/a
|
|
|
|
> --- a/a
|
|
|
|
> +++ b/a
|
|
|
|
> @@ -1,0 +1,1 @@
|
|
|
|
> +line
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ cat > 02-no-context-middle-of-file.diff <<EOF
|
|
|
|
> diff --git a/a b/a
|
|
|
|
> --- a/a
|
|
|
|
> +++ b/a
|
|
|
|
> @@ -1,1 +1,1 @@
|
|
|
|
> -2
|
|
|
|
> +add some skew
|
|
|
|
> @@ -2,0 +2,1 @@
|
|
|
|
> +line
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ cat > 03-no-context-end-of-file.diff <<EOF
|
|
|
|
> diff --git a/a b/a
|
|
|
|
> --- a/a
|
|
|
|
> +++ b/a
|
|
|
|
> @@ -10,0 +10,1 @@
|
|
|
|
> +line
|
|
|
|
> EOF
|
|
|
|
|
2012-02-13 20:22:35 +04:00
|
|
|
$ cat > 04-middle-of-file-completely-fuzzed.diff <<EOF
|
|
|
|
> diff --git a/a b/a
|
|
|
|
> --- a/a
|
|
|
|
> +++ b/a
|
|
|
|
> @@ -1,1 +1,1 @@
|
|
|
|
> -2
|
|
|
|
> +add some skew
|
|
|
|
> @@ -2,2 +2,3 @@
|
|
|
|
> not matching, should fuzz
|
|
|
|
> ... a bit
|
|
|
|
> +line
|
|
|
|
> EOF
|
|
|
|
|
2012-02-13 19:47:31 +04:00
|
|
|
$ cat > a <<EOF
|
|
|
|
> 1
|
|
|
|
> 2
|
|
|
|
> 3
|
|
|
|
> 4
|
|
|
|
> EOF
|
|
|
|
$ hg ci -Am adda a
|
|
|
|
$ for p in *.diff; do
|
|
|
|
> hg import -v --no-commit $p
|
|
|
|
> cat a
|
|
|
|
> hg revert -aqC a
|
|
|
|
> # patch -p1 < $p
|
|
|
|
> # cat a
|
|
|
|
> # hg revert -aC a
|
|
|
|
> done
|
|
|
|
applying 01-no-context-beginning-of-file.diff
|
|
|
|
patching file a
|
|
|
|
applied to working directory
|
|
|
|
1
|
|
|
|
line
|
|
|
|
2
|
|
|
|
3
|
|
|
|
4
|
|
|
|
applying 02-no-context-middle-of-file.diff
|
|
|
|
patching file a
|
|
|
|
Hunk #1 succeeded at 2 (offset 1 lines).
|
|
|
|
Hunk #2 succeeded at 4 (offset 1 lines).
|
|
|
|
applied to working directory
|
|
|
|
1
|
|
|
|
add some skew
|
|
|
|
3
|
|
|
|
line
|
|
|
|
4
|
|
|
|
applying 03-no-context-end-of-file.diff
|
|
|
|
patching file a
|
|
|
|
Hunk #1 succeeded at 5 (offset -6 lines).
|
|
|
|
applied to working directory
|
|
|
|
1
|
|
|
|
2
|
|
|
|
3
|
|
|
|
4
|
|
|
|
line
|
2012-02-13 20:22:35 +04:00
|
|
|
applying 04-middle-of-file-completely-fuzzed.diff
|
|
|
|
patching file a
|
|
|
|
Hunk #1 succeeded at 2 (offset 1 lines).
|
|
|
|
Hunk #2 succeeded at 5 with fuzz 2 (offset 1 lines).
|
|
|
|
applied to working directory
|
|
|
|
1
|
|
|
|
add some skew
|
|
|
|
3
|
|
|
|
4
|
|
|
|
line
|
2012-06-11 03:38:32 +04:00
|
|
|
$ cd ..
|
2014-05-09 04:08:17 +04:00
|
|
|
|
|
|
|
Test partial application
|
|
|
|
------------------------
|
|
|
|
|
|
|
|
prepare a stack of patches depending on each other
|
|
|
|
|
|
|
|
$ hg init partial
|
|
|
|
$ cd partial
|
|
|
|
$ cat << EOF > a
|
|
|
|
> one
|
|
|
|
> two
|
|
|
|
> three
|
|
|
|
> four
|
|
|
|
> five
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> EOF
|
|
|
|
$ hg add a
|
|
|
|
$ echo 'b' > b
|
|
|
|
$ hg add b
|
|
|
|
$ hg commit -m 'initial' -u Babar
|
|
|
|
$ cat << EOF > a
|
|
|
|
> one
|
|
|
|
> two
|
|
|
|
> 3
|
|
|
|
> four
|
|
|
|
> five
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> EOF
|
|
|
|
$ hg commit -m 'three' -u Celeste
|
|
|
|
$ cat << EOF > a
|
|
|
|
> one
|
|
|
|
> two
|
|
|
|
> 3
|
|
|
|
> 4
|
|
|
|
> five
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> EOF
|
|
|
|
$ hg commit -m 'four' -u Rataxes
|
|
|
|
$ cat << EOF > a
|
|
|
|
> one
|
|
|
|
> two
|
|
|
|
> 3
|
|
|
|
> 4
|
|
|
|
> 5
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> EOF
|
|
|
|
$ echo bb >> b
|
|
|
|
$ hg commit -m 'five' -u Arthur
|
|
|
|
$ echo 'Babar' > jungle
|
|
|
|
$ hg add jungle
|
|
|
|
$ hg ci -m 'jungle' -u Zephir
|
|
|
|
$ echo 'Celeste' >> jungle
|
|
|
|
$ hg ci -m 'extended jungle' -u Cornelius
|
|
|
|
$ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n'
|
|
|
|
@ extended jungle [Cornelius] 1: +1/-0
|
|
|
|
|
|
|
|
|
o jungle [Zephir] 1: +1/-0
|
|
|
|
|
|
|
|
|
o five [Arthur] 2: +2/-1
|
|
|
|
|
|
|
|
|
o four [Rataxes] 1: +1/-1
|
|
|
|
|
|
|
|
|
o three [Celeste] 1: +1/-1
|
|
|
|
|
|
|
|
|
o initial [Babar] 2: +8/-0
|
|
|
|
|
|
|
|
|
|
|
|
Importing with some success and some errors:
|
|
|
|
|
|
|
|
$ hg update --rev 'desc(initial)'
|
|
|
|
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg export --rev 'desc(five)' | hg import --partial -
|
|
|
|
applying patch from stdin
|
|
|
|
patching file a
|
|
|
|
Hunk #1 FAILED at 1
|
|
|
|
1 out of 1 hunks FAILED -- saving rejects to file a.rej
|
|
|
|
patch applied partially
|
|
|
|
(fix the .rej files and run `hg commit --amend`)
|
|
|
|
[1]
|
|
|
|
|
|
|
|
$ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n'
|
|
|
|
@ five [Arthur] 1: +1/-0
|
|
|
|
|
|
|
|
|
| o extended jungle [Cornelius] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o jungle [Zephir] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o five [Arthur] 2: +2/-1
|
|
|
|
| |
|
|
|
|
| o four [Rataxes] 1: +1/-1
|
|
|
|
| |
|
|
|
|
| o three [Celeste] 1: +1/-1
|
|
|
|
|/
|
|
|
|
o initial [Babar] 2: +8/-0
|
|
|
|
|
|
|
|
$ hg export
|
|
|
|
# HG changeset patch
|
|
|
|
# User Arthur
|
|
|
|
# Date 0 0
|
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
# Node ID 26e6446bb2526e2be1037935f5fca2b2706f1509
|
|
|
|
# Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e
|
|
|
|
five
|
|
|
|
|
|
|
|
diff -r 8e4f0351909e -r 26e6446bb252 b
|
|
|
|
--- a/b Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/b Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,2 @@
|
|
|
|
b
|
|
|
|
+bb
|
|
|
|
$ hg status -c .
|
|
|
|
C a
|
|
|
|
C b
|
|
|
|
$ ls
|
|
|
|
a
|
|
|
|
a.rej
|
|
|
|
b
|
|
|
|
|
|
|
|
Importing with zero success:
|
|
|
|
|
|
|
|
$ hg update --rev 'desc(initial)'
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg export --rev 'desc(four)' | hg import --partial -
|
|
|
|
applying patch from stdin
|
|
|
|
patching file a
|
|
|
|
Hunk #1 FAILED at 0
|
|
|
|
1 out of 1 hunks FAILED -- saving rejects to file a.rej
|
|
|
|
patch applied partially
|
|
|
|
(fix the .rej files and run `hg commit --amend`)
|
|
|
|
[1]
|
|
|
|
|
|
|
|
$ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n'
|
|
|
|
@ four [Rataxes] 0: +0/-0
|
|
|
|
|
|
|
|
|
| o five [Arthur] 1: +1/-0
|
|
|
|
|/
|
|
|
|
| o extended jungle [Cornelius] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o jungle [Zephir] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o five [Arthur] 2: +2/-1
|
|
|
|
| |
|
|
|
|
| o four [Rataxes] 1: +1/-1
|
|
|
|
| |
|
|
|
|
| o three [Celeste] 1: +1/-1
|
|
|
|
|/
|
|
|
|
o initial [Babar] 2: +8/-0
|
|
|
|
|
|
|
|
$ hg export
|
|
|
|
# HG changeset patch
|
|
|
|
# User Rataxes
|
|
|
|
# Date 0 0
|
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
# Node ID cb9b1847a74d9ad52e93becaf14b98dbcc274e1e
|
|
|
|
# Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e
|
|
|
|
four
|
|
|
|
|
|
|
|
$ hg status -c .
|
|
|
|
C a
|
|
|
|
C b
|
|
|
|
$ ls
|
|
|
|
a
|
|
|
|
a.rej
|
|
|
|
b
|
|
|
|
|
|
|
|
Importing with unknown file:
|
|
|
|
|
|
|
|
$ hg update --rev 'desc(initial)'
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg export --rev 'desc("extended jungle")' | hg import --partial -
|
|
|
|
applying patch from stdin
|
|
|
|
unable to find 'jungle' for patching
|
|
|
|
1 out of 1 hunks FAILED -- saving rejects to file jungle.rej
|
|
|
|
patch applied partially
|
|
|
|
(fix the .rej files and run `hg commit --amend`)
|
|
|
|
[1]
|
|
|
|
|
|
|
|
$ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n'
|
|
|
|
@ extended jungle [Cornelius] 0: +0/-0
|
|
|
|
|
|
|
|
|
| o four [Rataxes] 0: +0/-0
|
|
|
|
|/
|
|
|
|
| o five [Arthur] 1: +1/-0
|
|
|
|
|/
|
|
|
|
| o extended jungle [Cornelius] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o jungle [Zephir] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o five [Arthur] 2: +2/-1
|
|
|
|
| |
|
|
|
|
| o four [Rataxes] 1: +1/-1
|
|
|
|
| |
|
|
|
|
| o three [Celeste] 1: +1/-1
|
|
|
|
|/
|
|
|
|
o initial [Babar] 2: +8/-0
|
|
|
|
|
|
|
|
$ hg export
|
|
|
|
# HG changeset patch
|
|
|
|
# User Cornelius
|
|
|
|
# Date 0 0
|
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
# Node ID 1fb1f86bef43c5a75918178f8d23c29fb0a7398d
|
|
|
|
# Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e
|
|
|
|
extended jungle
|
|
|
|
|
|
|
|
$ hg status -c .
|
|
|
|
C a
|
|
|
|
C b
|
|
|
|
$ ls
|
|
|
|
a
|
|
|
|
a.rej
|
|
|
|
b
|
|
|
|
jungle.rej
|
|
|
|
|
|
|
|
Importing multiple failing patches:
|
|
|
|
|
|
|
|
$ hg update --rev 'desc(initial)'
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo 'B' > b # just to make another commit
|
|
|
|
$ hg commit -m "a new base"
|
|
|
|
created new head
|
2014-10-09 15:40:04 +04:00
|
|
|
$ hg export --rev 'desc("four") + desc("extended jungle")' | hg import --partial -
|
2014-05-09 04:08:17 +04:00
|
|
|
applying patch from stdin
|
|
|
|
patching file a
|
|
|
|
Hunk #1 FAILED at 0
|
|
|
|
1 out of 1 hunks FAILED -- saving rejects to file a.rej
|
|
|
|
patch applied partially
|
|
|
|
(fix the .rej files and run `hg commit --amend`)
|
|
|
|
[1]
|
|
|
|
$ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n'
|
|
|
|
@ four [Rataxes] 0: +0/-0
|
|
|
|
|
|
|
|
|
o a new base [test] 1: +1/-1
|
|
|
|
|
|
|
|
|
| o extended jungle [Cornelius] 0: +0/-0
|
|
|
|
|/
|
|
|
|
| o four [Rataxes] 0: +0/-0
|
|
|
|
|/
|
|
|
|
| o five [Arthur] 1: +1/-0
|
|
|
|
|/
|
|
|
|
| o extended jungle [Cornelius] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o jungle [Zephir] 1: +1/-0
|
|
|
|
| |
|
|
|
|
| o five [Arthur] 2: +2/-1
|
|
|
|
| |
|
|
|
|
| o four [Rataxes] 1: +1/-1
|
|
|
|
| |
|
|
|
|
| o three [Celeste] 1: +1/-1
|
|
|
|
|/
|
|
|
|
o initial [Babar] 2: +8/-0
|
|
|
|
|
|
|
|
$ hg export
|
|
|
|
# HG changeset patch
|
|
|
|
# User Rataxes
|
|
|
|
# Date 0 0
|
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
# Node ID a9d7b6d0ffbb4eb12b7d5939250fcd42e8930a1d
|
|
|
|
# Parent f59f8d2e95a8ca5b1b4ca64320140da85f3b44fd
|
|
|
|
four
|
|
|
|
|
|
|
|
$ hg status -c .
|
|
|
|
C a
|
|
|
|
C b
|
2015-10-06 19:51:24 +03:00
|
|
|
|
|
|
|
Importing some extra header
|
|
|
|
===========================
|
|
|
|
|
|
|
|
$ cat > $TESTTMP/parseextra.py <<EOF
|
|
|
|
> import mercurial.patch
|
|
|
|
> import mercurial.cmdutil
|
|
|
|
>
|
|
|
|
> def processfoo(repo, data, extra, opts):
|
|
|
|
> if 'foo' in data:
|
|
|
|
> extra['foo'] = data['foo']
|
2015-10-07 23:05:25 +03:00
|
|
|
> def postimport(ctx):
|
|
|
|
> if 'foo' in ctx.extra():
|
|
|
|
> ctx.repo().ui.write('imported-foo: %s\n' % ctx.extra()['foo'])
|
2015-10-06 19:51:24 +03:00
|
|
|
>
|
|
|
|
> mercurial.patch.patchheadermap.append(('Foo', 'foo'))
|
|
|
|
> mercurial.cmdutil.extrapreimport.append('foo')
|
|
|
|
> mercurial.cmdutil.extrapreimportmap['foo'] = processfoo
|
2015-10-07 23:05:25 +03:00
|
|
|
> mercurial.cmdutil.extrapostimport.append('foo')
|
|
|
|
> mercurial.cmdutil.extrapostimportmap['foo'] = postimport
|
2015-10-06 19:51:24 +03:00
|
|
|
> EOF
|
2015-11-16 22:12:27 +03:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> parseextra=$TESTTMP/parseextra.py
|
|
|
|
> EOF
|
2015-10-06 19:51:24 +03:00
|
|
|
$ hg up -C tip
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cat > $TESTTMP/foo.patch <<EOF
|
|
|
|
> # HG changeset patch
|
|
|
|
> # User Rataxes
|
|
|
|
> # Date 0 0
|
|
|
|
> # Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
> # Foo bar
|
|
|
|
> height
|
|
|
|
>
|
|
|
|
> --- a/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
> +++ b/a Wed Oct 07 09:17:44 2015 +0000
|
|
|
|
> @@ -5,3 +5,4 @@
|
|
|
|
> five
|
|
|
|
> six
|
|
|
|
> seven
|
|
|
|
> +heigt
|
|
|
|
> EOF
|
|
|
|
$ hg import $TESTTMP/foo.patch
|
|
|
|
applying $TESTTMP/foo.patch
|
2015-10-07 23:05:25 +03:00
|
|
|
imported-foo: bar
|
2015-10-06 19:51:24 +03:00
|
|
|
$ hg log --debug -r . | grep extra
|
|
|
|
extra: branch=default
|
|
|
|
extra: foo=bar
|