annotate tests/test-convert-bzr-ghosts.t @ 24878:e530cde6d115 stable

bundle2: disable ouput capture unless we use http (issue4613 issue4615) The current bundle2 processing was capturing all output. This is nice as it provide better meta data about what output what, but this was changing two things: 1) adding a prefix "remote: " to "other" output during local push (issue4613) 2) local and ssh push does not provide real time output anymore (issue4615) As we are unsure about what form should be used in (1) and how to solve (2) we disable output capture in this two cases. Output capture can be forced using an experimental option.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 28 Apr 2015 17:38:02 -0700
parents f2719b387380
children 89872688893f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
1
12515
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
2 $ . "$TESTDIR/bzr-definitions"
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
3 $ cat > ghostcreator.py <<EOF
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
4 > import sys
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
5 > from bzrlib import workingtree
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
6 > wt = workingtree.WorkingTree.open('.')
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
7 >
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
8 > message, ghostrev = sys.argv[1:]
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
9 > wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
10 > wt.commit(message)
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
11 > EOF
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
12
12515
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
13 ghost revisions
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset
14
12515
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
15 $ mkdir test-ghost-revisions
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
16 $ cd test-ghost-revisions
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
17 $ bzr init -q source
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
18 $ cd source
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
19 $ echo content > somefile
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
20 $ bzr add -q somefile
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
21 $ bzr commit -q -m 'Initial layout setup'
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
22 $ echo morecontent >> somefile
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
23 $ python ../../ghostcreator.py 'Commit with ghost revision' ghostrev
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
24 $ cd ..
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
25 $ hg convert source source-hg
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
26 initializing destination source-hg repository
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
27 scanning source...
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
28 sorting...
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
29 converting...
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
30 1 Initial layout setup
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
31 0 Commit with ghost revision
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
32 $ glog -R source-hg
16060
f84dda152a55 convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents: 12515
diff changeset
33 o 1@source "Commit with ghost revision" files: somefile
12515
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
34 |
16060
f84dda152a55 convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents: 12515
diff changeset
35 o 0@source "Initial layout setup" files: somefile
12515
b6a784e39ad4 tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com>
parents: 7058
diff changeset
36
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16060
diff changeset
37
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16060
diff changeset
38 $ cd ..