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

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

subrepo: calculate _relpath for hgsubrepo based on self instead of parent...
subrepo: calculate _relpath for hgsubrepo based on self instead of parent Prior to 105758d1b37b, the subrelpath() (now _relpath) for hgsubrepo was calculated by removing the root path of the outermost repo from the root path of the subrepo. Since the root paths use platform specific separators, and the relative path is printed by various commands, the output of these commands require a glob (and check-code.py enforces this). In an effort to be generic to all subrepos, 105758d1b37b started calculating this path based on the parent repo, and then joining the subrepo path in .hgsub. One of the tests in test-subrepo.t creates a subrepo inside a directory, so the path being joined contained '/' instead of '\'. This made the test fail with a '~' status, because the glob is unnecessary[1]. Removing them made the test work, but then check-code complains. We can't just drop the check-code rule, because sub-subrepos are still joined with '\'. Presumably the other subrepo types have this issue as well, but there likely isn't a test with git or svn repos inside a subdirectory. This simply restores the exact _relpath value (and output) for hgsubrepos prior to 105758d1b37b. [1] http://www.selenic.com/pipermail/mercurial-devel/2015-April/068720.html
Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default
r24786:56e15db9 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 ..