mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
132f37fa14
Summary: It turns out the hggit tests weren't passing in Python 3, despite us having removed them from our py3-broken list. Woops. This fixes them and enables the tests. Reviewed By: sfilipco Differential Revision: D25095189 fbshipit-source-id: acffca34b0d5defa7575ede60621ca2ce0a2afe4
129 lines
3.6 KiB
Perl
129 lines
3.6 KiB
Perl
$ disable treemanifest
|
|
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ hg init hgrepo
|
|
$ cd hgrepo
|
|
$ echo alpha > alpha
|
|
$ hg add alpha
|
|
$ fn_hg_commit -m "add alpha"
|
|
$ hg log --graph --debug | grep -v phase:
|
|
@ commit: 0221c246a56712c6aa64e5ee382244d8a471b1e2
|
|
manifest: 8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
files+: alpha
|
|
extra: branch=default
|
|
description:
|
|
add alpha
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
configure for use from git
|
|
$ hg clone hgrepo gitrepo
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd gitrepo
|
|
$ hg book master
|
|
$ hg up null | egrep -v '^\(leaving bookmark master\)$'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo "[git]" >> .hg/hgrc
|
|
$ echo "intree = True" >> .hg/hgrc
|
|
$ hg gexport
|
|
|
|
do some work
|
|
$ git config core.bare false
|
|
$ git checkout master
|
|
Already on 'master'
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
|
|
get things back to hg
|
|
$ hg gimport
|
|
importing git objects into hg
|
|
$ hg log --graph --debug | grep -v phase:
|
|
o commit: d294862c083a2eac3c1b31d3a3bdbdffb49a5b25
|
|
│ bookmark: master
|
|
│ manifest: f0bd6fbafbaebe4bb59c35108428f6fce152431d
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:11 2007 +0000
|
|
│ files+: beta
|
|
│ extra: branch=default
|
|
│ extra: convert_revision=fef06279bff0022eee567d65729d8e795fd3efe8
|
|
│ extra: hg-git-rename-source=git
|
|
│ description:
|
|
│ add beta
|
|
│
|
|
│
|
|
o commit: 0221c246a56712c6aa64e5ee382244d8a471b1e2
|
|
manifest: 8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
files+: alpha
|
|
extra: branch=default
|
|
description:
|
|
add alpha
|
|
|
|
|
|
gimport should have updated the bookmarks as well
|
|
$ hg bookmarks
|
|
master d294862c083a
|
|
|
|
gimport support for git.mindate
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [git]
|
|
> mindate = 2014-01-02 00:00:00 +0000
|
|
> EOF
|
|
$ echo oldcommit > oldcommit
|
|
$ git add oldcommit
|
|
$ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \
|
|
> GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \
|
|
> git commit -m oldcommit > /dev/null || echo "git commit error"
|
|
$ hg gimport
|
|
no changes found
|
|
$ hg log --graph
|
|
o commit: d294862c083a
|
|
│ bookmark: master
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:11 2007 +0000
|
|
│ summary: add beta
|
|
│
|
|
o commit: 0221c246a567
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
$ echo newcommit > newcommit
|
|
$ git add newcommit
|
|
$ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \
|
|
> GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \
|
|
> git commit -m newcommit > /dev/null || echo "git commit error"
|
|
$ hg gimport
|
|
importing git objects into hg
|
|
$ hg log --graph
|
|
o commit: 3231f2356e13
|
|
│ bookmark: master
|
|
│ user: test <test@example.org>
|
|
│ date: Wed Jan 01 00:00:00 2014 +0000
|
|
│ summary: newcommit
|
|
│
|
|
o commit: 7912581b53bd
|
|
│ user: test <test@example.org>
|
|
│ date: Sat Mar 01 00:00:00 2014 +0000
|
|
│ summary: oldcommit
|
|
│
|
|
o commit: d294862c083a
|
|
│ user: test <test@example.org>
|
|
│ date: Mon Jan 01 00:00:11 2007 +0000
|
|
│ summary: add beta
|
|
│
|
|
o commit: 0221c246a567
|
|
user: test
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|