##// END OF EJS Templates
merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

File last commit:

r22046:7a9cbb31 default
r23524:a1a7c94d default
Show More
test-incoming-outgoing.t
491 lines | 11.0 KiB | text/troff | Tads3Lexer
/ tests / test-incoming-outgoing.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve
Mads Kiilerich
tests: use 'hghave serve' to guard tests that requires serve daemon management
r15446
Martin Geisler
tests: remove redundant mkdir...
r13956 $ hg init test
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 $ cd test
$ for i in 0 1 2 3 4 5 6 7 8; do
> echo $i >> foo
Martin Geisler
tests: remove unneeded -d flags...
r12156 > hg commit -A -m $i
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 > done
adding foo
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 9 changesets, 9 total revisions
$ hg serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
$ cd ..
$ hg init new
http incoming
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg -R new incoming http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
r12643 comparing with http://localhost:$HGPORT/
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:d9f42cd1a1ec
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:376476025137
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 3
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 4:70d7eb252d49
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 4
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 5:ad284ee3b5ee
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 5
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 6:e9229f2de384
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 6
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 7:d152815bb8db
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 7
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 8:e4feb4ac9035
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 8
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg -R new incoming -r 4 http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
r12643 comparing with http://localhost:$HGPORT/
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:d9f42cd1a1ec
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:376476025137
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 3
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 4:70d7eb252d49
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 4
local incoming
$ hg -R new incoming test
comparing with test
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:d9f42cd1a1ec
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:376476025137
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 3
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 4:70d7eb252d49
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 4
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 5:ad284ee3b5ee
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 5
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 6:e9229f2de384
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 6
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 7:d152815bb8db
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 7
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 8:e4feb4ac9035
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 8
$ hg -R new incoming -r 4 test
comparing with test
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:d9f42cd1a1ec
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:376476025137
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 3
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 4:70d7eb252d49
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 4
limit to 2 changesets
$ hg -R new incoming -l 2 test
comparing with test
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
limit to 2 changesets, test with -p --git
$ hg -R new incoming -l 2 -p --git test
comparing with test
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
diff --git a/foo b/foo
new file mode 100644
--- /dev/null
+++ b/foo
@@ -0,0 +1,1 @@
+0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
diff --git a/foo b/foo
--- a/foo
+++ b/foo
@@ -1,1 +1,2 @@
0
+1
test with --bundle
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
r12643 comparing with http://localhost:$HGPORT/
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:d9f42cd1a1ec
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:376476025137
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 3
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 4:70d7eb252d49
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 4
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 5:ad284ee3b5ee
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 5
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 6:e9229f2de384
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 6
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 7:d152815bb8db
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 7
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 8:e4feb4ac9035
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 8
$ hg -R new incoming --bundle test2.hg test
comparing with test
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:00a43fa82f62
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 0
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:5460a410df01
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 1
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:d9f42cd1a1ec
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:376476025137
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 3
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 4:70d7eb252d49
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 4
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 5:ad284ee3b5ee
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 5
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 6:e9229f2de384
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 6
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 7:d152815bb8db
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 7
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 8:e4feb4ac9035
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 8
test the resulting bundles
$ hg init temp
$ hg init temp2
$ hg -R temp unbundle test.hg
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
$ hg -R temp2 unbundle test2.hg
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
$ hg -R temp tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 8:e4feb4ac9035
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 8
$ hg -R temp2 tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 8:e4feb4ac9035
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 8
$ rm -r temp temp2 new
test outgoing
$ hg clone test test-dev
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd test-dev
$ for i in 9 10 11 12 13; do
> echo $i >> foo
Martin Geisler
tests: remove unneeded -d flags...
r12156 > hg commit -A -m $i
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 > done
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 14 changesets, 14 total revisions
$ cd ..
$ hg -R test-dev outgoing test
comparing with test
searching for changes
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 9:d89d4abea5bc
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 9
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 10:820095aa7158
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 10
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 11:09ede2f3a638
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 11
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 12:e576b1bed305
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 12
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 13:96bbff09a7cc
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 13
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
outgoing: display info about secret changets while no sharable changeset found
r15992 test outgoing with secret changesets
$ hg -R test-dev phase --force --secret 9
$ hg -R test-dev outgoing test
comparing with test
searching for changes
Matt Mackall
scmutil: unify some 'no changes found' messages...
r15993 no changes found (ignored 5 secret changesets)
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
outgoing: display info about secret changets while no sharable changeset found
r15992 [1]
$ hg -R test-dev phase --draft -r 'head()'
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118
limit to 3 changesets
$ hg -R test-dev outgoing -l 3 test
comparing with test
searching for changes
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 9:d89d4abea5bc
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 9
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 10:820095aa7158
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 10
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 11:09ede2f3a638
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 11
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg -R test-dev outgoing http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
r12643 comparing with http://localhost:$HGPORT/
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 searching for changes
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 9:d89d4abea5bc
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 9
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 10:820095aa7158
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 10
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 11:09ede2f3a638
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 11
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 12:e576b1bed305
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 12
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 13:96bbff09a7cc
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 13
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
r12643 comparing with http://localhost:$HGPORT/
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 searching for changes
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 9:d89d4abea5bc
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 9
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 10:820095aa7158
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 10
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 11:09ede2f3a638
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-incoming-outgoing
r12118 summary: 11
Andrew Pritchard
setdiscovery: return anyincoming=False when remote's only head is nullid...
r14981
incoming from empty remote repository
$ hg init r1
$ hg init r2
$ echo a > r1/foo
$ hg -R r1 ci -Ama
adding foo
$ hg -R r1 incoming r2 --bundle x.hg
comparing with r2
searching for changes
no changes found
[1]