upstream/mercurial-mirror Commit - r10423:caaa1f99

1

#!/bin/sh

1

#!/bin/sh

2

3

"$TESTDIR/hghave" svn || exit 80

3

"$TESTDIR/hghave" svn || exit 80

4

5

fix_path()

5

fix_path()

6

{

6

{

7

tr '\\' /

7

tr '\\' /

8

}

8

}

9

10

escapedwd=`pwd | fix_path`

10

escapedwd=`pwd | fix_path`

11

# SVN wants all paths to start with a slash. Unfortunately,

11

# SVN wants all paths to start with a slash. Unfortunately,

12

# Windows ones don't. Handle that.

12

# Windows ones don't. Handle that.

13

expr $escapedwd : "\/" > /dev/null

13

expr $escapedwd : "\/" > /dev/null

14

if [ $? -ne 0 ]; then

14

if [ $? -ne 0 ]; then

15

escapedwd='/'$escapedwd

15

escapedwd='/'$escapedwd

16

fi

16

fi

17

filterpath="sed s|$escapedwd|/root|"

17

filterpath="sed s|$escapedwd|/root|"

18

filtersvn='s/ in transaction.*/ is out of date/;s/Out of date: /File /'

18

19

echo % create subversion repo

20

echo % create subversion repo

20

21

SVNREPO="file://$escapedwd/svn-repo"

22

SVNREPO="file://$escapedwd/svn-repo"

22

WCROOT="`pwd`/svn-wc"

23

WCROOT="`pwd`/svn-wc"

23

svnadmin create svn-repo

24

svnadmin create svn-repo

24

svn co $SVNREPO svn-wc

25

svn co $SVNREPO svn-wc

25

cd svn-wc

26

cd svn-wc

26

mkdir src

27

mkdir src

27

echo alpha > src/alpha

28

echo alpha > src/alpha

28

svn add src

29

svn add src

29

mkdir externals

30

mkdir externals

30

echo other > externals/other

31

echo other > externals/other

31

svn add externals

32

svn add externals

32

svn ci -m 'Add alpha'

33

svn ci -m 'Add alpha'

33

svn up

34

svn up

34

cat > extdef <<EOF

35

cat > extdef <<EOF

35

externals -r1 $SVNREPO/externals

36

externals -r1 $SVNREPO/externals

36

EOF

37

EOF

37

svn propset -F extdef svn:externals src

38

svn propset -F extdef svn:externals src

38

svn ci -m 'Setting externals'

39

svn ci -m 'Setting externals'

39

cd ..

40

cd ..

40

41

echo % create hg repo

42

echo % create hg repo

42

mkdir sub

43

mkdir sub

43

cd sub

44

cd sub

44

hg init t

45

hg init t

45

cd t

46

cd t

46

47

echo % first revision, no sub

48

echo % first revision, no sub

48

echo a > a

49

echo a > a

49

hg ci -Am0

50

hg ci -Am0

50

51

echo % add first svn sub

52

echo % add first svn sub

52

echo "s = [svn]$SVNREPO/src" >> .hgsub

53

echo "s = [svn]$SVNREPO/src" >> .hgsub

53

svn co --quiet $SVNREPO/src s

54

svn co --quiet $SVNREPO/src s

54

hg add .hgsub

55

hg add .hgsub

55

hg ci -m1

56

hg ci -m1

56

echo % debugsub

57

echo % debugsub

57

hg debugsub | $filterpath

58

hg debugsub | $filterpath

58

59

echo

60

echo

60

echo % change file in svn and hg, commit

61

echo % change file in svn and hg, commit

61

echo a >> a

62

echo a >> a

62

echo alpha >> s/alpha

63

echo alpha >> s/alpha

63

hg commit -m 'Message!'

64

hg commit -m 'Message!'

64

hg debugsub | $filterpath

65

hg debugsub | $filterpath

65

66

echo

67

echo

67

echo a > s/a

68

echo a > s/a

68

echo % should be empty despite change to s/a

69

echo % should be empty despite change to s/a

69

hg st

70

hg st

70

71

echo

72

echo

72

echo % add a commit from svn

73

echo % add a commit from svn

73

cd "$WCROOT"/src

74

cd "$WCROOT"/src

74

svn up

75

svn up

75

echo xyz >> alpha

76

echo xyz >> alpha

76

svn propset svn:mime-type 'text/xml' alpha

77

svn propset svn:mime-type 'text/xml' alpha

77

svn ci -m 'amend a from svn'

78

svn ci -m 'amend a from svn'

78

cd ../../sub/t

79

cd ../../sub/t

79

80

echo % this commit from hg will fail

81

echo % this commit from hg will fail

