view tests/test-extra.t @ 765:70aba6b2fe7b

git_handler: export hg extra metadata as git extra metadata (issue121) We export new git commits with hg extra metadata stored as git extra fields. We also ensure that parsing old commits doesn't break.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 31 Aug 2014 14:01:07 -0700
parents 13a3513f8e67
children 389676318d4c
line wrap: on
line source

Test that extra metadata (renames, copies, and other extra metadata) roundtrips
across from hg to git
  $ . "$TESTDIR/testutil"

  $ git init -q gitrepo
  $ cd gitrepo
  $ touch a
  $ git add a
  $ fn_git_commit -ma
  $ git checkout -b not-master 2>&1 | sed s/\'/\"/g
  Switched to a new branch "not-master"

  $ cd ..
  $ hg clone -q gitrepo hgrepo
  $ cd hgrepo
  $ hg mv a b
  $ fn_hg_commit -mb
  $ hg up 0 | egrep -v '^\(leaving bookmark master\)$'
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ touch c
  $ hg add c
  $ fn_hg_commit -mc

Rebase will add a rebase_source
  $ hg --config extensions.rebase= rebase -s 1 -d 2
  saved backup bundle to $TESTTMP/*.hg (glob)
  $ hg up 2
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

Add a commit with multiple extra fields
  $ hg bookmark b1
  $ touch d
  $ hg add d
  $ fn_hg_commitextra --field zzzzzzz=datazzz --field aaaaaaa=dataaaa
  $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n"
  @  3 f15e01c73845392d86a5ed10fb0753d09bca13d3
  |  aaaaaaa=dataaaa branch=default zzzzzzz=datazzz
  |
  o  2 dcec77c6ae3cff594c4435e5820bec4ec9e57440 b
  |  branch=default rebase_source=bb8ddb1031b5d9afd7caa5aa9d24c735222e3636
  |
  o  1 003b36e9c3993ac4319eeebd5f77a1d5306ba706 c
  |  branch=default
  |
  o  0 ab83abcbf5717f738191aa2d42f52a7100ce06a8 a
     branch=default
  
Make sure legacy extra (in commit message, after '--HG--') doesn't break
  $ hg push -r b1 --config git.debugextrainmessage=1
  pushing to $TESTTMP/gitrepo
  searching for changes
  adding objects
  added 3 commits with 3 trees and 0 blobs
  adding reference refs/heads/b1

  $ hg bookmark b2
  $ hg mv c c2
  $ hg mv d d2
  $ fn_hg_commitextra --field yyyyyyy=datayyy --field bbbbbbb=databbb
  $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 1
  @  4 71a7f7cc00a30dde4a0d5da37f119e51ded1820a
  |  bbbbbbb=databbb branch=default yyyyyyy=datayyy
  |
  $ hg push -r b2
  pushing to $TESTTMP/gitrepo
  searching for changes
  adding objects
  added 1 commits with 1 trees and 0 blobs
  adding reference refs/heads/b2

  $ cd ../gitrepo
  $ git cat-file commit b1
  tree 1b773a2eb70f29397356f8069c285394835ff85a
  parent 99316cce06b9b5aa9e5a3f4df124939583791dda
  author test <none@none> 1167609613 +0000
  committer test <none@none> 1167609613 +0000
  
  
  
  --HG--
  extra : aaaaaaa : dataaaa
  extra : zzzzzzz : datazzz

  $ git cat-file commit b2
  tree 34ad62c6d6ad9464bfe62db5b3d2fa16aaa9fa9e
  parent ca11864bb2a84c3996929d42cf38bae3d0f7aae0
  author test <none@none> 1167609614 +0000
  committer test <none@none> 1167609614 +0000
  HG:rename c:c2
  HG:rename d:d2
  HG:extra bbbbbbb:databbb
  HG:extra yyyyyyy:datayyy
  
  

  $ cd ../gitrepo
  $ git checkout b1
  Switched to branch 'b1'
  $ commit_sha=$(git rev-parse HEAD)
  $ tree_sha=$(git rev-parse HEAD^{tree})

There's no way to create a Git repo with extra metadata via the CLI. Dulwich
lets you do that, though.

  >>> from dulwich.objects import Commit
  >>> from dulwich.porcelain import open_repo
  >>> repo = open_repo('.')
  >>> c = Commit()
  >>> c.author = 'test <test@example.org>'
  >>> c.author_time = 0
  >>> c.author_timezone = 0
  >>> c.committer = c.author
  >>> c.commit_time = 0
  >>> c.commit_timezone = 0
  >>> c.parents = ['$commit_sha']
  >>> c.tree = '$tree_sha'
  >>> c.message = 'extra commit\n'
  >>> c.extra.extend([('zzz:zzz', 'data:zzz'), ('aaa:aaa', 'data:aaa'),
  ...                 ('HG:extra', 'hgaaa:dataaaa'),
  ...                 ('HG:extra', 'hgzzz:datazzz')])
  >>> repo.object_store.add_object(c)
  >>> repo.refs.set_if_equals('refs/heads/master', None, c.id)
  True

  $ git cat-file commit master
  tree 1b773a2eb70f29397356f8069c285394835ff85a
  parent ca11864bb2a84c3996929d42cf38bae3d0f7aae0
  author test <test@example.org> 0 +0000
  committer test <test@example.org> 0 +0000
  zzz:zzz data:zzz
  aaa:aaa data:aaa
  HG:extra hgaaa:dataaaa
  HG:extra hgzzz:datazzz
  
  extra commit

  $ cd ..
  $ hg clone -q gitrepo hgrepo2
  $ cd hgrepo2
  $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n"
  @  5 71a7f7cc00a30dde4a0d5da37f119e51ded1820a
  |  bbbbbbb=databbb branch=default yyyyyyy=datayyy
  |
  | o  4 f5fddc070b0648a5cddb98b43bbd527e98f4b4d2 extra commit
  |/   GIT0-zzz%3Azzz=data%3Azzz GIT1-aaa%3Aaaa=data%3Aaaa branch=default hgaaa=dataaaa hgzzz=datazzz
  |
  o  3 f15e01c73845392d86a5ed10fb0753d09bca13d3
  |  aaaaaaa=dataaaa branch=default zzzzzzz=datazzz
  |
  o  2 dcec77c6ae3cff594c4435e5820bec4ec9e57440 b
  |  branch=default rebase_source=bb8ddb1031b5d9afd7caa5aa9d24c735222e3636
  |
  o  1 003b36e9c3993ac4319eeebd5f77a1d5306ba706 c
  |  branch=default
  |
  o  0 ab83abcbf5717f738191aa2d42f52a7100ce06a8 a
     branch=default