mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
15e470ce7f
The default for the time zone offset in a converted changeset has
always been 0 (UTC). With this patch, the converted changeset is
modified so that the local offset from UTC is specified as the time
zone offset.
The option is specified as the boolean convert.localtimezone (default
False). Example usage:
hg convert -s cvs --config convert.localtimezone=True example-cvs example-hg
IMPORTANT: the patch only applies to conversions from cvs or svn.
The documentation for the option only appears in those two sections
in the convert help text.
211 lines
5.4 KiB
Perl
211 lines
5.4 KiB
Perl
|
|
$ "$TESTDIR/hghave" svn svn-bindings || exit 80
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> convert =
|
|
> graphlog =
|
|
> [convert]
|
|
> svn.trunk = mytrunk
|
|
> EOF
|
|
|
|
$ svnadmin create svn-repo
|
|
$ SVNREPOPATH=`pwd`/svn-repo
|
|
#if windows
|
|
$ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
|
#else
|
|
$ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
|
#endif
|
|
|
|
Now test that it works with trunk/tags layout, but no branches yet.
|
|
|
|
Initial svn import
|
|
|
|
$ mkdir projB
|
|
$ cd projB
|
|
$ mkdir mytrunk
|
|
$ mkdir tags
|
|
$ cd ..
|
|
|
|
$ svn import -m "init projB" projB "$SVNREPOURL/proj%20B" | sort
|
|
|
|
Adding projB/mytrunk (glob)
|
|
Adding projB/tags (glob)
|
|
Committed revision 1.
|
|
|
|
Update svn repository
|
|
|
|
$ svn co "$SVNREPOURL/proj%20B/mytrunk" B
|
|
Checked out revision 1.
|
|
$ cd B
|
|
$ echo hello > 'letter .txt'
|
|
$ svn add 'letter .txt'
|
|
A letter .txt
|
|
$ svn ci -m hello
|
|
Adding letter .txt
|
|
Transmitting file data .
|
|
Committed revision 2.
|
|
|
|
$ "$TESTDIR/svn-safe-append.py" world 'letter .txt'
|
|
$ svn ci -m world
|
|
Sending letter .txt
|
|
Transmitting file data .
|
|
Committed revision 3.
|
|
|
|
$ svn copy -m "tag v0.1" "$SVNREPOURL/proj%20B/mytrunk" "$SVNREPOURL/proj%20B/tags/v0.1"
|
|
|
|
Committed revision 4.
|
|
|
|
$ "$TESTDIR/svn-safe-append.py" 'nice day today!' 'letter .txt'
|
|
$ svn ci -m "nice day"
|
|
Sending letter .txt
|
|
Transmitting file data .
|
|
Committed revision 5.
|
|
$ cd ..
|
|
|
|
Convert to hg once and also test localtimezone option
|
|
|
|
NOTE: This doesn't check all time zones -- it merely determines that
|
|
the configuration option is taking effect.
|
|
|
|
An arbitrary (U.S.) time zone is used here. TZ=US/Hawaii is selected
|
|
since it does not use DST (unlike other U.S. time zones) and is always
|
|
a fixed difference from UTC.
|
|
|
|
$ TZ=US/Hawaii hg convert --config convert.localtimezone=True "$SVNREPOURL/proj%20B" B-hg
|
|
initializing destination B-hg repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
3 init projB
|
|
2 hello
|
|
1 world
|
|
0 nice day
|
|
updating tags
|
|
|
|
Update svn repository again
|
|
|
|
$ cd B
|
|
$ "$TESTDIR/svn-safe-append.py" "see second letter" 'letter .txt'
|
|
$ echo "nice to meet you" > letter2.txt
|
|
$ svn add letter2.txt
|
|
A letter2.txt
|
|
$ svn ci -m "second letter"
|
|
Sending letter .txt
|
|
Adding letter2.txt
|
|
Transmitting file data ..
|
|
Committed revision 6.
|
|
|
|
$ svn copy -m "tag v0.2" "$SVNREPOURL/proj%20B/mytrunk" "$SVNREPOURL/proj%20B/tags/v0.2"
|
|
|
|
Committed revision 7.
|
|
|
|
$ "$TESTDIR/svn-safe-append.py" "blah-blah-blah" letter2.txt
|
|
$ svn ci -m "work in progress"
|
|
Sending letter2.txt
|
|
Transmitting file data .
|
|
Committed revision 8.
|
|
$ cd ..
|
|
|
|
$ hg convert -s svn "$SVNREPOURL/proj%20B/non-existent-path" dest
|
|
initializing destination dest repository
|
|
abort: no revision found in module /proj B/non-existent-path
|
|
[255]
|
|
|
|
########################################
|
|
|
|
Test incremental conversion
|
|
|
|
$ TZ=US/Hawaii hg convert --config convert.localtimezone=True "$SVNREPOURL/proj%20B" B-hg
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
1 second letter
|
|
0 work in progress
|
|
updating tags
|
|
|
|
$ cd B-hg
|
|
$ hg glog --template '{rev} {desc|firstline} date: {date|date} files: {files}\n'
|
|
o 7 update tags date: * +0000 files: .hgtags (glob)
|
|
|
|
|
o 6 work in progress date: * -1000 files: letter2.txt (glob)
|
|
|
|
|
o 5 second letter date: * -1000 files: letter .txt letter2.txt (glob)
|
|
|
|
|
o 4 update tags date: * +0000 files: .hgtags (glob)
|
|
|
|
|
o 3 nice day date: * -1000 files: letter .txt (glob)
|
|
|
|
|
o 2 world date: * -1000 files: letter .txt (glob)
|
|
|
|
|
o 1 hello date: * -1000 files: letter .txt (glob)
|
|
|
|
|
o 0 init projB date: * -1000 files: (glob)
|
|
|
|
$ hg tags -q
|
|
tip
|
|
v0.2
|
|
v0.1
|
|
$ cd ..
|
|
|
|
Test filemap
|
|
$ echo 'include letter2.txt' > filemap
|
|
$ hg convert --filemap filemap "$SVNREPOURL/proj%20B/mytrunk" fmap
|
|
initializing destination fmap repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
5 init projB
|
|
4 hello
|
|
3 world
|
|
2 nice day
|
|
1 second letter
|
|
0 work in progress
|
|
$ hg -R fmap branch -q
|
|
default
|
|
$ hg glog -R fmap --template '{rev} {desc|firstline} files: {files}\n'
|
|
o 1 work in progress files: letter2.txt
|
|
|
|
|
o 0 second letter files: letter2.txt
|
|
|
|
|
|
Test stop revision
|
|
$ hg convert --rev 1 "$SVNREPOURL/proj%20B/mytrunk" stoprev
|
|
initializing destination stoprev repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
0 init projB
|
|
$ hg -R stoprev branch -q
|
|
default
|
|
|
|
Check convert_revision extra-records.
|
|
This is also the only place testing more than one extra field in a revision.
|
|
|
|
$ cd stoprev
|
|
$ hg tip --debug | grep extra
|
|
extra: branch=default
|
|
extra: convert_revision=svn:........-....-....-....-............/proj B/mytrunk@1 (re)
|
|
$ cd ..
|
|
|
|
Test converting empty heads (issue3347)
|
|
|
|
$ svnadmin create svn-empty
|
|
$ svnadmin load -q svn-empty < "$TESTDIR/svn/empty.svndump"
|
|
$ hg --config convert.svn.trunk= convert svn-empty
|
|
assuming destination svn-empty-hg
|
|
initializing destination svn-empty-hg repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
1 init projA
|
|
0 adddir
|
|
$ hg --config convert.svn.trunk= convert "$SVNREPOURL/../svn-empty/trunk"
|
|
assuming destination trunk-hg
|
|
initializing destination trunk-hg repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
1 init projA
|
|
0 adddir
|