81

echo zzz >> s/alpha

82

echo zzz >> s/alpha

82

hg ci -m 'amend alpha from hg'

83

hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"

83

svn revert -q s/alpha

84

svn revert -q s/alpha

84

85

echo % this commit fails because of meta changes

86

echo % this commit fails because of meta changes

86

svn propset svn:mime-type 'text/html' s/alpha

87

svn propset svn:mime-type 'text/html' s/alpha

87

hg ci -m 'amend alpha from hg'

88

hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"

88

svn revert -q s/alpha

89

svn revert -q s/alpha

89

90

echo % this commit fails because of externals changes

91

echo % this commit fails because of externals changes

91

echo zzz > s/externals/other

92

echo zzz > s/externals/other

92

hg ci -m 'amend externals from hg'

93

hg ci -m 'amend externals from hg'

93

svn revert -q s/externals/other

94

svn revert -q s/externals/other

94

95

echo % this commit fails because of externals meta changes

96

echo % this commit fails because of externals meta changes

96

svn propset svn:mime-type 'text/html' s/externals/other

97

svn propset svn:mime-type 'text/html' s/externals/other

97

hg ci -m 'amend externals from hg'

98

hg ci -m 'amend externals from hg'

98

svn revert -q s/externals/other

99

svn revert -q s/externals/other

99

100

echo

101

echo

101

echo % clone

102

echo % clone

102

cd ..

103

cd ..

103

hg clone t tc | fix_path

104

hg clone t tc | fix_path

104

cd tc

105

cd tc

105

echo % debugsub in clone

106

echo % debugsub in clone

106

hg debugsub | $filterpath

107

hg debugsub | $filterpath

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             #!/bin/sh
             "$TESTDIR/hghave" svn || exit 80
             fix_path()
             {
                 tr '\\' /
             }
             escapedwd=`pwd | fix_path`
             # SVN wants all paths to start with a slash. Unfortunately,
             # Windows ones don't. Handle that.
             expr $escapedwd : "\/" > /dev/null
             if [ $? -ne 0 ]; then
                 escapedwd='/'$escapedwd
             fi
             filterpath="sed s|$escapedwd|/root|"
+            filtersvn='s/ in transaction.*/ is out of date/;s/Out of date: /File /'
             echo % create subversion repo
             SVNREPO="file://$escapedwd/svn-repo"
             WCROOT="`pwd`/svn-wc"
             svnadmin create svn-repo
             svn co $SVNREPO svn-wc
             cd svn-wc
             mkdir src
             echo alpha > src/alpha
             svn add src
             mkdir externals
             echo other > externals/other
             svn add externals
             svn ci -m 'Add alpha'
             svn up
             cat > extdef <<EOF
             externals -r1 $SVNREPO/externals
             EOF
             svn propset -F extdef svn:externals src
             svn ci -m 'Setting externals'
             cd ..
             echo % create hg repo
             mkdir sub
             cd sub
             hg init t
             cd t
             echo % first revision, no sub
             echo a > a
             hg ci -Am0
             echo % add first svn sub
             echo "s = [svn]$SVNREPO/src" >> .hgsub
             svn co --quiet $SVNREPO/src s
             hg add .hgsub
             hg ci -m1
             echo % debugsub
             hg debugsub | $filterpath
             echo
             echo % change file in svn and hg, commit
             echo a >> a
             echo alpha >> s/alpha
             hg commit -m 'Message!'
             hg debugsub | $filterpath
             echo
             echo a > s/a
             echo % should be empty despite change to s/a
             hg st
             echo
             echo % add a commit from svn
             cd "$WCROOT"/src
             svn up
             echo xyz >> alpha
             svn propset svn:mime-type 'text/xml' alpha
             svn ci -m 'amend a from svn'
             cd ../../sub/t
             echo % this commit from hg will fail
             echo zzz >> s/alpha
-            hg ci -m 'amend alpha from hg'
+            hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
             svn revert -q s/alpha
             echo % this commit fails because of meta changes
             svn propset svn:mime-type 'text/html' s/alpha
-            hg ci -m 'amend alpha from hg'
+            hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
             svn revert -q s/alpha
             echo % this commit fails because of externals changes
             echo zzz > s/externals/other
             hg ci -m 'amend externals from hg'
             svn revert -q s/externals/other
             echo % this commit fails because of externals meta changes
             svn propset svn:mime-type 'text/html' s/externals/other
             hg ci -m 'amend externals from hg'
             svn revert -q s/externals/other
             echo
             echo % clone
             cd ..
             hg clone t tc | fix_path
             cd tc
             echo % debugsub in clone
             hg debugsub | $filterpath