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

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

hg: acquire wlock while updating the working directory via updatetotally...
hg: acquire wlock while updating the working directory via updatetotally updatetotally() might be invoked outside wlock scope (e.g. invocation via postincoming() at "hg unbundle" or "hg pull"). In such case, acquisition of wlock is needed for consistent view, because parallel "hg update" and/or "hg bookmarks" might change working directory status while executing updatetotally(). Strictly speaking, truly consistent updating should acquire also store lock, because active bookmark might be moved to another one outside wlock scope (e.g. pulling from other repository causes updating current active one). Acquisition of wlock in this patch ensures consistency in as same level as past "hg update".
Martin Geisler - - Load All Authors

File last commit:

r13519:43b3b761 default
r28503:138ec883 default
Show More
test-eol-update.t
152 lines | 2.6 KiB | text/troff | Tads3Lexer
/ tests / test-eol-update.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: unify test-eol-update
 r12424 Test EOL update
Martin Geisler
tests: don't overwrite HGRCPATH...
 r13519 $ cat >> $HGRCPATH <<EOF
Matt Mackall
tests: unify test-eol-update
 r12424 > [diff]
> git = 1
> EOF
$ seteol () {
> if [ $1 = "LF" ]; then
> EOL='\n'
> else
> EOL='\r\n'
> fi
> }
$ makerepo () {
> echo
> echo "# ==== setup repository ===="
> echo '% hg init'
> hg init repo
> cd repo
>
> cat > .hgeol <<EOF
> [patterns]
> **.txt = LF
> EOF
>
> printf "first\nsecond\nthird\n" > a.txt
> hg commit --addremove -m 'LF commit'
>
> cat > .hgeol <<EOF
> [patterns]
> **.txt = CRLF
> EOF
>
> printf "first\r\nsecond\r\nthird\r\n" > a.txt
> hg commit -m 'CRLF commit'
>
> 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 =
> EOF
>
> hg update
>
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > echo '% a.txt (before)'
> cat a.txt
Matt Mackall
tests: unify test-eol-update
 r12424 >
> printf "first${EOL}third${EOL}" > a.txt
>
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > echo '% a.txt (after)'
> cat a.txt
Matt Mackall
tests: unify test-eol-update
 r12424 > echo '% hg diff'
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > hg diff
Matt Mackall
tests: unify test-eol-update
 r12424 >
> echo '% hg update 0'
> hg update 0
>
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > echo '% a.txt'
> cat a.txt
Matt Mackall
tests: unify test-eol-update
 r12424 > echo '% hg diff'
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 > hg diff
Matt Mackall
tests: unify test-eol-update
 r12424 >
>
> cd ..
> rm -r repo-$1
> }
$ makerepo
# ==== setup repository ====
% hg init
adding .hgeol
adding a.txt
$ dotest LF
% hg clone repo repo-LF
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % a.txt (before)
first\r (esc)
second\r (esc)
third\r (esc)
% a.txt (after)
Matt Mackall
tests: unify test-eol-update
 r12424 first
third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.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-update
 r12424 % hg update 0
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % a.txt
Matt Mackall
tests: unify test-eol-update
 r12424 first
third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,2 @@
first
-second
third
$ dotest CRLF
% hg clone repo repo-CRLF
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % a.txt (before)
first\r (esc)
second\r (esc)
third\r (esc)
% a.txt (after)
first\r (esc)
third\r (esc)
Matt Mackall
tests: unify test-eol-update
 r12424 % hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.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-update
 r12424 % hg update 0
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
 r12943 % a.txt
Matt Mackall
tests: unify test-eol-update
 r12424 first
third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,2 @@
first
-second
third
$ rm -r repo