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

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

shelve: directly handle the initial parent alignment...
shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693
Martin Geisler - - Load All Authors

File last commit:

r13519:43b3b761 default
r38637:c829749e default
Show More
test-eol-patch.t
400 lines | 7.0 KiB | text/troff | Tads3Lexer
/ tests / test-eol-patch.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: unify test-eol-patch
 r12420 Test EOL patching
Martin Geisler
tests: don't overwrite HGRCPATH...
 r13519 $ cat >> $HGRCPATH <<EOF
Matt Mackall
tests: unify test-eol-patch
 r12420 > [diff]
> git = 1
> EOF
Set up helpers
$ seteol () {
> if [ $1 = "LF" ]; then
> EOL='\n'
> else
> EOL='\r\n'
> fi
> }
$ makerepo () {
> seteol $1
> echo
> echo "# ==== setup $1 repository ===="
> echo '% hg init'
> hg init repo
> cd repo
> cat > .hgeol <<EOF
> [repository]
> native = $1
> [patterns]
> unix.txt = LF
> win.txt = CRLF
> **.txt = native
> EOF
> printf "first\r\nsecond\r\nthird\r\n" > win.txt
> printf "first\nsecond\nthird\n" > unix.txt
> printf "first${EOL}second${EOL}third${EOL}" > native.txt
> hg commit --addremove -m 'checkin'
> cd ..
> }
$ dotest () {
> seteol $1
> echo
> echo "% hg clone repo repo-$1"
> hg clone --noupdate repo repo-$1
> cd repo-$1
> cat > .hg/hgrc <<EOF
> [extensions]
> eol =
> [eol]
> native = $1
> EOF
> hg update
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > echo '% native.txt'
> cat native.txt
> echo '% unix.txt'
> cat unix.txt
> echo '% win.txt'
> cat win.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 > printf "first${EOL}third${EOL}" > native.txt
> printf "first\r\nthird\r\n" > win.txt
> printf "first\nthird\n" > unix.txt
> echo '% hg diff'
> hg diff > p
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > cat p
Matt Mackall
tests: unify test-eol-patch
 r12420 > echo '% hg revert'
> hg revert --all
> echo '% hg import'
> hg import -m 'patch' p
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > echo '% native.txt'
> cat native.txt
> echo '% unix.txt'
> cat unix.txt
> echo '% win.txt'
> cat win.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 > echo '% hg diff -c tip'
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > hg diff -c tip
Matt Mackall
tests: unify test-eol-patch
 r12420 > cd ..
> rm -r repo-$1
> }
Run tests
$ makerepo LF
# ==== setup LF repository ====
% hg init
adding .hgeol
adding native.txt
adding unix.txt
adding win.txt
$ dotest LF
% hg clone repo repo-LF
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
second
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
second
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg revert
reverting native.txt
reverting unix.txt
reverting win.txt
% hg import
applying p
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff -c tip
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 $ dotest CRLF
% hg clone repo repo-CRLF
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
first\r (esc)
second\r (esc)
third\r (esc)
% unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
second
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg revert
reverting native.txt
reverting unix.txt
reverting win.txt
% hg import
applying p
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
first\r (esc)
third\r (esc)
% unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff -c tip
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 $ rm -r repo
$ makerepo CRLF
# ==== setup CRLF repository ====
% hg init
adding .hgeol
adding native.txt
adding unix.txt
adding win.txt
$ dotest LF
% hg clone repo repo-LF
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
second
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
second
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg revert
reverting native.txt
reverting unix.txt
reverting win.txt
% hg import
applying p
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff -c tip
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 $ dotest CRLF
% hg clone repo repo-CRLF
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
first\r (esc)
second\r (esc)
third\r (esc)
% unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
second
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg revert
reverting native.txt
reverting unix.txt
reverting win.txt
% hg import
applying p
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % native.txt
first\r (esc)
third\r (esc)
% unix.txt
Matt Mackall
tests: unify test-eol-patch
 r12420 first
third
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % win.txt
first\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 % hg diff -c tip
diff --git a/native.txt b/native.txt
--- a/native.txt
+++ b/native.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 diff --git a/unix.txt b/unix.txt
--- a/unix.txt
+++ b/unix.txt
@@ -1,3 +1,2 @@
first
-second
third
diff --git a/win.txt b/win.txt
--- a/win.txt
+++ b/win.txt
@@ -1,3 +1,2 @@
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 first\r (esc)
-second\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-patch
 r12420 $ rm -r repo