annotate tests/test-hg-author.t @ 844:fffe8883960b

git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 02 Dec 2014 14:17:09 -0800
parents 371e62e7cacd
children 93689e8f27ac
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
575
a7da97e69d56 tests: extract extension configuration into a testutil library
David M. Carr <david@carrclan.us>
parents: 566
diff changeset
1 Load commonly used test logic
a7da97e69d56 tests: extract extension configuration into a testutil library
David M. Carr <david@carrclan.us>
parents: 566
diff changeset
2 $ . "$TESTDIR/testutil"
a7da97e69d56 tests: extract extension configuration into a testutil library
David M. Carr <david@carrclan.us>
parents: 566
diff changeset
3
578
935c4fb1bbfc tests: let git init create directories when applicable
David M. Carr <david@carrclan.us>
parents: 576
diff changeset
4 $ git init gitrepo
935c4fb1bbfc tests: let git init create directories when applicable
David M. Carr <david@carrclan.us>
parents: 576
diff changeset
5 Initialized empty Git repository in $TESTTMP/gitrepo/.git/
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
6 $ cd gitrepo
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
7 $ echo alpha > alpha
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
8 $ git add alpha
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
9 $ fn_git_commit -m "add alpha"
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
10 $ git checkout -b not-master
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
11 Switched to a new branch 'not-master'
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
12
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
13 $ cd ..
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
14 $ hg clone gitrepo hgrepo | grep -v '^updating'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
15 importing git objects into hg
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
17
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
18 $ cd hgrepo
729
371e62e7cacd tests: fix further breakage due to upstream output changes
Siddharth Agarwal <sid0@fb.com>
parents: 618
diff changeset
19 $ hg co master | egrep -v '^\(activating bookmark master\)$'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
20 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
21 $ echo beta > beta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
22 $ hg add beta
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
23 $ fn_hg_commit -u "test" -m 'add beta'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
24 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
25 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
26 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
27 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
28 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
29 updating reference refs/heads/master
207
c06ac5b982a9 add a test for pushing to git
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
30
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
31 $ echo gamma >> beta
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
32 $ fn_hg_commit -u "test <test@example.com> (comment)" -m 'modify beta'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
33 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
34 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
35 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
36 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
37 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
38 updating reference refs/heads/master
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
39
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
40 $ echo gamma > gamma
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
41 $ hg add gamma
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
42 $ fn_hg_commit -u "<test@example.com>" -m 'add gamma'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
43 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
44 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
45 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
46 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
47 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
48 updating reference refs/heads/master
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
49
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
50 $ echo delta > delta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
51 $ hg add delta
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
52 $ fn_hg_commit -u "name<test@example.com>" -m 'add delta'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
53 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
54 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
55 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
56 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
57 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
58 updating reference refs/heads/master
207
c06ac5b982a9 add a test for pushing to git
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
59
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
60 $ echo epsilon > epsilon
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
61 $ hg add epsilon
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
62 $ fn_hg_commit -u "name <test@example.com" -m 'add epsilon'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
63 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
64 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
65 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
66 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
67 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
68 updating reference refs/heads/master
207
c06ac5b982a9 add a test for pushing to git
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
69
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
70 $ echo zeta > zeta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
71 $ hg add zeta
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
72 $ fn_hg_commit -u " test " -m 'add zeta'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
73 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
74 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
75 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
76 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
77 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
78 updating reference refs/heads/master
207
c06ac5b982a9 add a test for pushing to git
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
79
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
80 $ echo eta > eta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
81 $ hg add eta
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
82 $ fn_hg_commit -u "test < test@example.com >" -m 'add eta'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
83 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
84 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
85 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
86 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
87 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
88 updating reference refs/heads/master
207
c06ac5b982a9 add a test for pushing to git
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
89
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
90 $ echo theta > theta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
91 $ hg add theta
576
c4849b2dab87 tests: extract commonly used commit/tag functions into testutil library
David M. Carr <david@carrclan.us>
parents: 575
diff changeset
92 $ fn_hg_commit -u "test >test@example.com>" -m 'add theta'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
93 $ hg push
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
94 pushing to $TESTTMP/gitrepo
550
4bc39fd24db3 push: change "no changes" default output to match normal mercurial
David M. Carr <david@carrclan.us>
parents: 529
diff changeset
95 searching for changes
591
163c452531cf push: add more output about what was added (issue #64)
David M. Carr <david@carrclan.us>
parents: 580
diff changeset
96 adding objects
618
86a4abcd3355 tests: dulwich is now smarter about sending fewer objects, update output
Augie Fackler <raf@durin42.com>
parents: 603
diff changeset
97 added 1 commits with 1 trees and 1 blobs
592
a6b7ad535244 push: provide better output about changed references (issue #64)
David M. Carr <david@carrclan.us>
parents: 591
diff changeset
98 updating reference refs/heads/master
207
c06ac5b982a9 add a test for pushing to git
Abderrahim Kitouni <a.kitouni@gmail.com>
parents:
diff changeset
99
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
100 $ hg log --graph | egrep -v ': *(not-master|master)'
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
101 @ changeset: 8:c5d1976ab12c
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
102 | tag: default/master
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
103 | tag: tip
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
104 | user: test >test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
105 | date: Mon Jan 01 00:00:18 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
106 | summary: add theta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
107 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
108 o changeset: 7:0e2fb4d21667
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
109 | user: test < test@example.com >
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
110 | date: Mon Jan 01 00:00:17 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
111 | summary: add eta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
112 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
113 o changeset: 6:faa3aae96199
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
114 | user: test
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
115 | date: Mon Jan 01 00:00:16 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
116 | summary: add zeta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
117 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
118 o changeset: 5:2cf6ad5a1afc
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
119 | user: name <test@example.com
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
120 | date: Mon Jan 01 00:00:15 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
121 | summary: add epsilon
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
122 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
123 o changeset: 4:3131b2a71396
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
124 | user: name<test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
125 | date: Mon Jan 01 00:00:14 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
126 | summary: add delta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
127 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
128 o changeset: 3:6b854d65d0d6
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
129 | user: <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
130 | date: Mon Jan 01 00:00:13 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
131 | summary: add gamma
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
132 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
133 o changeset: 2:46303c652e79
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
134 | user: test <test@example.com> (comment)
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
135 | date: Mon Jan 01 00:00:12 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
136 | summary: modify beta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
137 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
138 o changeset: 1:47580592d3d6
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
139 | user: test
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
140 | date: Mon Jan 01 00:00:11 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
141 | summary: add beta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
142 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
143 o changeset: 0:ff7a2f2d8d70
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
144 tag: default/not-master
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
145 user: test <test@example.org>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
146 date: Mon Jan 01 00:00:10 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
147 summary: add alpha
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
148
432
ccd38138a3b3 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand
Ehsan Akhgari <ehsan.akhgari@gmail.com>
parents: 390
diff changeset
149
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
150 $ cd ..
529
7edcbdd2ef2f tests: eliminate use of git-daemon
David M. Carr <david@carrclan.us>
parents: 528
diff changeset
151 $ hg clone gitrepo hgrepo2 | grep -v '^updating'
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
152 importing git objects into hg
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
153 8 files updated, 0 files merged, 0 files removed, 0 files unresolved
580
6cc99298b69e tests: avoid changing the current directory
David M. Carr <david@carrclan.us>
parents: 579
diff changeset
154 $ hg -R hgrepo2 log --graph | egrep -v ': *(not-master|master)'
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
155 @ changeset: 8:1fbf3aa91221
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
156 | tag: default/master
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
157 | tag: tip
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
158 | user: test ?test@example.com <test ?test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
159 | date: Mon Jan 01 00:00:18 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
160 | summary: add theta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
161 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
162 o changeset: 7:20310508f06d
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
163 | user: test <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
164 | date: Mon Jan 01 00:00:17 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
165 | summary: add eta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
166 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
167 o changeset: 6:e3d81af8a8c1
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
168 | user: test
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
169 | date: Mon Jan 01 00:00:16 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
170 | summary: add zeta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
171 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
172 o changeset: 5:78f609fd208f
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
173 | user: name <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
174 | date: Mon Jan 01 00:00:15 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
175 | summary: add epsilon
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
176 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
177 o changeset: 4:42fa61d57718
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
178 | user: name <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
179 | date: Mon Jan 01 00:00:14 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
180 | summary: add delta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
181 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
182 o changeset: 3:6b854d65d0d6
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
183 | user: <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
184 | date: Mon Jan 01 00:00:13 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
185 | summary: add gamma
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
186 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
187 o changeset: 2:46303c652e79
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
188 | user: test <test@example.com> (comment)
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
189 | date: Mon Jan 01 00:00:12 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
190 | summary: modify beta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
191 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
192 o changeset: 1:47580592d3d6
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
193 | user: test
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
194 | date: Mon Jan 01 00:00:11 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
195 | summary: add beta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
196 |
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
197 o changeset: 0:ff7a2f2d8d70
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
198 tag: default/not-master
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
199 user: test <test@example.org>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
200 date: Mon Jan 01 00:00:10 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
201 summary: add alpha
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
202
580
6cc99298b69e tests: avoid changing the current directory
David M. Carr <david@carrclan.us>
parents: 579
diff changeset
203 $ git --git-dir=gitrepo/.git log --pretty=medium master
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
204 commit 2fe60ba69727981e6ede78be70354c3a9e30e21d
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
205 Author: test ?test@example.com <test ?test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
206 Date: Mon Jan 1 00:00:18 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
207
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
208 add theta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
209
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
210 commit 9f2f7cafdbf2e467928db98de8275141001d3081
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
211 Author: test <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
212 Date: Mon Jan 1 00:00:17 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
213
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
214 add eta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
215
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
216 commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
217 Author: test <none@none>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
218 Date: Mon Jan 1 00:00:16 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
219
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
220 add zeta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
221
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
222 commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
223 Author: name <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
224 Date: Mon Jan 1 00:00:15 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
225
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
226 add epsilon
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
227
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
228 commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
229 Author: name <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
230 Date: Mon Jan 1 00:00:14 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
231
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
232 add delta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
233
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
234 commit e4149a32e81e380193f59aa8773349201b8ed7f7
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
235 Author: <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
236 Date: Mon Jan 1 00:00:13 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
237
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
238 add gamma
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
239
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
240 commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
241 Author: test ext:(%20%28comment%29) <test@example.com>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
242 Date: Mon Jan 1 00:00:12 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
243
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
244 modify beta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
245
844
fffe8883960b git_handler: mark source for rename info as Git or Mercurial
Siddharth Agarwal <sid0@fb.com>
parents: 729
diff changeset
246 commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001
504
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
247 Author: test <none@none>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
248 Date: Mon Jan 1 00:00:11 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
249
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
250 add beta
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
251
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
252 commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
253 Author: test <test@example.org>
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
254 Date: Mon Jan 1 00:00:10 2007 +0000
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
255
5ee5f768f22e tests: unify test-hg-author
David M. Carr <david@carrclan.us>
parents: 448
diff changeset
256 add alpha