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

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

identify: add template support...
identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html
Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default
r33051:15a79ac8 default
Show More
test-mq-eol.t
211 lines | 4.1 KiB | text/troff | Tads3Lexer
/ tests / test-mq-eol.t
History | Source | Raw |Copy content |Copy permalink
Nicolas Dumazet
tests: unify test-mq-eol
 r11895
Test interactions between mq and patch.eol
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
 r23172 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [diff]
> nodates = 1
> EOF
Nicolas Dumazet
tests: unify test-mq-eol
 r11895
$ cat > makepatch.py <<EOF
> f = file('eol.diff', 'wb')
> w = f.write
> w('test message\n')
> w('diff --git a/a b/a\n')
> w('--- a/a\n')
> w('+++ b/a\n')
> w('@@ -1,5 +1,5 @@\n')
> w(' a\n')
> w('-b\r\n')
> w('+y\r\n')
> w(' c\r\n')
> w(' d\n')
> w('-e\n')
> w('\ No newline at end of file\n')
> w('+z\r\n')
> w('\ No newline at end of file\r\n')
> EOF
$ cat > cateol.py <<EOF
> import sys
> for line in file(sys.argv[1], 'rb'):
> line = line.replace('\r', '<CR>')
> line = line.replace('\n', '<LF>')
> print line
> EOF
$ hg init repo
$ cd repo
$ echo '\.diff' > .hgignore
$ echo '\.rej' >> .hgignore
Test different --eol values
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
 r22947 $ $PYTHON -c 'file("a", "wb").write("a\nb\nc\nd\ne")'
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 $ hg ci -Am adda
adding .hgignore
adding a
Augie Fackler
cleanup: use $PYTHON to run python in many more tests...
 r32940 $ $PYTHON ../makepatch.py
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 $ hg qimport eol.diff
adding eol.diff to series file
should fail in strict mode
$ hg qpush
applying eol.diff
patching file a
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
Yuya Nishihara
commands: say "working directory" in full spelling
 r24365 patch failed, rejects left in working directory
timeless@mozdev.org
mq: consistently use qrefresh
 r26780 errors during apply, please fix and qrefresh eol.diff
Matt Mackall
tests: add exit codes to unified tests
 r12316 [2]
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 $ hg qpop
popping eol.diff
patch queue now empty
invalid eol
$ hg --config patch.eol='LFCR' qpush
applying eol.diff
patch failed, unable to continue (try -v)
Yuya Nishihara
commands: say "working directory" in full spelling
 r24365 patch failed, rejects left in working directory
timeless@mozdev.org
mq: consistently use qrefresh
 r26780 errors during apply, please fix and qrefresh eol.diff
Matt Mackall
tests: add exit codes to unified tests
 r12316 [2]
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 $ hg qpop
popping eol.diff
patch queue now empty
force LF
$ hg --config patch.eol='CRLF' qpush
applying eol.diff
now at: eol.diff
$ hg qrefresh
Augie Fackler
cleanup: use $PYTHON to run python in many more tests...
 r32940 $ $PYTHON ../cateol.py .hg/patches/eol.diff
Mads Kiilerich
mq: upgrade non-plain patches to HG format when setting parent in patchheader...
 r22545 # HG changeset patch<LF>
# Parent 0d0bf99a8b7a3842c6f8ef09e34f69156c4bd9d0<LF>
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 test message<LF>
<LF>
diff -r 0d0bf99a8b7a a<LF>
--- a/a<LF>
+++ b/a<LF>
@@ -1,5 +1,5 @@<LF>
-a<LF>
-b<LF>
-c<LF>
-d<LF>
-e<LF>
\ No newline at end of file<LF>
+a<CR><LF>
+y<CR><LF>
+c<CR><LF>
+d<CR><LF>
+z<LF>
\ No newline at end of file<LF>
Augie Fackler
cleanup: use $PYTHON to run python in many more tests...
 r32940 $ $PYTHON ../cateol.py a
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 a<CR><LF>
y<CR><LF>
c<CR><LF>
d<CR><LF>
z
$ hg qpop
popping eol.diff
patch queue now empty
push again forcing LF and compare revisions
$ hg --config patch.eol='CRLF' qpush
applying eol.diff
now at: eol.diff
Augie Fackler
cleanup: use $PYTHON to run python in many more tests...
 r32940 $ $PYTHON ../cateol.py a
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 a<CR><LF>
y<CR><LF>
c<CR><LF>
d<CR><LF>
z
$ hg qpop
popping eol.diff
patch queue now empty
push again without LF and compare revisions
$ hg qpush
applying eol.diff
now at: eol.diff
Augie Fackler
cleanup: use $PYTHON to run python in many more tests...
 r32940 $ $PYTHON ../cateol.py a
Nicolas Dumazet
tests: unify test-mq-eol
 r11895 a<CR><LF>
y<CR><LF>
c<CR><LF>
d<CR><LF>
z
$ hg qpop
popping eol.diff
patch queue now empty
Patrick Mezard
patch: write .rej files without rewriting EOLs...
 r13100 $ cd ..
Test .rej file EOL are left unchanged
$ hg init testeol
$ cd testeol
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
 r22947 $ $PYTHON -c "file('a', 'wb').write('1\r\n2\r\n3\r\n4')"
Patrick Mezard
patch: write .rej files without rewriting EOLs...
 r13100 $ hg ci -Am adda
adding a
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
 r22947 $ $PYTHON -c "file('a', 'wb').write('1\r\n2\r\n33\r\n4')"
Patrick Mezard
patch: write .rej files without rewriting EOLs...
 r13100 $ hg qnew patch1
$ hg qpop
popping patch1
patch queue now empty
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
 r22947 $ $PYTHON -c "file('a', 'wb').write('1\r\n22\r\n33\r\n4')"
Patrick Mezard
patch: write .rej files without rewriting EOLs...
 r13100 $ hg ci -m changea
$ hg --config 'patch.eol=LF' qpush
applying patch1
patching file a
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
Yuya Nishihara
commands: say "working directory" in full spelling
 r24365 patch failed, rejects left in working directory
timeless@mozdev.org
mq: consistently use qrefresh
 r26780 errors during apply, please fix and qrefresh patch1
Patrick Mezard
patch: write .rej files without rewriting EOLs...
 r13100 [2]
$ hg qpop
popping patch1
patch queue now empty
$ cat a.rej
--- a
+++ a
@@ -1,4 +1,4 @@
1\r (esc)
2\r (esc)
-3\r (esc)
+33\r (esc)
4
\ No newline at end of file
$ hg --config 'patch.eol=auto' qpush
applying patch1
patching file a
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
Yuya Nishihara
commands: say "working directory" in full spelling
 r24365 patch failed, rejects left in working directory
timeless@mozdev.org
mq: consistently use qrefresh
 r26780 errors during apply, please fix and qrefresh patch1
Patrick Mezard
patch: write .rej files without rewriting EOLs...
 r13100 [2]
$ hg qpop
popping patch1
patch queue now empty
$ cat a.rej
--- a
+++ a
@@ -1,4 +1,4 @@
1\r (esc)
2\r (esc)
-3\r (esc)
+33\r (esc)
4
\ No newline at end of file
$ cd ..