##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

largefiles: factor out procedures to update lfdirstate for post-committing...
largefiles: factor out procedures to update lfdirstate for post-committing Before this patch, procedures to update lfdirstate for post-committing are scattered in "lfilesrepo.commit". In the case of "hg commit" with patterns for target files ("Case 2"), lfdirstate is updated BEFORE real committing. This patch factors out procedures to update lfdirstate for post-committing into "lfutil.markcommitted", and makes it callable via "markcommitted" of the context passed to "lfilesrepo.commitctx". "markcommitted" of the context is called, only when it is committed successfully. Passing original "markcommitted" of the context is meaningless in this patch, but required in subsequent one to prepare something before invocation of it.
Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default
r23184:3100d1cb default
Show More
test-mq-git.t
212 lines | 3.6 KiB | text/troff | Tads3Lexer
/ tests / test-mq-git.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 # Test the plumbing of mq.git option
# Automatic upgrade itself is tested elsewhere.
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
 r23172 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [diff]
> nodates = 1
> EOF
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ hg init repo-auto
$ cd repo-auto
git=auto: regular patch creation:
$ echo a > a
$ hg add a
$ hg qnew -d '0 0' -f adda
$ cat .hg/patches/adda
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent 0000000000000000000000000000000000000000
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff -r 000000000000 -r ef8dafc9fa4c a
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+a
git=auto: git patch creation with copy:
$ hg cp a b
$ hg qnew -d '0 0' -f copy
$ cat .hg/patches/copy
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff --git a/a b/b
copy from a
copy to b
git=auto: git patch when using --git:
$ echo regular > regular
$ hg add regular
$ hg qnew -d '0 0' --git -f git
$ cat .hg/patches/git
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff --git a/regular b/regular
new file mode 100644
--- /dev/null
+++ b/regular
@@ -0,0 +1,1 @@
+regular
git=auto: regular patch after qrefresh without --git:
$ hg qrefresh -d '0 0'
$ cat .hg/patches/git
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff -r 99586d5f048c regular
--- /dev/null
+++ b/regular
@@ -0,0 +1,1 @@
+regular
$ cd ..
$ hg init repo-keep
$ cd repo-keep
$ echo '[mq]' > .hg/hgrc
$ echo 'git = KEEP' >> .hg/hgrc
git=keep: git patch with --git:
$ echo a > a
$ hg add a
$ hg qnew -d '0 0' -f --git git
$ cat .hg/patches/git
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent 0000000000000000000000000000000000000000
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+a
git=keep: git patch after qrefresh without --git:
$ echo a >> a
$ hg qrefresh -d '0 0'
$ cat .hg/patches/git
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent 0000000000000000000000000000000000000000
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,2 @@
+a
+a
$ cd ..
$ hg init repo-yes
$ cd repo-yes
$ echo '[mq]' > .hg/hgrc
$ echo 'git = yes' >> .hg/hgrc
git=yes: git patch:
$ echo a > a
$ hg add a
$ hg qnew -d '0 0' -f git
$ cat .hg/patches/git
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent 0000000000000000000000000000000000000000
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+a
git=yes: git patch after qrefresh:
$ echo a >> a
$ hg qrefresh -d '0 0'
$ cat .hg/patches/git
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent 0000000000000000000000000000000000000000
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,2 @@
+a
+a
$ cd ..
$ hg init repo-no
$ cd repo-no
$ echo '[diff]' > .hg/hgrc
$ echo 'git = True' >> .hg/hgrc
$ echo '[mq]' > .hg/hgrc
$ echo 'git = False' >> .hg/hgrc
git=no: regular patch with copy:
$ echo a > a
$ hg add a
$ hg qnew -d '0 0' -f adda
$ hg cp a b
$ hg qnew -d '0 0' -f regular
$ cat .hg/patches/regular
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff -r ef8dafc9fa4c -r a70404f79ba3 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+a
git=no: regular patch after qrefresh with copy:
$ hg cp a c
$ hg qrefresh -d '0 0'
$ cat .hg/patches/regular
# HG changeset patch
Mads Kiilerich
mq: write headers for new HG patches in the same order as export (BC)
 r22520 # Date 0 0
Mads Kiilerich
mq: write '# Parent ' lines with two spaces like export does (BC)...
 r22521 # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
diff -r ef8dafc9fa4c b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+a
diff -r ef8dafc9fa4c c
--- /dev/null
+++ b/c
@@ -0,0 +1,1 @@
+a
$ cd ..