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

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

exchange: support for streaming clone bundles...
exchange: support for streaming clone bundles Now that we have a mechanism to produce and consume streaming clone bundles, we need to teach the human-facing bundle specification parser and the internal bundle file header reading code to be aware of this new format. This patch does so. For the human-facing bundle specification, we choose the name "packed" to describe "streaming clone bundles" because the bundle is essentially a "pack" of raw revlog files that are "packed" together. There should probably be a bikeshed over the name, especially since it is human facing.
Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default
r26756:9e272a96 default
Show More
test-mq-qdiff.t
179 lines | 2.4 KiB | text/troff | Tads3Lexer
/ tests / test-mq-qdiff.t
History | Source | Raw |Copy content |Copy permalink
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
 r23172 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [mq]
> git = keep
> EOF
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ hg init a
$ cd a
$ echo 'base' > base
$ hg ci -Ambase
adding base
$ hg qnew -mmqbase mqbase
$ echo 'patched' > base
$ hg qrefresh
qdiff:
Matt Mackall
tests: drop a bunch of sed calls from unified tests
 r12366 $ hg qdiff
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 diff -r d20a80d4def3 base
--- a/base Thu Jan 01 00:00:00 1970 +0000
Matt Mackall
tests: various fixes for new unified test pattern format
 r12377 +++ b/base* (glob)
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 @@ -1,1 +1,1 @@
-base
+patched
qdiff dirname:
$ hg qdiff --nodates .
diff -r d20a80d4def3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
qdiff filename:
$ hg qdiff --nodates base
diff -r d20a80d4def3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
$ hg revert -a
$ hg qpop
popping mqbase
patch queue now empty
$ hg qdelete mqbase
$ printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines
$ hg ci -Amlines -d '2 0'
adding lines
$ hg qnew -mmqbase2 mqbase2
$ printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines
$ hg qdiff --nodates -U 1
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,1 +1,3 @@
+
+
1
@@ -4,4 +6,4 @@
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
$ hg qdiff --nodates -b
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,9 +1,11 @@
+
+
1
2
3
4
hello world
-goodbye world
+ goodbye world
7
8
9
$ hg qdiff --nodates -U 1 -B
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
Patrick Mezard
mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234)...
 r16089 @@ -4,4 +4,4 @@
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 4
-hello world
-goodbye world
+hello world
+ goodbye world
7
$ hg qdiff --nodates -w
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
1
2
3
$ hg qdiff --nodates --reverse
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,11 +1,9 @@
-
-
1
2
3
4
-hello world
- goodbye world
+hello world
+goodbye world
7
8
9
qdiff preserve existing git flag:
$ hg qrefresh --git
$ echo a >> lines
$ hg qdiff
diff --git a/lines b/lines
--- a/lines
+++ b/lines
@@ -1,9 +1,12 @@
+
+
1
2
3
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
8
9
+a
$ hg qdiff --stat
lines | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Idan Kamara
localrepo: don't add deleted files to list of modified/added files (issue2761)...
 r13929 $ hg qrefresh
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
Idan Kamara
localrepo: don't add deleted files to list of modified/added files (issue2761)...
 r13929 qdiff when file deleted (but not removed) in working dir:
$ hg qnew deleted-file
$ echo a > newfile
$ hg add newfile
$ hg qrefresh
$ rm newfile
$ hg qdiff
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913
$ cd ..