diff --git a/tests/test-mq-header-date.t b/tests/test-mq-header-date.t --- a/tests/test-mq-header-date.t +++ b/tests/test-mq-header-date.t @@ -11,11 +11,11 @@ > } $ catlog() { > catpatch $1 - > hg log --template "{rev}: {desc} - {author}\n" + > hg log --template "{rev}: {node|short} {desc} - {author}\n" > } $ catlogd() { > catpatch $1 - > hg log --template "{rev}: {desc} - {author} - {date}\n" + > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n" > } $ drop() { > hg qpop @@ -189,7 +189,7 @@ > echo ==== "qpop -a / qpush -a" > hg qpop -a > hg qpush -a - > hg log --template "{rev}: {desc} - {author} - {date}\n" + > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n" > } ======= plain headers @@ -202,7 +202,7 @@ ==== qnew -d Date: 3 0 - 0: [mq]: 1.patch - test - 3.00 + 0: 758bd2596a39 [mq]: 1.patch - test - 3.00 ==== qref adding 1 Date: 3 0 @@ -212,7 +212,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - test - 3.00 + 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00 ==== qref -d Date: 4 0 @@ -221,7 +221,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - test - 4.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 2 diff -r ... 2 @@ -229,8 +229,8 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - test - 0: [mq]: 1.patch - test + 1: fc7e8a2f6499 [mq]: 2.patch - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -d Date: 5 0 @@ -239,8 +239,8 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - test - 0: [mq]: 1.patch - test + 1: 1d9a6a118fd1 [mq]: 2.patch - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 2.patch now at: 1.patch ==== qnew -d -m @@ -248,8 +248,8 @@ Three - 1: Three - test - 6.00 - 0: [mq]: 1.patch - test - 4.00 + 1: 2a9ef0bdefba Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref adding 3 Date: 6 0 @@ -261,8 +261,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Three - test - 6.00 - 0: [mq]: 1.patch - test - 4.00 + 1: 7f19ad9eea7b Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -m Date: 6 0 @@ -273,8 +273,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Drei - test - 6.00 - 0: [mq]: 1.patch - test - 4.00 + 1: 7ff7377793e3 Drei - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d Date: 7 0 @@ -285,8 +285,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Drei - test - 7.00 - 0: [mq]: 1.patch - test - 4.00 + 1: d89d3144f518 Drei - test - 7.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d -m Date: 8 0 @@ -297,8 +297,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew -m adding 4 Four @@ -308,9 +308,9 @@ +++ b/4 @@ -0,0 +1,1 @@ +4 - 2: Four - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 2: 74ded07d166b Four - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -d Date: 9 0 @@ -321,9 +321,9 @@ +++ b/4 @@ -0,0 +1,1 @@ +4 - 2: Four - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 2: 1a651320cf8e Four - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 4.patch now at: 3.patch ==== qnew with HG header @@ -331,9 +331,9 @@ now at: 3.patch # HG changeset patch # Date 10 0 - 2: imported patch 5.patch - test - 10.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 2: d16a272220d2 imported patch 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref adding 5 # HG changeset patch @@ -345,9 +345,9 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: [mq]: 5.patch - test - 10.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d # HG changeset patch # Date 11 0 @@ -358,19 +358,19 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew with plain header popping 6.patch now at: 5.patch now at: 6.patch Date: 12 0 - 3: imported patch 6.patch - test - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: 8ad9ebc22b96 imported patch 6.patch - test + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== hg qref adding 6 Date: 12 0 @@ -380,10 +380,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - test - 12.00 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 3: 038c46b02a56 [mq]: 6.patch - test - 12.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d Date: 13 0 @@ -392,10 +392,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - test - 13.00 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 popping 6.patch now at: 5.patch ==== qnew -u @@ -407,10 +407,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - jane - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: a05a33f187ce [mq]: 6.patch - jane + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -d From: jane Date: 12 0 @@ -420,10 +420,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - jane - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: 5702c529dfe9 [mq]: 6.patch - jane + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 6.patch now at: 5.patch ==== qnew -d @@ -435,10 +435,10 @@ +++ b/7 @@ -0,0 +1,1 @@ +7 - 3: [mq]: 7.patch - test - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: 8dd1eb8d4132 [mq]: 7.patch - test + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -u From: john Date: 13 0 @@ -448,10 +448,10 @@ +++ b/7 @@ -0,0 +1,1 @@ +7 - 3: [mq]: 7.patch - john - 13.00 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 8 diff -r ... 8 @@ -459,11 +459,11 @@ +++ b/8 @@ -0,0 +1,1 @@ +8 - 4: [mq]: 8.patch - test - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: 868b62f09492 [mq]: 8.patch - test + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -u -d From: john Date: 14 0 @@ -473,11 +473,11 @@ +++ b/8 @@ -0,0 +1,1 @@ +8 - 4: [mq]: 8.patch - john - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: b1e878ae55b9 [mq]: 8.patch - john + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 8.patch now at: 7.patch ==== qnew -m @@ -489,11 +489,11 @@ +++ b/9 @@ -0,0 +1,1 @@ +9 - 4: Nine - test - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: 7251936ac2bf Nine - test + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -u -d From: john Date: 15 0 @@ -505,11 +505,11 @@ +++ b/9 @@ -0,0 +1,1 @@ +9 - 4: Nine - john - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: a0de5bf6e9f7 Nine - john + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 9.patch now at: 7.patch ==== qpop -a / qpush -a @@ -523,10 +523,10 @@ applying 5.patch applying 7.patch now at: 7.patch - 3: imported patch 7.patch - john - 13.00 - 2: imported patch 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: imported patch 1.patch - test - 4.00 + 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00 + 2: dda6cf77060a imported patch 5.patch - test - 11.00 + 1: 25e32d66c8c7 Three (again) - test - 8.00 + 0: e5011c0211fe imported patch 1.patch - test - 4.00 $ rm -r sandbox ======= hg headers @@ -540,7 +540,7 @@ # Date 3 0 # Parent - 0: [mq]: 1.patch - test - 3.00 + 0: 758bd2596a39 [mq]: 1.patch - test - 3.00 ==== qref adding 1 # HG changeset patch @@ -552,7 +552,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - test - 3.00 + 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00 ==== qref -d # HG changeset patch # Date 4 0 @@ -563,7 +563,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - test - 4.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 2 # HG changeset patch @@ -574,8 +574,8 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - test - 0: [mq]: 1.patch - test + 1: fc7e8a2f6499 [mq]: 2.patch - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -d # HG changeset patch # Date 5 0 @@ -586,8 +586,8 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - test - 0: [mq]: 1.patch - test + 1: 1d9a6a118fd1 [mq]: 2.patch - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 2.patch now at: 1.patch ==== qnew -d -m @@ -596,8 +596,8 @@ # Parent Three - 1: Three - test - 6.00 - 0: [mq]: 1.patch - test - 4.00 + 1: 2a9ef0bdefba Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref adding 3 # HG changeset patch @@ -610,8 +610,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Three - test - 6.00 - 0: [mq]: 1.patch - test - 4.00 + 1: 7f19ad9eea7b Three - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -m # HG changeset patch # Date 6 0 @@ -623,8 +623,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Drei - test - 6.00 - 0: [mq]: 1.patch - test - 4.00 + 1: 7ff7377793e3 Drei - test - 6.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d # HG changeset patch # Date 7 0 @@ -636,8 +636,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Drei - test - 7.00 - 0: [mq]: 1.patch - test - 4.00 + 1: d89d3144f518 Drei - test - 7.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qref -d -m # HG changeset patch # Date 8 0 @@ -649,8 +649,8 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew -m adding 4 # HG changeset patch @@ -662,9 +662,9 @@ +++ b/4 @@ -0,0 +1,1 @@ +4 - 2: Four - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 2: 74ded07d166b Four - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -d # HG changeset patch # Date 9 0 @@ -676,9 +676,9 @@ +++ b/4 @@ -0,0 +1,1 @@ +4 - 2: Four - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 2: 1a651320cf8e Four - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 4.patch now at: 3.patch ==== qnew with HG header @@ -686,9 +686,9 @@ now at: 3.patch # HG changeset patch # Date 10 0 - 2: imported patch 5.patch - test - 10.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 2: d16a272220d2 imported patch 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref adding 5 # HG changeset patch @@ -700,9 +700,9 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: [mq]: 5.patch - test - 10.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d # HG changeset patch # Date 11 0 @@ -713,19 +713,19 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew with plain header popping 6.patch now at: 5.patch now at: 6.patch Date: 12 0 - 3: imported patch 6.patch - test - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: 8ad9ebc22b96 imported patch 6.patch - test + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== hg qref adding 6 Date: 12 0 @@ -735,10 +735,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - test - 12.00 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 3: 038c46b02a56 [mq]: 6.patch - test - 12.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== hg qref -d Date: 13 0 @@ -747,10 +747,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - test - 13.00 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 popping 6.patch now at: 5.patch ==== qnew -u @@ -764,10 +764,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - jane - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: a05a33f187ce [mq]: 6.patch - jane + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -d # HG changeset patch # User jane @@ -779,10 +779,10 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 3: [mq]: 6.patch - jane - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: 5702c529dfe9 [mq]: 6.patch - jane + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 6.patch now at: 5.patch ==== qnew -d @@ -796,10 +796,10 @@ +++ b/7 @@ -0,0 +1,1 @@ +7 - 3: [mq]: 7.patch - test - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 3: 8dd1eb8d4132 [mq]: 7.patch - test + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -u # HG changeset patch # User john @@ -811,10 +811,10 @@ +++ b/7 @@ -0,0 +1,1 @@ +7 - 3: [mq]: 7.patch - john - 13.00 - 2: [mq]: 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: [mq]: 1.patch - test - 4.00 + 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00 + 2: 049de6af0c1d [mq]: 5.patch - test - 11.00 + 1: b1b6b0fe0e6d Three (again) - test - 8.00 + 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00 ==== qnew adding 8 # HG changeset patch @@ -825,11 +825,11 @@ +++ b/8 @@ -0,0 +1,1 @@ +8 - 4: [mq]: 8.patch - test - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: 868b62f09492 [mq]: 8.patch - test + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -u -d # HG changeset patch # User john @@ -841,11 +841,11 @@ +++ b/8 @@ -0,0 +1,1 @@ +8 - 4: [mq]: 8.patch - john - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: b1e878ae55b9 [mq]: 8.patch - john + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 8.patch now at: 7.patch ==== qnew -m @@ -859,11 +859,11 @@ +++ b/9 @@ -0,0 +1,1 @@ +9 - 4: Nine - test - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: 7251936ac2bf Nine - test + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test ==== qref -u -d # HG changeset patch # User john @@ -876,11 +876,11 @@ +++ b/9 @@ -0,0 +1,1 @@ +9 - 4: Nine - john - 3: [mq]: 7.patch - john - 2: [mq]: 5.patch - test - 1: Three (again) - test - 0: [mq]: 1.patch - test + 4: a0de5bf6e9f7 Nine - john + 3: 4f9d07369cc4 [mq]: 7.patch - john + 2: 049de6af0c1d [mq]: 5.patch - test + 1: b1b6b0fe0e6d Three (again) - test + 0: 4a67dfeea974 [mq]: 1.patch - test popping 9.patch now at: 7.patch ==== qpop -a / qpush -a @@ -894,8 +894,8 @@ applying 5.patch applying 7.patch now at: 7.patch - 3: imported patch 7.patch - john - 13.00 - 2: imported patch 5.patch - test - 11.00 - 1: Three (again) - test - 8.00 - 0: imported patch 1.patch - test - 4.00 + 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00 + 2: dda6cf77060a imported patch 5.patch - test - 11.00 + 1: 25e32d66c8c7 Three (again) - test - 8.00 + 0: e5011c0211fe imported patch 1.patch - test - 4.00 $ rm -r sandbox diff --git a/tests/test-mq-header-from.t b/tests/test-mq-header-from.t --- a/tests/test-mq-header-from.t +++ b/tests/test-mq-header-from.t @@ -6,7 +6,7 @@ $ catlog() { > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ > -e "s/^\(# Parent \).*/\1/" - > hg log --template "{rev}: {desc} - {author}\n" + > hg log --template "{rev}: {node|short} {desc} - {author}\n" > } $ runtest() { > echo ==== init @@ -122,7 +122,7 @@ > echo ==== "qpop -a / qpush -a" > hg qpop -a > hg qpush -a - > hg log --template "{rev}: {desc} - {author}\n" + > hg log --template "{rev}: {node|short} {desc} - {author}\n" > } ======= plain headers @@ -135,7 +135,7 @@ ==== qnew -U From: test - 0: [mq]: 1.patch - test + 0: a054644889e5 [mq]: 1.patch - test ==== qref adding 1 From: test @@ -145,7 +145,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - test + 0: 2905f1e46ee0 [mq]: 1.patch - test ==== qref -u From: mary @@ -154,7 +154,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - mary + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew adding 2 diff -r ... 2 @@ -162,8 +162,8 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - test - 0: [mq]: 1.patch - mary + 1: 527f98a12a7a [mq]: 2.patch - test + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u From: jane @@ -172,16 +172,16 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew -U -m From: test Three - 2: Three - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: 0ffa16a9088e Three - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref adding 3 From: test @@ -193,9 +193,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Three - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: 83f1290c6086 Three - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -m From: test @@ -206,9 +206,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Drei - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: b0d856328d4d Drei - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u From: mary @@ -219,9 +219,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Drei - mary - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: bb9d4b28e6a6 Drei - mary + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u -m From: maria @@ -232,9 +232,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew -m adding 4of Four @@ -244,10 +244,10 @@ +++ b/4of @@ -0,0 +1,1 @@ +4 t - 3: Four - test - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 3: b9f922d0da40 Four - test + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u From: jane @@ -258,21 +258,21 @@ +++ b/4of @@ -0,0 +1,1 @@ +4 t - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew with HG header popping 5.patch now at: 4.patch now at: 5.patch # HG changeset patch # User johndoe - 4: imported patch 5.patch - johndoe - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: 72bc4a0467ef imported patch 5.patch - johndoe + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref adding 5 # HG changeset patch @@ -284,11 +284,11 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - johndoe - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: ff5c06112e5a [mq]: 5.patch - johndoe + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -U # HG changeset patch # User test @@ -299,11 +299,11 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - test - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: c947416c22b1 [mq]: 5.patch - test + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -u # HG changeset patch # User johndeere @@ -314,23 +314,23 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew with plain header popping 6.patch now at: 5.patch now at: 6.patch From: test - 5: imported patch 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 7825a18ec839 imported patch 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref adding 6 From: test @@ -340,12 +340,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 09d19592680d [mq]: 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -U From: test @@ -354,12 +354,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 09d19592680d [mq]: 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -u From: johndeere @@ -368,12 +368,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - johndeere - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 32641ee07196 [mq]: 6.patch - johndeere + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qpop -a / qpush -a popping 6.patch popping 5.patch @@ -389,12 +389,12 @@ applying 5.patch applying 6.patch now at: 6.patch - 5: imported patch 6.patch - johndeere - 4: imported patch 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: imported patch 2.patch - jane - 0: imported patch 1.patch - mary + 5: 1fb083c80457 imported patch 6.patch - johndeere + 4: 7e96e969691d imported patch 5.patch - johndeere + 3: c7147533d3cd Four - jane + 2: b383d04401ea Three (again) - maria + 1: fac2da4efc3c imported patch 2.patch - jane + 0: b6e237e8771b imported patch 1.patch - mary $ rm -r sandbox ======= hg headers @@ -408,7 +408,7 @@ # User test # Parent - 0: [mq]: 1.patch - test + 0: a054644889e5 [mq]: 1.patch - test ==== qref adding 1 # HG changeset patch @@ -420,7 +420,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - test + 0: 2905f1e46ee0 [mq]: 1.patch - test ==== qref -u # HG changeset patch # User mary @@ -431,7 +431,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - mary + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew adding 2 # HG changeset patch @@ -442,8 +442,8 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - test - 0: [mq]: 1.patch - mary + 1: 527f98a12a7a [mq]: 2.patch - test + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u # HG changeset patch # User jane @@ -454,17 +454,17 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew -U -m # HG changeset patch # User test # Parent Three - 2: Three - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: 0ffa16a9088e Three - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref adding 3 # HG changeset patch @@ -477,9 +477,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Three - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: 83f1290c6086 Three - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -m # HG changeset patch # User test @@ -491,9 +491,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Drei - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: b0d856328d4d Drei - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u # HG changeset patch # User mary @@ -505,9 +505,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Drei - mary - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: bb9d4b28e6a6 Drei - mary + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u -m # HG changeset patch # User maria @@ -519,9 +519,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew -m adding 4of # HG changeset patch @@ -533,10 +533,10 @@ +++ b/4of @@ -0,0 +1,1 @@ +4 t - 3: Four - test - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 3: b9f922d0da40 Four - test + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u # HG changeset patch # User jane @@ -548,21 +548,21 @@ +++ b/4of @@ -0,0 +1,1 @@ +4 t - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew with HG header popping 5.patch now at: 4.patch now at: 5.patch # HG changeset patch # User johndoe - 4: imported patch 5.patch - johndoe - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: 72bc4a0467ef imported patch 5.patch - johndoe + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref adding 5 # HG changeset patch @@ -574,11 +574,11 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - johndoe - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: ff5c06112e5a [mq]: 5.patch - johndoe + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -U # HG changeset patch # User test @@ -589,11 +589,11 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - test - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: c947416c22b1 [mq]: 5.patch - test + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -u # HG changeset patch # User johndeere @@ -604,23 +604,23 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew with plain header popping 6.patch now at: 5.patch now at: 6.patch From: test - 5: imported patch 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 7825a18ec839 imported patch 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref adding 6 From: test @@ -630,12 +630,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 09d19592680d [mq]: 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -U From: test @@ -644,12 +644,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 09d19592680d [mq]: 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -u From: johndeere @@ -658,12 +658,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - johndeere - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 32641ee07196 [mq]: 6.patch - johndeere + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qpop -a / qpush -a popping 6.patch popping 5.patch @@ -679,12 +679,12 @@ applying 5.patch applying 6.patch now at: 6.patch - 5: imported patch 6.patch - johndeere - 4: imported patch 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: imported patch 2.patch - jane - 0: imported patch 1.patch - mary + 5: 1fb083c80457 imported patch 6.patch - johndeere + 4: 7e96e969691d imported patch 5.patch - johndeere + 3: c7147533d3cd Four - jane + 2: b383d04401ea Three (again) - maria + 1: fac2da4efc3c imported patch 2.patch - jane + 0: b6e237e8771b imported patch 1.patch - mary $ rm -r sandbox $ runtest ==== init @@ -693,7 +693,7 @@ # User test # Parent - 0: [mq]: 1.patch - test + 0: a054644889e5 [mq]: 1.patch - test ==== qref adding 1 # HG changeset patch @@ -705,7 +705,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - test + 0: 2905f1e46ee0 [mq]: 1.patch - test ==== qref -u # HG changeset patch # User mary @@ -716,7 +716,7 @@ +++ b/1 @@ -0,0 +1,1 @@ +1 - 0: [mq]: 1.patch - mary + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew adding 2 # HG changeset patch @@ -727,8 +727,8 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - test - 0: [mq]: 1.patch - mary + 1: 527f98a12a7a [mq]: 2.patch - test + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u # HG changeset patch # User jane @@ -739,17 +739,17 @@ +++ b/2 @@ -0,0 +1,1 @@ +2 - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew -U -m # HG changeset patch # User test # Parent Three - 2: Three - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: 0ffa16a9088e Three - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref adding 3 # HG changeset patch @@ -762,9 +762,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Three - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: 83f1290c6086 Three - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -m # HG changeset patch # User test @@ -776,9 +776,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Drei - test - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: b0d856328d4d Drei - test + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u # HG changeset patch # User mary @@ -790,9 +790,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Drei - mary - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: bb9d4b28e6a6 Drei - mary + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u -m # HG changeset patch # User maria @@ -804,9 +804,9 @@ +++ b/3 @@ -0,0 +1,1 @@ +3 - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew -m adding 4of # HG changeset patch @@ -818,10 +818,10 @@ +++ b/4of @@ -0,0 +1,1 @@ +4 t - 3: Four - test - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 3: b9f922d0da40 Four - test + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qref -u # HG changeset patch # User jane @@ -833,21 +833,21 @@ +++ b/4of @@ -0,0 +1,1 @@ +4 t - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew with HG header popping 5.patch now at: 4.patch now at: 5.patch # HG changeset patch # User johndoe - 4: imported patch 5.patch - johndoe - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: 72bc4a0467ef imported patch 5.patch - johndoe + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref adding 5 # HG changeset patch @@ -859,11 +859,11 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - johndoe - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: ff5c06112e5a [mq]: 5.patch - johndoe + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -U # HG changeset patch # User test @@ -874,11 +874,11 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - test - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: c947416c22b1 [mq]: 5.patch - test + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -u # HG changeset patch # User johndeere @@ -889,23 +889,23 @@ +++ b/5 @@ -0,0 +1,1 @@ +5 - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qnew with plain header popping 6.patch now at: 5.patch now at: 6.patch From: test - 5: imported patch 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 7825a18ec839 imported patch 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref adding 6 From: test @@ -915,12 +915,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 09d19592680d [mq]: 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -U From: test @@ -929,12 +929,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - test - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 09d19592680d [mq]: 6.patch - test + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== hg qref -u From: johndeere @@ -943,12 +943,12 @@ +++ b/6 @@ -0,0 +1,1 @@ +6 - 5: [mq]: 6.patch - johndeere - 4: [mq]: 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: [mq]: 2.patch - jane - 0: [mq]: 1.patch - mary + 5: 32641ee07196 [mq]: 6.patch - johndeere + 4: 1d898e201a22 [mq]: 5.patch - johndeere + 3: 0dfb3111e7ee Four - jane + 2: a6686ee84fc3 Three (again) - maria + 1: a425cde5f493 [mq]: 2.patch - jane + 0: 3682f830e656 [mq]: 1.patch - mary ==== qpop -a / qpush -a popping 6.patch popping 5.patch @@ -964,11 +964,11 @@ applying 5.patch applying 6.patch now at: 6.patch - 5: imported patch 6.patch - johndeere - 4: imported patch 5.patch - johndeere - 3: Four - jane - 2: Three (again) - maria - 1: imported patch 2.patch - jane - 0: imported patch 1.patch - mary + 5: 1fb083c80457 imported patch 6.patch - johndeere + 4: 7e96e969691d imported patch 5.patch - johndeere + 3: c7147533d3cd Four - jane + 2: b383d04401ea Three (again) - maria + 1: fac2da4efc3c imported patch 2.patch - jane + 0: b6e237e8771b imported patch 1.patch - mary $ cd .. diff --git a/tests/test-mq-pull-from-bundle.t b/tests/test-mq-pull-from-bundle.t --- a/tests/test-mq-pull-from-bundle.t +++ b/tests/test-mq-pull-from-bundle.t @@ -2,7 +2,7 @@ > [extensions] > mq= > [alias] - > tlog = log --template "{rev}: {desc}\\n" + > tlog = log --template "{rev}: {node|short} {desc}\\n" > theads = heads --template "{rev}: {desc}\\n" > tincoming = incoming --template "{rev}: {desc}\\n" > EOF @@ -97,7 +97,7 @@ 0: queue: two.patch added $ hg -R .hg/patches tlog - 0: queue: two.patch added + 0: d7553909353d queue: two.patch added $ hg qseries two.patch @@ -128,7 +128,7 @@ 0: queue: two.patch added $ hg -R .hg/patches tlog - 0: queue: two.patch added + 0: d7553909353d queue: two.patch added $ hg qseries two.patch diff --git a/tests/test-rebase-base-flag.t b/tests/test-rebase-base-flag.t --- a/tests/test-rebase-base-flag.t +++ b/tests/test-rebase-base-flag.t @@ -10,7 +10,7 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: {desc}" + > tglog = log -G --template "{rev}: {node|short} {desc}" > EOF $ rebasewithdag() { @@ -39,19 +39,19 @@ rebasing 3:d6003a550c2c "C" (C) rebasing 5:4526cf523425 "D" (D) rebasing 6:b296604d9846 "E" (E tip) - o 6: E + o 6: 4870f5e7df37 E | - | o 5: D + | o 5: dc999528138a D |/ - o 4: C + o 4: 6b3e11729672 C | - o 3: Z + o 3: 57e70bad1ea3 Z | - | o 2: B + | o 2: c1e6b162678d B |/ - o 1: A + o 1: 21a6c4502885 A | - o 0: R + o 0: b41ce7760717 R Multiple branching points caused by selecting a single merge changeset: @@ -69,19 +69,19 @@ rebasing 2:c1e6b162678d "B" (B) rebasing 3:d6003a550c2c "C" (C) rebasing 6:54c8f00cb91c "E" (E tip) - o 6: E + o 6: 00598421b616 E |\ - | o 5: C + | o 5: 6b3e11729672 C | | - o | 4: B + o | 4: 85260910e847 B |/ - o 3: Z + o 3: 57e70bad1ea3 Z | - | o 2: D + | o 2: 8924700906fe D |/ - o 1: A + o 1: 21a6c4502885 A | - o 0: R + o 0: b41ce7760717 R Rebase should not extend the "--base" revset using "descendants": @@ -96,17 +96,17 @@ > EOS rebasing 2:c1e6b162678d "B" (B) rebasing 5:54c8f00cb91c "E" (E tip) - o 5: E + o 5: e583bf3ff54c E |\ - | o 4: B + | o 4: 85260910e847 B | | - | o 3: Z + | o 3: 57e70bad1ea3 Z | | - o | 2: C + o | 2: d6003a550c2c C |/ - o 1: A + o 1: 21a6c4502885 A | - o 0: R + o 0: b41ce7760717 R Rebase should not simplify the "--base" revset using "roots": @@ -122,17 +122,17 @@ rebasing 2:c1e6b162678d "B" (B) rebasing 3:d6003a550c2c "C" (C) rebasing 5:54c8f00cb91c "E" (E tip) - o 5: E + o 5: 00598421b616 E |\ - | o 4: C + | o 4: 6b3e11729672 C | | - o | 3: B + o | 3: 85260910e847 B |/ - o 2: Z + o 2: 57e70bad1ea3 Z | - o 1: A + o 1: 21a6c4502885 A | - o 0: R + o 0: b41ce7760717 R The destination is one of the two branching points of a merge: @@ -173,31 +173,31 @@ rebasing 8:781512f5e33d "C2" (C2) rebasing 9:428d8c18f641 "E1" (E1) rebasing 11:e1bf82f6b6df "E2" (E2) - o 12: E2 + o 12: e4a37b6fdbd2 E2 | - o 11: E1 + o 11: 9675bea983df E1 | - | o 10: C2 + | o 10: 4faf5d4c80dc C2 | | - | o 9: C1 + | o 9: d4799b1ad57d C1 |/ - | o 8: B2 + | o 8: 772732dc64d6 B2 | | - | o 7: B1 + | o 7: ad3ac528a49f B1 |/ - o 6: Z + o 6: 2cbdfca6b9d5 Z | - o 5: F + o 5: fcdb3293ec13 F | - o 4: E + o 4: a4652bb8ac54 E | - o 3: C + o 3: bd5548558fcf C | - o 2: B + o 2: c1e6b162678d B | - o 1: A + o 1: 21a6c4502885 A | - o 0: R + o 0: b41ce7760717 R Multiple branching points with multiple merges: @@ -223,37 +223,37 @@ rebasing 11:d1f6d0c3c7e4 "M" (M) rebasing 12:7aaec6f81888 "N" (N) rebasing 15:325bc8f1760d "P" (P tip) - o 15: P + o 15: 6ef6a0ea3b18 P |\ - | o 14: N + | o 14: 20ba3610a7e5 N | |\ - o \ \ 13: M + o \ \ 13: cd4f6c06d2ab M |\ \ \ - | | | o 12: L + | | | o 12: bca872041455 L | | | | - | | o | 11: K + | | o | 11: 7bbb6c8a6ad7 K | | |/ - | o / 10: J + | o / 10: de0cbffe893e J | |/ - o / 9: I + o / 9: 0e710f176a88 I |/ - | o 8: H + | o 8: 52507bab39ca H | |\ - | | | o 7: G + | | | o 7: bb5fe4652f0d G | | |/| - | | | o 6: F + | | | o 6: f4ad4b31daf4 F | | | | - | | o | 5: E + | | o | 5: b168f85f2e78 E | | |/ - | o | 4: D + | o | 4: 8d09fcdb5594 D | |\| - +---o 3: C + +---o 3: ab70b4c5a9c9 C | | - o | 2: Z + o | 2: 262e37e34f63 Z | | - | o 1: B + | o 1: 112478962961 B |/ - o 0: A + o 0: 426bada5c675 A Slightly more complex merge case (mentioned in https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-November/091074.html): @@ -275,31 +275,31 @@ rebasing 11:4e449bd1a643 "A3" (A3) rebasing 10:0a33b0519128 "B1" (B1) rebasing 12:209327807c3a "B3" (B3 tip) - o 12: B3 + o 12: ceb984566332 B3 |\ - | o 11: B1 + | o 11: 19d93caac497 B1 | | - | | o 10: A3 + | | o 10: 058e73d3916b A3 | | |\ - | +---o 9: A2 + | +---o 9: 0ba13ad72234 A2 | | | - | o | 8: C1 + | o | 8: c122c2af10c6 C1 | | | - o | | 7: B2 + o | | 7: 74275896650e B2 | | | - | o | 6: C0 + | o | 6: 455ba9bd3ea2 C0 |/ / - o | 5: Z + o | 5: b3d7d2fda53b Z | | - o | 4: M3 + o | 4: 182ab6383dd7 M3 | | - o | 3: M2 + o | 3: 6c3f73563d5f M2 | | - | o 2: A1 + | o 2: 88c860fffcc2 A1 |/ - o 1: M1 + o 1: bc852baa85dd M1 | - o 0: M0 + o 0: dbdfc5c9bcd5 M0 Disconnected graph: @@ -320,15 +320,15 @@ > EOF rebasing 2:112478962961 "B" (B) rebasing 3:b70f76719894 "D" (D) - o 4: D + o 4: 511efad7bf13 D | - | o 3: B + | o 3: 25c4e279af62 B |/ - o 2: Z + o 2: 3a49f54d7bb1 Z |\ - | o 1: C + | o 1: 96cc3511f894 C | - o 0: A + o 0: 426bada5c675 A Multiple roots. One root is not an ancestor of dest: @@ -351,17 +351,17 @@ > EOF rebasing 2:f675d5a1c6a4 "B" (B) rebasing 5:f68696fe6af8 "E" (E tip) - o 5: E + o 5: f6e6f5081554 E |\ - | o 4: B + | o 4: 30cabcba27be B | |\ - | | o 3: Z + | | o 3: 262e37e34f63 Z | | | - o | | 2: D + o | | 2: b70f76719894 D |/ / - o / 1: C + o / 1: 96cc3511f894 C / - o 0: A + o 0: 426bada5c675 A Multiple roots. Two children share two parents while dest has only one parent: @@ -372,13 +372,13 @@ > EOF rebasing 2:f675d5a1c6a4 "B" (B) rebasing 3:c2a779e13b56 "D" (D) - o 4: D + o 4: 5eecd056b5f8 D |\ - +---o 3: B + +---o 3: 30cabcba27be B | |/ - | o 2: Z + | o 2: 262e37e34f63 Z | | - o | 1: C + o | 1: 96cc3511f894 C / - o 0: A + o 0: 426bada5c675 A diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t --- a/tests/test-rebase-bookmarks.t +++ b/tests/test-rebase-bookmarks.t @@ -7,7 +7,7 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n" > EOF Create a repo with several bookmarks @@ -39,13 +39,13 @@ $ hg book W $ hg tglog - @ 3: 'D' bookmarks: W + @ 3: 41acb9dca9eb 'D' bookmarks: W | - | o 2: 'C' bookmarks: Y Z + | o 2: 49cb3485fa0c 'C' bookmarks: Y Z | | - | o 1: 'B' bookmarks: X + | o 1: 6c81ed0049f8 'B' bookmarks: X |/ - o 0: 'A' bookmarks: + o 0: 1994f17a630e 'A' bookmarks: Move only rebased bookmarks @@ -66,26 +66,26 @@ $ hg book -r 0 Y@diverge $ hg tglog - o 3: 'D' bookmarks: W X@diverge Z@diverge + o 3: 41acb9dca9eb 'D' bookmarks: W X@diverge Z@diverge | - | @ 2: 'C' bookmarks: Y Z + | @ 2: 49cb3485fa0c 'C' bookmarks: Y Z | | - | o 1: 'B' bookmarks: X + | o 1: 6c81ed0049f8 'B' bookmarks: X |/ - o 0: 'A' bookmarks: Y@diverge + o 0: 1994f17a630e 'A' bookmarks: Y@diverge $ hg rebase -s Y -d 3 rebasing 2:49cb3485fa0c "C" (Y Z) saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob) $ hg tglog - @ 3: 'C' bookmarks: Y Z + @ 3: 17fb3faba63c 'C' bookmarks: Y Z | - o 2: 'D' bookmarks: W X@diverge + o 2: 41acb9dca9eb 'D' bookmarks: W X@diverge | - | o 1: 'B' bookmarks: X + | o 1: 6c81ed0049f8 'B' bookmarks: X |/ - o 0: 'A' bookmarks: Y@diverge + o 0: 1994f17a630e 'A' bookmarks: Y@diverge Do not try to keep active but deleted divergent bookmark @@ -120,13 +120,13 @@ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) $ hg tglog - @ 3: 'C' bookmarks: Y Z + @ 3: 3d5fa227f4b5 'C' bookmarks: Y Z | - o 2: 'B' bookmarks: X + o 2: e926fccfa8ec 'B' bookmarks: X | - o 1: 'D' bookmarks: W + o 1: 41acb9dca9eb 'D' bookmarks: W | - o 0: 'A' bookmarks: + o 0: 1994f17a630e 'A' bookmarks: Keep active bookmark on the correct changeset @@ -143,13 +143,13 @@ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) $ hg tglog - o 3: 'C' bookmarks: Y Z + o 3: 3d5fa227f4b5 'C' bookmarks: Y Z | - @ 2: 'B' bookmarks: X + @ 2: e926fccfa8ec 'B' bookmarks: X | - o 1: 'D' bookmarks: W + o 1: 41acb9dca9eb 'D' bookmarks: W | - o 0: 'A' bookmarks: + o 0: 1994f17a630e 'A' bookmarks: $ hg bookmarks W 1:41acb9dca9eb @@ -182,15 +182,15 @@ rebasing 3:3d5fa227f4b5 "C" (Y Z) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob) $ hg tglog - @ 4: 'C' bookmarks: Y Z + @ 4: 45c0f0ec1203 'C' bookmarks: Y Z | - o 3: 'other C' bookmarks: + o 3: b0e10b7175fd 'other C' bookmarks: | - o 2: 'B' bookmarks: X + o 2: e926fccfa8ec 'B' bookmarks: X | - o 1: 'D' bookmarks: W + o 1: 41acb9dca9eb 'D' bookmarks: W | - o 0: 'A' bookmarks: + o 0: 1994f17a630e 'A' bookmarks: ensure that bookmarks given the names of revset functions can be used @@ -225,21 +225,21 @@ $ rm .hg/localtags $ hg up -q B $ hg tglog - o 2: 'C' bookmarks: C + o 2: dc0947a82db8 'C' bookmarks: C | - | @ 1: 'B' bookmarks: B + | @ 1: 112478962961 'B' bookmarks: B |/ - o 0: 'A' bookmarks: A + o 0: 426bada5c675 'A' bookmarks: A $ hg rebase -r B -d C --keep rebasing 1:112478962961 "B" (B) $ hg tglog - @ 3: 'B' bookmarks: B + @ 3: 9769fc65c4c5 'B' bookmarks: B | - o 2: 'C' bookmarks: C + o 2: dc0947a82db8 'C' bookmarks: C | - | o 1: 'B' bookmarks: + | o 1: 112478962961 'B' bookmarks: |/ - o 0: 'A' bookmarks: A + o 0: 426bada5c675 'A' bookmarks: A diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t --- a/tests/test-rebase-collapse.t +++ b/tests/test-rebase-collapse.t @@ -7,8 +7,8 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" - > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" + > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n" > EOF Create repo a: @@ -26,21 +26,21 @@ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tglog - @ 7: 'H' + @ 7: 02de42196ebe 'H' | - | o 6: 'G' + | o 6: eea13746799a 'G' |/| - o | 5: 'F' + o | 5: 24b6387c8c8c 'F' | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -82,22 +82,22 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglogp - @ 5:secret 'Collapsed revision + @ 5: 30882080ba93 secret 'Collapsed revision | * B | * C | * D | | | edited manually' - o 4:draft 'H' + o 4: 02de42196ebe draft 'H' | - | o 3:draft 'G' + | o 3: eea13746799a draft 'G' |/| - o | 2:draft 'F' + o | 2: 24b6387c8c8c draft 'F' | | - | o 1:draft 'E' + | o 1: 9520eea781bc draft 'E' |/ - o 0:draft 'A' + o 0: cd010b8cd998 draft 'A' $ hg manifest --rev tip A @@ -122,20 +122,20 @@ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) $ hg tglog - o 6: 'Collapsed revision + o 6: 7dd333a2d1e4 'Collapsed revision | * E | * G' - @ 5: 'H' + @ 5: 02de42196ebe 'H' | - o 4: 'F' + o 4: 24b6387c8c8c 'F' | - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg manifest --rev tip A @@ -165,19 +165,19 @@ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob) $ hg tglog - o 6: 'custom message' + o 6: 38ed6a6b026b 'custom message' | - @ 5: 'H' + @ 5: 02de42196ebe 'H' | - o 4: 'F' + o 4: 24b6387c8c8c 'F' | - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg manifest --rev tip A @@ -238,21 +238,21 @@ created new head $ hg tglog - @ 7: 'H' + @ 7: c65502d41787 'H' | - | o 6: 'G' + | o 6: c772a8b2dc17 'G' | |\ - | | o 5: 'F' + | | o 5: 7f219660301f 'F' | | | - | | o 4: 'E' + | | o 4: 8a5212ebc852 'E' | | | - | o | 3: 'D' + | o | 3: 2870ad076e54 'D' | |\| - | o | 2: 'C' + | o | 2: c5cefa58fd55 'C' |/ / - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' $ cd .. @@ -275,19 +275,19 @@ saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg (glob) $ hg tglog - o 5: 'Collapsed revision + o 5: f97c4725bd99 'Collapsed revision |\ * E | | * F | | * G' - | @ 4: 'H' + | @ 4: c65502d41787 'H' | | - o | 3: 'D' + o | 3: 2870ad076e54 'D' |\ \ - | o | 2: 'C' + | o | 2: c5cefa58fd55 'C' | |/ - o / 1: 'B' + o / 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' $ hg manifest --rev tip A @@ -393,23 +393,23 @@ created new head $ hg tglog - @ 8: 'I' + @ 8: 46d6f0e29c20 'I' | - | o 7: 'H' + | o 7: 417d3b648079 'H' | |\ - | | o 6: 'G' + | | o 6: 55a44ad28289 'G' | | | - | | o 5: 'F' + | | o 5: dca5924bb570 'F' | | | - | | o 4: 'E' + | | o 4: 8a5212ebc852 'E' | | | - | o | 3: 'D' + | o | 3: 2870ad076e54 'D' | |\| - | o | 2: 'C' + | o | 2: c5cefa58fd55 'C' |/ / - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' $ cd .. @@ -428,20 +428,20 @@ saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg (glob) $ hg tglog - o 5: 'Collapsed revision + o 5: 340b34a63b39 'Collapsed revision |\ * E | | * F | | * G | | * H' - | @ 4: 'I' + | @ 4: 46d6f0e29c20 'I' | | - o | 3: 'D' + o | 3: 2870ad076e54 'D' |\ \ - | o | 2: 'C' + | o | 2: c5cefa58fd55 'C' | |/ - o / 1: 'B' + o / 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' $ hg manifest --rev tip A @@ -493,17 +493,17 @@ created new head $ hg tglog - @ 5: 'F' + @ 5: c137c2b8081f 'F' | - | o 4: 'E' + | o 4: 0a42590ed746 'E' | |\ - | | o 3: 'D' + | | o 3: 7bbcd6078bcc 'D' | | | - | o | 2: 'C' + | o | 2: f838bfaca5c7 'C' | |/ - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' $ cd .. @@ -521,14 +521,14 @@ saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg (glob) $ hg tglog - o 2: 'Collapsed revision + o 2: b72eaccb283f 'Collapsed revision | * B | * C | * D | * E' - @ 1: 'F' + @ 1: c137c2b8081f 'F' | - o 0: 'A' + o 0: 4a2df7238c3b 'A' $ hg manifest --rev tip A @@ -564,13 +564,13 @@ adding d $ hg tglog - @ 3: 'D' + @ 3: 41acb9dca9eb 'D' | - | o 2: 'C' two + | o 2: 8ac4a08debf1 'C' two | | - | o 1: 'B' one + | o 1: 1ba175478953 'B' one |/ - o 0: 'A' + o 0: 1994f17a630e 'A' $ hg rebase --keepbranches --collapse -s 1 -d 3 abort: cannot collapse multiple named branches @@ -588,32 +588,32 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head $ hg tglog - @ 5: 'E' + @ 5: fbfb97b1089a 'E' | - | o 4: 'E' + | o 4: f338eb3c2c7c 'E' |/ - o 3: 'D' + o 3: 41acb9dca9eb 'D' | - | o 2: 'C' two + | o 2: 8ac4a08debf1 'C' two | | - | o 1: 'B' one + | o 1: 1ba175478953 'B' one |/ - o 0: 'A' + o 0: 1994f17a630e 'A' $ hg rebase -s 5 -d 4 rebasing 5:fbfb97b1089a "E" (tip) note: rebase of 5:fbfb97b1089a created no changes to commit saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg (glob) $ hg tglog - @ 4: 'E' + @ 4: f338eb3c2c7c 'E' | - o 3: 'D' + o 3: 41acb9dca9eb 'D' | - | o 2: 'C' two + | o 2: 8ac4a08debf1 'C' two | | - | o 1: 'B' one + | o 1: 1ba175478953 'B' one |/ - o 0: 'A' + o 0: 1994f17a630e 'A' $ hg export tip # HG changeset patch @@ -646,13 +646,13 @@ (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q tip $ hg tglog - @ 3: 'move2' + @ 3: 338e84e2e558 'move2' | - o 2: 'move1' + o 2: 6e7340ee38c0 'move1' | - | o 1: 'change' + | o 1: 1352765a01d4 'change' |/ - o 0: 'add' + o 0: f447d5abf5ea 'add' $ hg rebase --collapse -d 1 rebasing 2:6e7340ee38c0 "move1" @@ -686,12 +686,12 @@ Test collapsing a middle revision in-place $ hg tglog - @ 2: 'Collapsed revision + @ 2: 64b456429f67 'Collapsed revision | * move1 | * move2' - o 1: 'change' + o 1: 1352765a01d4 'change' | - o 0: 'add' + o 0: f447d5abf5ea 'add' $ hg rebase --collapse -r 1 -d 0 abort: can't remove original changesets with unrebased descendants @@ -748,11 +748,11 @@ created new head $ hg tglog - @ 2: 'C' + @ 2: c5cefa58fd55 'C' | - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' @@ -765,9 +765,9 @@ saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg (glob) $ hg tglog - o 1: 'B' + o 1: 27547f69f254 'B' | - @ 0: 'A' + @ 0: 4a2df7238c3b 'A' diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t --- a/tests/test-rebase-dest.t +++ b/tests/test-rebase-dest.t @@ -111,7 +111,7 @@ > [phases] > publish=False > [alias] - > tglog = log -G --template "{rev}: {desc} {instabilities}" -r 'sort(all(), topo)' + > tglog = log -G --template "{rev}: {node|short} {desc} {instabilities}" -r 'sort(all(), topo)' > [extensions] > maprevset=$TESTTMP/maprevset.py > [experimental] @@ -174,13 +174,13 @@ already rebased 0:426bada5c675 "A" (A) already rebased 2:dc0947a82db8 "C" (C) rebasing 3:004dc1679908 "D" (D tip) - o 4: D + o 4: d8d8601abd5e D - o 2: C + o 2: dc0947a82db8 C | - | o 1: B + | o 1: fc2b737bb2e5 B | - o 0: A + o 0: 426bada5c675 A Destination resolves to multiple changesets: @@ -219,17 +219,17 @@ rebasing 4:26805aba1e60 "C" (C) rebasing 3:cd488e83d208 "E" (E) rebasing 5:0069ba24938a "F" (F tip) - o 9: F + o 9: d150ff263fc8 F | - o 8: E + o 8: 66f30a1a2eab E | - | o 7: C + | o 7: 93db94ffae0e C | | - | o 6: B + | o 6: d0071c3b0c88 B | | - | o 1: D + | o 1: 058c1e1fb10a D | - o 0: A + o 0: 426bada5c675 A Different destinations for merge changesets with a same root: @@ -244,19 +244,19 @@ > EOS rebasing 3:a4256619d830 "B" (B) rebasing 6:8e139e245220 "C" (C tip) - o 8: C + o 8: 51e2ce92e06a C |\ - | o 7: B + | o 7: 2ed0c8546285 B | |\ - o | | 5: G + o | | 5: 8fdb2c1feb20 G | | | - | | o 4: E + | | o 4: cd488e83d208 E | | | - o | | 2: F + o | | 2: a6661b868de9 F / / - | o 1: D + | o 1: 058c1e1fb10a D | - o 0: A + o 0: 426bada5c675 A Move to a previous parent: @@ -274,21 +274,21 @@ rebasing 4:33441538d4aa "F" (F) rebasing 6:cf43ad9da869 "G" (G) rebasing 7:eef94f3b5f03 "H" (H tip) - o 10: H + o 10: b3d84c6666cf H | - | o 5: D + | o 5: f585351a92f8 D |/ - o 3: C + o 3: 26805aba1e60 C | - | o 9: G + | o 9: f7c28a1a15e2 G |/ - o 1: B + o 1: 112478962961 B | - | o 8: F + | o 8: 02aa697facf7 F |/ - | o 2: E + | o 2: 7fb047a69f22 E |/ - o 0: A + o 0: 426bada5c675 A Source overlaps with destination: @@ -299,13 +299,13 @@ > EOS rebasing 2:dc0947a82db8 "C" (C) rebasing 1:112478962961 "B" (B) - o 5: B + o 5: 5fe9935d5222 B | - o 4: C + o 4: 12d20731b9e0 C | - o 3: D + o 3: b18e25de2cf5 D | - o 0: A + o 0: 426bada5c675 A Detect cycles early: @@ -345,17 +345,17 @@ already rebased 3:b18e25de2cf5 "D" (D) already rebased 4:312782b8f06e "E" (E) already rebased 5:ad6717a6a58e "F" (F tip) - o 5: F + o 5: ad6717a6a58e F | - o 3: D + o 3: b18e25de2cf5 D | - | o 4: E + | o 4: 312782b8f06e E | |\ - +---o 2: C + +---o 2: dc0947a82db8 C | | - | o 1: B + | o 1: 112478962961 B |/ - o 0: A + o 0: 426bada5c675 A Massively rewrite the DAG: @@ -379,27 +379,27 @@ rebasing 10:ae41898d7875 "K" (K tip) rebasing 9:711f53bbef0b "G" (G) rebasing 6:64a8289d2492 "F" (F) - o 21: F + o 21: 3735afb3713a F | - o 20: G + o 20: 07698142d7a7 G | - o 19: K + o 19: 33aba52e7e72 K | - o 18: D + o 18: 9fdae89dc5a1 D | - o 17: E + o 17: 277dda9a65ee E | - o 16: B + o 16: 9c74fd8657ad B | - o 15: J + o 15: 6527eb0688bb J | - o 14: C + o 14: e94d655b928d C | - o 13: H + o 13: 620d6d349459 H | - o 12: A + o 12: a569a116758f A | - o 11: I + o 11: 2bf1302f5c18 I Resolve instability: @@ -426,27 +426,27 @@ rebasing 10:ffebc37c5d0b "E3" (E3) rebasing 13:fb184bcfeee8 "F2" (F2) rebasing 11:dc838ab4c0da "G" (G) - o 22: G + o 22: 174f63d574a8 G | - o 21: F2 + o 21: c9d9fbe76705 F2 | - o 20: E3 + o 20: 0a03c2ede755 E3 | - o 19: D + o 19: 228d9d2541b1 D | - o 18: C + o 18: cd856b400c95 C | - o 17: J + o 17: 9148200c858c J | - o 15: I2 + o 15: eb74780f5094 I2 | - o 12: H + o 12: 78309edd643f H | - o 5: B2 + o 5: 4b4531bd8e1d B2 | - o 4: N + o 4: 337c285c272b N | - o 2: M + o 2: 699bc4b6fa22 M | - o 0: A + o 0: 426bada5c675 A diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t --- a/tests/test-rebase-detach.t +++ b/tests/test-rebase-detach.t @@ -3,7 +3,7 @@ > rebase= > > [alias] - > tglog = log -G --template "{rev}: '{desc}'\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}'\n" > > [extensions] > drawdag=$TESTDIR/drawdag.py @@ -65,15 +65,15 @@ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob) $ hg tglog - o 4: 'E' + o 4: ee79e0744528 'E' | - o 3: 'D' + o 3: 10530e1d72d9 'D' | - | o 2: 'C' + | o 2: dc0947a82db8 'C' | | - o | 1: 'B' + o | 1: 112478962961 'B' |/ - o 0: 'A' + o 0: 426bada5c675 'A' $ hg manifest --rev tip A @@ -102,13 +102,13 @@ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg (glob) $ hg tglog - o 3: 'D' + o 3: 7375f3dbfb0f 'D' | - o 2: 'C' + o 2: bbfdd6cb49aa 'C' | - o 1: 'B' + o 1: 112478962961 'B' | - o 0: 'A' + o 0: 426bada5c675 'A' $ hg manifest --rev tip A @@ -179,30 +179,30 @@ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg (glob) $ hg tglog - o 4: 'E' + o 4: e3d0c70d606d 'E' | - o 3: 'D' + o 3: e9153d36a1af 'D' | - o 2: 'C' + o 2: a7ac28b870a8 'C' | - o 1: 'B' + o 1: fc2b737bb2e5 'B' - o 0: 'A' + o 0: 426bada5c675 'A' $ hg rebase -d 1 -s 3 rebasing 3:e9153d36a1af "D" rebasing 4:e3d0c70d606d "E" (tip) saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg (glob) $ hg tglog - o 4: 'E' + o 4: 2c24e540eccd 'E' | - o 3: 'D' + o 3: 73f786ed52ff 'D' | - | o 2: 'C' + | o 2: a7ac28b870a8 'C' |/ - o 1: 'B' + o 1: fc2b737bb2e5 'B' - o 0: 'A' + o 0: 426bada5c675 'A' $ cd .. @@ -231,21 +231,21 @@ $ echo "J" >> F $ hg ci -m "J" $ hg tglog - @ 7: 'J' + @ 7: c6aaf0d259c0 'J' | - o 6: 'Merge' + o 6: 0cfbc7e8faaf 'Merge' |\ - | o 5: 'I' + | o 5: b92d164ad3cb 'I' | | - o | 4: 'H' + o | 4: 4ea5b230dea3 'H' | | - | o 3: 'G' + | o 3: c6001eacfde5 'G' |/| - o | 2: 'F' + o | 2: 8908a377a434 'F' | | - | o 1: 'E' + | o 1: 7fb047a69f22 'E' |/ - o 0: 'A' + o 0: 426bada5c675 'A' $ hg rebase -s I -d H --collapse --config ui.merge=internal:other rebasing 5:b92d164ad3cb "I" (I) @@ -254,19 +254,19 @@ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg (glob) $ hg tglog - @ 5: 'Collapsed revision + @ 5: 65079693dac4 'Collapsed revision | * I | * Merge | * J' - o 4: 'H' + o 4: 4ea5b230dea3 'H' | - | o 3: 'G' + | o 3: c6001eacfde5 'G' |/| - o | 2: 'F' + o | 2: 8908a377a434 'F' | | - | o 1: 'E' + | o 1: 7fb047a69f22 'E' |/ - o 0: 'A' + o 0: 426bada5c675 'A' $ hg log --rev tip diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t --- a/tests/test-rebase-interruptions.t +++ b/tests/test-rebase-interruptions.t @@ -6,8 +6,8 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" - > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" + > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n" > EOF @@ -44,15 +44,15 @@ $ cd a1 $ hg tglog - @ 4: 'E' + @ 4: ae36e8e3dfd7 'E' | - o 3: 'D' + o 3: 46b37eabc604 'D' | - | o 2: 'C' + | o 2: 965c486023db 'C' | | - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' Rebasing B onto E: @@ -77,19 +77,19 @@ $ hg phase --force --secret 6 $ hg tglogp - @ 6:secret 'Extra' + @ 6: deb5d2f93d8b secret 'Extra' | - | o 5:draft 'B' + | o 5: 45396c49d53b draft 'B' | | - | o 4:draft 'E' + | o 4: ae36e8e3dfd7 draft 'E' | | - | o 3:draft 'D' + | o 3: 46b37eabc604 draft 'D' | | - o | 2:draft 'C' + o | 2: 965c486023db draft 'C' | | - o | 1:draft 'B' + o | 1: 27547f69f254 draft 'B' |/ - o 0:draft 'A' + o 0: 4a2df7238c3b draft 'A' Resume the rebasing: @@ -115,21 +115,21 @@ warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db $ hg tglogp - o 7:draft 'C' + o 7: d2d25e26288e draft 'C' | - | o 6:secret 'Extra' + | o 6: deb5d2f93d8b secret 'Extra' | | - o | 5:draft 'B' + o | 5: 45396c49d53b draft 'B' | | - @ | 4:draft 'E' + @ | 4: ae36e8e3dfd7 draft 'E' | | - o | 3:draft 'D' + o | 3: 46b37eabc604 draft 'D' | | - | o 2:draft 'C' + | o 2: 965c486023db draft 'C' | | - | o 1:draft 'B' + | o 1: 27547f69f254 draft 'B' |/ - o 0:draft 'A' + o 0: 4a2df7238c3b draft 'A' $ cd .. @@ -140,15 +140,15 @@ $ cd a2 $ hg tglog - @ 4: 'E' + @ 4: ae36e8e3dfd7 'E' | - o 3: 'D' + o 3: 46b37eabc604 'D' | - | o 2: 'C' + | o 2: 965c486023db 'C' | | - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' Rebasing B onto E: @@ -169,19 +169,19 @@ $ hg ci -m 'Extra' --config 'extensions.rebase=!' $ hg tglog - @ 6: 'Extra' + @ 6: 402ee3642b59 'Extra' | - o 5: 'B' + o 5: 45396c49d53b 'B' | - o 4: 'E' + o 4: ae36e8e3dfd7 'E' | - o 3: 'D' + o 3: 46b37eabc604 'D' | - | o 2: 'C' + | o 2: 965c486023db 'C' | | - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' Abort the rebasing: @@ -190,19 +190,19 @@ rebase aborted $ hg tglog - @ 6: 'Extra' + @ 6: 402ee3642b59 'Extra' | - o 5: 'B' + o 5: 45396c49d53b 'B' | - o 4: 'E' + o 4: ae36e8e3dfd7 'E' | - o 3: 'D' + o 3: 46b37eabc604 'D' | - | o 2: 'C' + | o 2: 965c486023db 'C' | | - | o 1: 'B' + | o 1: 27547f69f254 'B' |/ - o 0: 'A' + o 0: 4a2df7238c3b 'A' $ cd .. @@ -212,15 +212,15 @@ $ cd a3 $ hg tglogp - @ 4:draft 'E' + @ 4: ae36e8e3dfd7 draft 'E' | - o 3:draft 'D' + o 3: 46b37eabc604 draft 'D' | - | o 2:draft 'C' + | o 2: 965c486023db draft 'C' | | - | o 1:draft 'B' + | o 1: 27547f69f254 draft 'B' |/ - o 0:draft 'A' + o 0: 4a2df7238c3b draft 'A' Rebasing B onto E: @@ -240,17 +240,17 @@ $ hg phase --secret -f 2 $ hg tglogp - @ 5:public 'B' + @ 5: 45396c49d53b public 'B' | - o 4:public 'E' + o 4: ae36e8e3dfd7 public 'E' | - o 3:public 'D' + o 3: 46b37eabc604 public 'D' | - | o 2:secret 'C' + | o 2: 965c486023db secret 'C' | | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' Abort the rebasing: @@ -259,17 +259,17 @@ rebase aborted $ hg tglogp - @ 5:public 'B' + @ 5: 45396c49d53b public 'B' | - o 4:public 'E' + o 4: ae36e8e3dfd7 public 'E' | - o 3:public 'D' + o 3: 46b37eabc604 public 'D' | - | o 2:secret 'C' + | o 2: 965c486023db secret 'C' | | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' Test rebase interrupted by hooks @@ -292,40 +292,40 @@ abort: precommit hook exited with status 1 [255] $ hg tglogp - @ 7:secret 'C' + @ 7: 401ccec5e39f secret 'C' | - | @ 6:secret 'F' + | @ 6: a0b2430ebfb8 secret 'F' | | - o | 5:public 'B' + o | 5: 45396c49d53b public 'B' | | - o | 4:public 'E' + o | 4: ae36e8e3dfd7 public 'E' | | - o | 3:public 'D' + o | 3: 46b37eabc604 public 'D' | | - | o 2:secret 'C' + | o 2: 965c486023db secret 'C' | | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' $ hg rebase --continue already rebased 2:965c486023db "C" as 401ccec5e39f rebasing 6:a0b2430ebfb8 "F" saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) $ hg tglogp - @ 6:secret 'F' + @ 6: 6e92a149ac6b secret 'F' | - o 5:secret 'C' + o 5: 401ccec5e39f secret 'C' | - o 4:public 'B' + o 4: 45396c49d53b public 'B' | - o 3:public 'E' + o 3: ae36e8e3dfd7 public 'E' | - o 2:public 'D' + o 2: 46b37eabc604 public 'D' | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' $ cd .. @@ -347,40 +347,40 @@ abort: pretxncommit hook exited with status 1 [255] $ hg tglogp - @ 7:secret 'C' + @ 7: 401ccec5e39f secret 'C' | - | @ 6:secret 'F' + | @ 6: a0b2430ebfb8 secret 'F' | | - o | 5:public 'B' + o | 5: 45396c49d53b public 'B' | | - o | 4:public 'E' + o | 4: ae36e8e3dfd7 public 'E' | | - o | 3:public 'D' + o | 3: 46b37eabc604 public 'D' | | - | o 2:secret 'C' + | o 2: 965c486023db secret 'C' | | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' $ hg rebase --continue already rebased 2:965c486023db "C" as 401ccec5e39f rebasing 6:a0b2430ebfb8 "F" saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) $ hg tglogp - @ 6:secret 'F' + @ 6: 6e92a149ac6b secret 'F' | - o 5:secret 'C' + o 5: 401ccec5e39f secret 'C' | - o 4:public 'B' + o 4: 45396c49d53b public 'B' | - o 3:public 'E' + o 3: ae36e8e3dfd7 public 'E' | - o 2:public 'D' + o 2: 46b37eabc604 public 'D' | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' $ cd .. @@ -397,40 +397,40 @@ abort: pretxnclose hook exited with status 1 [255] $ hg tglogp - @ 7:secret 'C' + @ 7: 401ccec5e39f secret 'C' | - | @ 6:secret 'F' + | @ 6: a0b2430ebfb8 secret 'F' | | - o | 5:public 'B' + o | 5: 45396c49d53b public 'B' | | - o | 4:public 'E' + o | 4: ae36e8e3dfd7 public 'E' | | - o | 3:public 'D' + o | 3: 46b37eabc604 public 'D' | | - | o 2:secret 'C' + | o 2: 965c486023db secret 'C' | | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' $ hg rebase --continue already rebased 2:965c486023db "C" as 401ccec5e39f rebasing 6:a0b2430ebfb8 "F" saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) $ hg tglogp - @ 6:secret 'F' + @ 6: 6e92a149ac6b secret 'F' | - o 5:secret 'C' + o 5: 401ccec5e39f secret 'C' | - o 4:public 'B' + o 4: 45396c49d53b public 'B' | - o 3:public 'E' + o 3: ae36e8e3dfd7 public 'E' | - o 2:public 'D' + o 2: 46b37eabc604 public 'D' | - | o 1:public 'B' + | o 1: 27547f69f254 public 'B' |/ - o 0:public 'A' + o 0: 4a2df7238c3b public 'A' $ cd .. diff --git a/tests/test-rebase-issue-noparam-single-rev.t b/tests/test-rebase-issue-noparam-single-rev.t --- a/tests/test-rebase-issue-noparam-single-rev.t +++ b/tests/test-rebase-issue-noparam-single-rev.t @@ -6,7 +6,7 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > EOF @@ -37,15 +37,15 @@ adding r2 $ hg tglog - @ 4: 'r2' + @ 4: 225af64d03e6 'r2' | - o 3: 'r1' + o 3: 8d0a8c99b309 'r1' | - | o 2: 'l1' + | o 2: 87c180a611f2 'l1' |/ - o 1: 'c2' + o 1: 56daeba07f4b 'c2' | - o 0: 'c1' + o 0: e8faad3d03ff 'c1' Rebase with no arguments - single revision in source branch: @@ -56,15 +56,15 @@ saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob) $ hg tglog - @ 4: 'l1' + @ 4: b1152cc99655 'l1' | - o 3: 'r2' + o 3: 225af64d03e6 'r2' | - o 2: 'r1' + o 2: 8d0a8c99b309 'r1' | - o 1: 'c2' + o 1: 56daeba07f4b 'c2' | - o 0: 'c1' + o 0: e8faad3d03ff 'c1' $ cd .. @@ -96,15 +96,15 @@ created new head $ hg tglog - @ 4: 'r1' + @ 4: 8d0a8c99b309 'r1' | - | o 3: 'l2' + | o 3: 1ac923b736ef 'l2' | | - | o 2: 'l1' + | o 2: 87c180a611f2 'l1' |/ - o 1: 'c2' + o 1: 56daeba07f4b 'c2' | - o 0: 'c1' + o 0: e8faad3d03ff 'c1' Rebase with no arguments - single revision in target branch: @@ -116,15 +116,15 @@ saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob) $ hg tglog - @ 4: 'l2' + @ 4: 023181307ed0 'l2' | - o 3: 'l1' + o 3: 913ab52b43b4 'l1' | - o 2: 'r1' + o 2: 8d0a8c99b309 'r1' | - o 1: 'c2' + o 1: 56daeba07f4b 'c2' | - o 0: 'c1' + o 0: e8faad3d03ff 'c1' $ cd .. diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t --- a/tests/test-rebase-mq-skip.t +++ b/tests/test-rebase-mq-skip.t @@ -12,7 +12,7 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" > EOF @@ -90,13 +90,13 @@ 1 revisions have been skipped $ hg tglog - @ 3: 'P0' tags: p0.patch qbase qtip tip + @ 3: 9ecc820b1737 'P0' tags: p0.patch qbase qtip tip | - o 2: 'P1' tags: qparent + o 2: 869d8b134a27 'P1' tags: qparent | - o 1: 'R1' tags: + o 1: da108f2755df 'R1' tags: | - o 0: 'C1' tags: + o 0: cd320d50b341 'C1' tags: $ cd .. @@ -169,23 +169,23 @@ saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg (glob) $ hg tglog - @ 8: 'r5' tags: qtip r5 tip + @ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip | - o 7: 'r2' tags: qbase r2 + o 7: 1660ab13ce9a 'r2' tags: qbase r2 | - o 6: 'branch2-r6' tags: qparent + o 6: 057f55ff8f44 'branch2-r6' tags: qparent | - o 5: 'branch2-r4' tags: + o 5: 1d7287f8deb1 'branch2-r4' tags: | - o 4: 'branch2-r8' tags: + o 4: 3c10b9db2bd5 'branch2-r8' tags: | - o 3: 'branch2-r7' tags: + o 3: b684023158dc 'branch2-r7' tags: | - o 2: 'branch2-r3' tags: + o 2: d817754b1251 'branch2-r3' tags: | - o 1: 'branch2-r1' tags: + o 1: 0621a206f8a4 'branch2-r1' tags: | - o 0: 'r0' tags: + o 0: 222799e2f90b 'r0' tags: $ cd .. diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t --- a/tests/test-rebase-mq.t +++ b/tests/test-rebase-mq.t @@ -7,7 +7,7 @@ > plain=true > > [alias] - > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" > EOF @@ -33,13 +33,13 @@ $ hg qref -m P1 -d '2 0' $ hg tglog - @ 3: 'P1' tags: f2.patch qtip tip + @ 3: 929394423cd3 'P1' tags: f2.patch qtip tip | - o 2: 'P0' tags: f.patch qbase + o 2: 3504f44bffc0 'P0' tags: f.patch qbase | - | o 1: 'R1' tags: + | o 1: bac9ed9960d8 'R1' tags: |/ - o 0: 'C1' tags: qparent + o 0: 36f36ddbca61 'C1' tags: qparent Rebase - try to rebase on an applied mq patch: @@ -91,13 +91,13 @@ saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg (glob) $ hg tglog - @ 3: 'P1' tags: f2.patch qtip tip + @ 3: 462012cf340c 'P1' tags: f2.patch qtip tip | - o 2: 'P0' tags: f.patch qbase + o 2: ebe9914c0d1c 'P0' tags: f.patch qbase | - o 1: 'R1' tags: qparent + o 1: bac9ed9960d8 'R1' tags: qparent | - o 0: 'C1' tags: + o 0: 36f36ddbca61 'C1' tags: $ hg up -q qbase @@ -298,11 +298,11 @@ foo: +baz $ hg tglog - @ 2: 'imported patch bar' tags: bar qtip tip + @ 2: 4f44b861d38c 'imported patch bar' tags: bar qtip tip | - o 1: 'important commit message' tags: empty-important qbase + o 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase | - o 0: 'a' tags: qparent + o 0: cb9a9f314b8b 'a' tags: qparent Create new head to rebase bar onto: @@ -318,13 +318,13 @@ $ hg qref $ hg tglog - @ 3: '[mq]: bar' tags: bar qtip tip + @ 3: d526d4536ed6 '[mq]: bar' tags: bar qtip tip | - | o 2: 'b' tags: + | o 2: d2ae7f538514 'b' tags: | | - o | 1: 'important commit message' tags: empty-important qbase + o | 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase |/ - o 0: 'a' tags: qparent + o 0: cb9a9f314b8b 'a' tags: qparent Rebase bar (make sure series order is preserved and empty-important also is @@ -351,10 +351,10 @@ foo: +baz $ hg tglog - @ 2: '[mq]: bar' tags: bar qbase qtip tip + @ 2: 477d948bb2af '[mq]: bar' tags: bar qbase qtip tip | - o 1: 'b' tags: qparent + o 1: d2ae7f538514 'b' tags: qparent | - o 0: 'a' tags: + o 0: cb9a9f314b8b 'a' tags: $ cd .. diff --git a/tests/test-rebase-named-branches.t b/tests/test-rebase-named-branches.t --- a/tests/test-rebase-named-branches.t +++ b/tests/test-rebase-named-branches.t @@ -6,7 +6,7 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > EOF $ hg init a @@ -45,25 +45,25 @@ $ hg ci -m 'dev-two named branch' $ hg tglog - @ 9: 'dev-two named branch' dev-two + @ 9: cb039b7cae8e 'dev-two named branch' dev-two | - | o 8: 'dev-one named branch' dev-one + | o 8: 643fc9128048 'dev-one named branch' dev-one | | - o | 7: 'H' + o | 7: 02de42196ebe 'H' | | - +---o 6: 'G' + +---o 6: eea13746799a 'G' | | | - o | | 5: 'F' + o | | 5: 24b6387c8c8c 'F' | | | - +---o 4: 'E' + +---o 4: 9520eea781bc 'E' | | - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' Branch name containing a dash (issue3181) @@ -76,25 +76,25 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg (glob) $ hg tglog - @ 9: 'dev-two named branch' dev-two + @ 9: 9e70cd31750f 'dev-two named branch' dev-two | - o 8: 'H' + o 8: 31d0e4ba75e6 'H' | - | o 7: 'G' + | o 7: 4b988a958030 'G' |/| - o | 6: 'F' + o | 6: 24de4aff8e28 'F' | | - o | 5: 'dev-one named branch' dev-one + o | 5: 643fc9128048 'dev-one named branch' dev-one | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' | | - o | 3: 'D' + o | 3: 32af7686d403 'D' | | - o | 2: 'C' + o | 2: 5fddd98957c8 'C' | | - o | 1: 'B' + o | 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg rebase -s dev-one -d 0 --keepbranches rebasing 5:643fc9128048 "dev-one named branch" @@ -105,25 +105,25 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg (glob) $ hg tglog - @ 9: 'dev-two named branch' dev-two + @ 9: 59c2e59309fe 'dev-two named branch' dev-two | - o 8: 'H' + o 8: 904590360559 'H' | - | o 7: 'G' + | o 7: 1a1e6f72ec38 'G' |/| - o | 6: 'F' + o | 6: 42aa3cf0fa7a 'F' | | - o | 5: 'dev-one named branch' dev-one + o | 5: bc8139ee757c 'dev-one named branch' dev-one | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg update 3 3 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -133,27 +133,27 @@ created new head $ hg tglog - @ 10: 'dev-one named branch' dev-one + @ 10: 643fc9128048 'dev-one named branch' dev-one | - | o 9: 'dev-two named branch' dev-two + | o 9: 59c2e59309fe 'dev-two named branch' dev-two | | - | o 8: 'H' + | o 8: 904590360559 'H' | | - | | o 7: 'G' + | | o 7: 1a1e6f72ec38 'G' | |/| - | o | 6: 'F' + | o | 6: 42aa3cf0fa7a 'F' | | | - | o | 5: 'dev-one named branch' dev-one + | o | 5: bc8139ee757c 'dev-one named branch' dev-one | | | - | | o 4: 'E' + | | o 4: 9520eea781bc 'E' | |/ - o | 3: 'D' + o | 3: 32af7686d403 'D' | | - o | 2: 'C' + o | 2: 5fddd98957c8 'C' | | - o | 1: 'B' + o | 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches rebasing 5:bc8139ee757c "dev-one named branch" @@ -165,25 +165,25 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg (glob) $ hg tglog - o 9: 'dev-two named branch' dev-two + o 9: 71325f8bc082 'dev-two named branch' dev-two | - o 8: 'H' + o 8: 12b2bc666e20 'H' | - | o 7: 'G' + | o 7: 549f007a9f5f 'G' |/| - o | 6: 'F' + o | 6: 679f28760620 'F' | | - @ | 5: 'dev-one named branch' dev-one + @ | 5: 643fc9128048 'dev-one named branch' dev-one | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' | | - o | 3: 'D' + o | 3: 32af7686d403 'D' | | - o | 2: 'C' + o | 2: 5fddd98957c8 'C' | | - o | 1: 'B' + o | 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches rebasing 5:643fc9128048 "dev-one named branch" @@ -194,25 +194,25 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg (glob) $ hg tglog - o 9: 'dev-two named branch' dev-two + o 9: 3944801ae4ea 'dev-two named branch' dev-two | - o 8: 'H' + o 8: 8e279d293175 'H' | - | o 7: 'G' + | o 7: aeefee77ab01 'G' |/| - o | 6: 'F' + o | 6: e908b85f3729 'F' | | - @ | 5: 'dev-one named branch' dev-one + @ | 5: bc8139ee757c 'dev-one named branch' dev-one | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg up -r 0 > /dev/null @@ -225,25 +225,25 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglog - o 9: 'D' + o 9: e9f862ce8bad 'D' | - o 8: 'C' + o 8: a0d543090fa4 'C' | - o 7: 'B' + o 7: 3bdb949809d9 'B' | - o 6: 'dev-two named branch' dev-two + o 6: 3944801ae4ea 'dev-two named branch' dev-two | - o 5: 'H' + o 5: 8e279d293175 'H' | - | o 4: 'G' + | o 4: aeefee77ab01 'G' |/| - o | 3: 'F' + o | 3: e908b85f3729 'F' | | - o | 2: 'dev-one named branch' dev-one + o | 2: bc8139ee757c 'dev-one named branch' dev-one | | - | o 1: 'E' + | o 1: 9520eea781bc 'E' |/ - @ 0: 'A' + @ 0: cd010b8cd998 'A' $ hg rebase -s 5 -d 6 abort: source and destination form a cycle @@ -257,25 +257,25 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg (glob) $ hg tglog - o 9: 'D' + o 9: e522577ccdbd 'D' | - o 8: 'C' + o 8: 810110211f50 'C' | - o 7: 'B' + o 7: 160b0930ccc6 'B' | - o 6: 'dev-two named branch' + o 6: c57724c84928 'dev-two named branch' | - o 5: 'H' + o 5: 8e279d293175 'H' | - | o 4: 'G' + | o 4: aeefee77ab01 'G' |/| - o | 3: 'F' + o | 3: e908b85f3729 'F' | | - o | 2: 'dev-one named branch' dev-one + o | 2: bc8139ee757c 'dev-one named branch' dev-one | | - | o 1: 'E' + | o 1: 9520eea781bc 'E' |/ - @ 0: 'A' + @ 0: cd010b8cd998 'A' Reopen branch by rebase @@ -314,13 +314,13 @@ $ hg ci -m 'c1' $ hg tglog - @ 3: 'c1' c + @ 3: c062e3ecd6c6 'c1' c | - | o 2: 'b2' b + | o 2: 792845bb77ee 'b2' b |/ - | o 1: 'b1' b + | o 1: 40039acb7ca5 'b1' b |/ - o 0: '0' + o 0: d681519c3ea7 '0' $ hg clone -q . ../case2 @@ -332,11 +332,11 @@ note: rebase of 2:792845bb77ee created no changes to commit saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg (glob) $ hg tglog - o 2: 'c1' c + o 2: c062e3ecd6c6 'c1' c | - | @ 1: 'b1' b + | @ 1: 40039acb7ca5 'b1' b |/ - o 0: '0' + o 0: d681519c3ea7 '0' rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1') @@ -347,13 +347,13 @@ rebasing 1:40039acb7ca5 "b1" saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg (glob) $ hg tglog - @ 3: 'b1' b + @ 3: 76abc1c6f8c7 'b1' b | - | o 2: 'c1' c + | o 2: c062e3ecd6c6 'c1' c | | - o | 1: 'b2' b + o | 1: 792845bb77ee 'b2' b |/ - o 0: '0' + o 0: d681519c3ea7 '0' rebase 'c1' to the branch head 'c2' that is closed @@ -362,30 +362,30 @@ $ hg ci -qm 'c2 closed' --close $ hg up -qr 2 $ hg tglog - _ 4: 'c2 closed' c + _ 4: 8427af5d86f2 'c2 closed' c | - o 3: 'b1' b + o 3: 76abc1c6f8c7 'b1' b | - | @ 2: 'c1' c + | @ 2: c062e3ecd6c6 'c1' c | | - o | 1: 'b2' b + o | 1: 792845bb77ee 'b2' b |/ - o 0: '0' + o 0: d681519c3ea7 '0' $ hg rebase abort: branch 'c' has one head - please rebase to an explicit rev (run 'hg heads' to see all heads) [255] $ hg tglog - _ 4: 'c2 closed' c + _ 4: 8427af5d86f2 'c2 closed' c | - o 3: 'b1' b + o 3: 76abc1c6f8c7 'b1' b | - | @ 2: 'c1' c + | @ 2: c062e3ecd6c6 'c1' c | | - o | 1: 'b2' b + o | 1: 792845bb77ee 'b2' b |/ - o 0: '0' + o 0: d681519c3ea7 '0' $ hg up -cr 1 @@ -398,13 +398,13 @@ note: rebase of 4:8427af5d86f2 created no changes to commit saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg (glob) $ hg tglog - o 3: 'b1' x + o 3: 117b0ed08075 'b1' x | - | o 2: 'c1' c + | o 2: c062e3ecd6c6 'c1' c | | - @ | 1: 'b2' b + @ | 1: 792845bb77ee 'b2' b |/ - o 0: '0' + o 0: d681519c3ea7 '0' $ cd .. diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t --- a/tests/test-rebase-newancestor.t +++ b/tests/test-rebase-newancestor.t @@ -5,7 +5,7 @@ > rebase= > drawdag=$TESTDIR/drawdag.py > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > EOF $ hg init repo @@ -31,13 +31,13 @@ created new head $ hg tglog - @ 3: 'AD' + @ 3: 3878212183bd 'AD' | - | o 2: 'C' + | o 2: 30ae917c0e4f 'C' | | - | o 1: 'B' + | o 1: 0f4f7cb4f549 'B' |/ - o 0: 'A' + o 0: 1e635d440a73 'A' $ hg rebase -s 1 -d 3 rebasing 1:0f4f7cb4f549 "B" @@ -47,13 +47,13 @@ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg (glob) $ hg tglog - o 3: 'C' + o 3: 25773bc4b4b0 'C' | - o 2: 'B' + o 2: c09015405f75 'B' | - @ 1: 'AD' + @ 1: 3878212183bd 'AD' | - o 0: 'A' + o 0: 1e635d440a73 'A' $ cd .. @@ -108,21 +108,21 @@ $ hg ci -Aqm 'default: f-other stuff' $ hg tglog - @ 7: 'default: f-other stuff' + @ 7: e08089805d82 'default: f-other stuff' | - | o 6: 'dev: merge default' dev + | o 6: 9455ee510502 'dev: merge default' dev |/| - o | 5: 'default: remove f-default' + o | 5: 462860db70a1 'default: remove f-default' | | - | o 4: 'dev: merge default' dev + | o 4: 4b019212aaf6 'dev: merge default' dev |/| - o | 3: 'default: f-default stuff' + o | 3: f157ecfd2b6b 'default: f-default stuff' | | - | o 2: 'dev: f-dev stuff' dev + | o 2: ec2c14fb2984 'dev: f-dev stuff' dev | | - | o 1: 'dev: create branch' dev + | o 1: 1d1a643d390e 'dev: create branch' dev |/ - o 0: 'default: create f-default' + o 0: e90e8eb90b6f 'default: create f-default' $ hg clone -qU . ../ancestor-merge-2 @@ -140,19 +140,19 @@ rebasing 6:9455ee510502 "dev: merge default" saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg (glob) $ hg tglog - o 6: 'dev: merge default' + o 6: fbc098e72227 'dev: merge default' | - o 5: 'dev: merge default' + o 5: eda7b7f46f5d 'dev: merge default' | - o 4: 'dev: f-dev stuff' + o 4: 3e075b1c0a40 'dev: f-dev stuff' | - @ 3: 'default: f-other stuff' + @ 3: e08089805d82 'default: f-other stuff' | - o 2: 'default: remove f-default' + o 2: 462860db70a1 'default: remove f-default' | - o 1: 'default: f-default stuff' + o 1: f157ecfd2b6b 'default: f-default stuff' | - o 0: 'default: create f-default' + o 0: e90e8eb90b6f 'default: create f-default' Grafty cherry picking rebasing: @@ -169,21 +169,21 @@ rebasing 6:9455ee510502 "dev: merge default" saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg (glob) $ hg tglog - o 7: 'dev: merge default' + o 7: fbc098e72227 'dev: merge default' | - o 6: 'dev: merge default' + o 6: eda7b7f46f5d 'dev: merge default' | - o 5: 'dev: f-dev stuff' + o 5: 3e075b1c0a40 'dev: f-dev stuff' | - o 4: 'default: f-other stuff' + o 4: e08089805d82 'default: f-other stuff' | - o 3: 'default: remove f-default' + o 3: 462860db70a1 'default: remove f-default' | - o 2: 'default: f-default stuff' + o 2: f157ecfd2b6b 'default: f-default stuff' | - | o 1: 'dev: create branch' dev + | o 1: 1d1a643d390e 'dev: create branch' dev |/ - o 0: 'default: create f-default' + o 0: e90e8eb90b6f 'default: create f-default' $ cd .. @@ -225,17 +225,17 @@ summary: merge p1 1=ancestor p2 3=outside $ hg tglog - @ 5: 'merge p1 1=ancestor p2 3=outside' + @ 5: a57575f79074 'merge p1 1=ancestor p2 3=outside' |\ - +---o 4: 'merge p1 3=outside p2 1=ancestor' + +---o 4: 6990226659be 'merge p1 3=outside p2 1=ancestor' | |/ - | o 3: 'outside' + | o 3: f59da8fc0fcf 'outside' | | - +---o 2: 'target' + +---o 2: a60552eb93fb 'target' | | - o | 1: 'change' + o | 1: dd40c13f7a6f 'change' |/ - o 0: 'common' + o 0: 02f0f58d5300 'common' $ hg rebase -r 4 -d 2 rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor" @@ -262,17 +262,17 @@ summary: merge p1 1=ancestor p2 3=outside $ hg tglog - @ 5: 'merge p1 1=ancestor p2 3=outside' + @ 5: f9daf77ffe76 'merge p1 1=ancestor p2 3=outside' |\ - +---o 4: 'merge p1 3=outside p2 1=ancestor' + +---o 4: cca50676b1c5 'merge p1 3=outside p2 1=ancestor' | |/ - | o 3: 'outside' + | o 3: f59da8fc0fcf 'outside' | | - o | 2: 'target' + o | 2: a60552eb93fb 'target' | | - o | 1: 'change' + o | 1: dd40c13f7a6f 'change' |/ - o 0: 'common' + o 0: 02f0f58d5300 'common' rebase of merge of ancestors @@ -320,19 +320,19 @@ added 1 changesets with 1 changes to 1 files rebase completed $ hg tglog - @ 6: 'merge rebase ancestors' + @ 6: 113755df812b 'merge rebase ancestors' | - o 5: 'merge p1 1=ancestor p2 3=outside' + o 5: f9daf77ffe76 'merge p1 1=ancestor p2 3=outside' |\ - +---o 4: 'merge p1 3=outside p2 1=ancestor' + +---o 4: cca50676b1c5 'merge p1 3=outside p2 1=ancestor' | |/ - | o 3: 'outside' + | o 3: f59da8fc0fcf 'outside' | | - o | 2: 'target' + o | 2: a60552eb93fb 'target' | | - o | 1: 'change' + o | 1: dd40c13f7a6f 'change' |/ - o 0: 'common' + o 0: 02f0f58d5300 'common' Due to the limitation of 3-way merge algorithm (1 merge base), rebasing a merge may include unwanted content: diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -6,7 +6,7 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > EOF @@ -27,23 +27,23 @@ adding I $ hg tglog - @ 8: 'I' + @ 8: e7ec4e813ba6 'I' | - o 7: 'H' + o 7: 02de42196ebe 'H' | - | o 6: 'G' + | o 6: eea13746799a 'G' |/| - o | 5: 'F' + o | 5: 24b6387c8c8c 'F' | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -138,19 +138,19 @@ saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglog - @ 6: 'D' + @ 6: ed65089c18f8 'D' | - o 5: 'C' + o 5: 7621bf1a2f17 'C' | - o 4: 'B' + o 4: 9430a62369c6 'B' | - o 3: 'I' + o 3: e7ec4e813ba6 'I' | - o 2: 'H' + o 2: 02de42196ebe 'H' | - o 1: 'F' + o 1: 24b6387c8c8c 'F' | - o 0: 'A' + o 0: cd010b8cd998 'A' Try to rollback after a rebase (fail): @@ -172,19 +172,19 @@ saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglog - @ 6: 'D' + @ 6: ed65089c18f8 'D' | - o 5: 'C' + o 5: 7621bf1a2f17 'C' | - o 4: 'B' + o 4: 9430a62369c6 'B' | - o 3: 'I' + o 3: e7ec4e813ba6 'I' | - o 2: 'H' + o 2: 02de42196ebe 'H' | - o 1: 'F' + o 1: 24b6387c8c8c 'F' | - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -201,23 +201,23 @@ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglog - @ 8: 'D' + @ 8: ed65089c18f8 'D' | - o 7: 'C' + o 7: 7621bf1a2f17 'C' | - o 6: 'B' + o 6: 9430a62369c6 'B' | - o 5: 'I' + o 5: e7ec4e813ba6 'I' | - o 4: 'H' + o 4: 02de42196ebe 'H' | - | o 3: 'G' + | o 3: eea13746799a 'G' |/| - o | 2: 'F' + o | 2: 24b6387c8c8c 'F' | | - | o 1: 'E' + | o 1: 9520eea781bc 'E' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -233,19 +233,19 @@ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) $ hg tglog - o 6: 'D' + o 6: 7726e9fd58f7 'D' | - o 5: 'C' + o 5: 72c8333623d0 'C' | - @ 4: 'I' + @ 4: e7ec4e813ba6 'I' | - o 3: 'H' + o 3: 02de42196ebe 'H' | - o 2: 'F' + o 2: 24b6387c8c8c 'F' | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -262,23 +262,23 @@ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglog - @ 8: 'D' + @ 8: 8eeb3c33ad33 'D' | - o 7: 'C' + o 7: 2327fea05063 'C' | - o 6: 'B' + o 6: e4e5be0395b2 'B' | - | o 5: 'I' + | o 5: e7ec4e813ba6 'I' | | - | o 4: 'H' + | o 4: 02de42196ebe 'H' | | - o | 3: 'G' + o | 3: eea13746799a 'G' |\| - | o 2: 'F' + | o 2: 24b6387c8c8c 'F' | | - o | 1: 'E' + o | 1: 9520eea781bc 'E' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -295,19 +295,19 @@ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglog - o 6: 'D' + o 6: ed65089c18f8 'D' | - o 5: 'C' + o 5: 7621bf1a2f17 'C' | - o 4: 'B' + o 4: 9430a62369c6 'B' | - @ 3: 'I' + @ 3: e7ec4e813ba6 'I' | - o 2: 'H' + o 2: 02de42196ebe 'H' | - o 1: 'F' + o 1: 24b6387c8c8c 'F' | - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -323,23 +323,23 @@ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) $ hg tglog - o 8: 'D' + o 8: 668acadedd30 'D' | - o 7: 'C' + o 7: 09eb682ba906 'C' | - | @ 6: 'I' + | @ 6: e7ec4e813ba6 'I' |/ - o 5: 'H' + o 5: 02de42196ebe 'H' | - | o 4: 'G' + | o 4: eea13746799a 'G' |/| - o | 3: 'F' + o | 3: 24b6387c8c8c 'F' | | - | o 2: 'E' + | o 2: 9520eea781bc 'E' |/ - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -356,23 +356,23 @@ saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) $ hg tglog - o 8: 'D' + o 8: 287cc92ba5a4 'D' | - o 7: 'C' + o 7: 6824f610a250 'C' | - o 6: 'B' + o 6: 7c6027df6a99 'B' | - | @ 5: 'I' + | @ 5: e7ec4e813ba6 'I' |/ - o 4: 'H' + o 4: 02de42196ebe 'H' | - | o 3: 'G' + | o 3: eea13746799a 'G' |/| - o | 2: 'F' + o | 2: 24b6387c8c8c 'F' | | - | o 1: 'E' + | o 1: 9520eea781bc 'E' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -388,19 +388,19 @@ saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) $ hg tglog - o 6: 'D' + o 6: 7726e9fd58f7 'D' | - o 5: 'C' + o 5: 72c8333623d0 'C' | - @ 4: 'I' + @ 4: e7ec4e813ba6 'I' | - o 3: 'H' + o 3: 02de42196ebe 'H' | - o 2: 'F' + o 2: 24b6387c8c8c 'F' | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t --- a/tests/test-rebase-partial.t +++ b/tests/test-rebase-partial.t @@ -11,7 +11,7 @@ > evolution.allowunstable=True > > [alias] - > tglog = log -G --template "{rev}: {desc}" + > tglog = log -G --template "{rev}: {node|short} {desc}" > EOF $ rebasewithdag() { @@ -37,15 +37,15 @@ > EOF rebasing 2:b18e25de2cf5 "D" (D) already rebased 3:26805aba1e60 "C" (C tip) - o 4: D + o 4: fe3b4c6498fa D | - | o 3: C + | o 3: 26805aba1e60 C |/ - | x 2: D + | x 2: b18e25de2cf5 D | | - o | 1: B + o | 1: 112478962961 B |/ - o 0: A + o 0: 426bada5c675 A Can collapse commits even if one is already in the right place @@ -58,16 +58,16 @@ > EOF rebasing 2:b18e25de2cf5 "D" (D) rebasing 3:26805aba1e60 "C" (C tip) - o 4: Collapsed revision + o 4: a2493f4ace65 Collapsed revision | * D | * C - | x 3: C + | x 3: 26805aba1e60 C |/ - | x 2: D + | x 2: b18e25de2cf5 D | | - o | 1: B + o | 1: 112478962961 B |/ - o 0: A + o 0: 426bada5c675 A Rebase with "holes". The commits after the hole should end up on the parent of the hole (B below), not on top of the destination (A). @@ -83,13 +83,13 @@ > EOF already rebased 1:112478962961 "B" (B) rebasing 3:f585351a92f8 "D" (D tip) - o 4: D + o 4: 1e6da8103bc7 D | - | x 3: D + | x 3: f585351a92f8 D | | - | o 2: C + | o 2: 26805aba1e60 C |/ - o 1: B + o 1: 112478962961 B | - o 0: A + o 0: 426bada5c675 A diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -4,7 +4,7 @@ > histedit= > > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > EOF @@ -59,13 +59,13 @@ saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) $ hg tglog - @ 3: 'L1' + @ 3: d80cc2da061e 'L1' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' Re-run: @@ -103,9 +103,9 @@ $ hg clone --noupdate c d $ cd d $ hg tglog - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' $ hg update --quiet 0 $ echo M1 > M1 @@ -150,7 +150,7 @@ updating bookmark norebase $ hg tglog -l 1 - @ 2: 'R1' + @ 2: 77ae9631bcca 'R1' | ~ @@ -171,7 +171,7 @@ no changes found $ hg tglog -l 1 - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | ~ @@ -181,11 +181,11 @@ $ cd a $ hg tglog - @ 2: 'R1' + @ 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' $ echo R2 > R2 $ hg ci -Am R2 @@ -195,11 +195,11 @@ adding R3 $ cd ../c $ hg tglog - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - @ 1: 'C2' + @ 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' $ echo L1 > L1 $ hg ci -Am L1 @@ -216,17 +216,17 @@ rebasing 3:ff8d69a621f9 "L1" saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) $ hg tglog - @ 5: 'L1' + @ 5: 518d153c0ba3 'L1' | - o 4: 'R3' + o 4: 770a61882ace 'R3' | - o 3: 'R2' + o 3: 31cd3a05214e 'R2' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' pull --rebase works with bundle2 turned on @@ -235,17 +235,17 @@ $ hg ci -Am R4 adding R4 $ hg tglog - @ 5: 'R4' + @ 5: 00e3b7781125 'R4' | - o 4: 'R3' + o 4: 770a61882ace 'R3' | - o 3: 'R2' + o 3: 31cd3a05214e 'R2' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' $ cd ../c $ hg pull --rebase @@ -259,19 +259,19 @@ rebasing 5:518d153c0ba3 "L1" saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) $ hg tglog - @ 6: 'L1' + @ 6: 0d0727eb7ce0 'L1' | - o 5: 'R4' + o 5: 00e3b7781125 'R4' | - o 4: 'R3' + o 4: 770a61882ace 'R3' | - o 3: 'R2' + o 3: 31cd3a05214e 'R2' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' pull --rebase only update if there is nothing to rebase @@ -281,19 +281,19 @@ $ hg ci -Am R5 adding R5 $ hg tglog - @ 6: 'R5' + @ 6: 88dd24261747 'R5' | - o 5: 'R4' + o 5: 00e3b7781125 'R4' | - o 4: 'R3' + o 4: 770a61882ace 'R3' | - o 3: 'R2' + o 3: 31cd3a05214e 'R2' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' $ cd ../c $ echo L2 > L2 @@ -313,23 +313,23 @@ rebasing 7:c1f58876e3bf "L2" saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) $ hg tglog - o 8: 'L2' + o 8: 6dc0ea5dcf55 'L2' | - @ 7: 'L1' + @ 7: 864e0a2d2614 'L1' | - o 6: 'R5' + o 6: 88dd24261747 'R5' | - o 5: 'R4' + o 5: 00e3b7781125 'R4' | - o 4: 'R3' + o 4: 770a61882ace 'R3' | - o 3: 'R2' + o 3: 31cd3a05214e 'R2' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' pull --rebase update (no rebase) use proper update: @@ -356,25 +356,25 @@ updated to "65bc164c1d9b: R6" 1 other heads for branch "default" $ hg tglog - @ 9: 'R6' + @ 9: 65bc164c1d9b 'R6' | - | o 8: 'L2' + | o 8: 6dc0ea5dcf55 'L2' | | - | o 7: 'L1' + | o 7: 864e0a2d2614 'L1' |/ - o 6: 'R5' + o 6: 88dd24261747 'R5' | - o 5: 'R4' + o 5: 00e3b7781125 'R4' | - o 4: 'R3' + o 4: 770a61882ace 'R3' | - o 3: 'R2' + o 3: 31cd3a05214e 'R2' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' Multiple pre-existing heads on the branch @@ -432,29 +432,29 @@ rebasing 8:6dc0ea5dcf55 "L2" saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) $ hg tglog - @ 12: 'L2' + @ 12: 3603a865eea0 'L2' | - o 11: 'L1' + o 11: bcc8a9cd04bf 'L1' | - o 10: 'R7' + o 10: f7d3e42052f9 'R7' | - | o 9: 'M1' + | o 9: 41fab4eef82f 'M1' |/ - | o 8: 'B1' unrelatedbranch + | o 8: 39c381359968 'B1' unrelatedbranch |/ - o 7: 'R6' + o 7: 65bc164c1d9b 'R6' | - o 6: 'R5' + o 6: 88dd24261747 'R5' | - o 5: 'R4' + o 5: 00e3b7781125 'R4' | - o 4: 'R3' + o 4: 770a61882ace 'R3' | - o 3: 'R2' + o 3: 31cd3a05214e 'R2' | - o 2: 'R1' + o 2: 77ae9631bcca 'R1' | - o 1: 'C2' + o 1: 783333faa078 'C2' | - o 0: 'C1' + o 0: 05d58a0c15dd 'C1' diff --git a/tests/test-rebase-rename.t b/tests/test-rebase-rename.t --- a/tests/test-rebase-rename.t +++ b/tests/test-rebase-rename.t @@ -3,7 +3,7 @@ > rebase= > > [alias] - > tlog = log --template "{rev}: '{desc}' {branches}\n" + > tlog = log --template "{rev}: {node|short} '{desc}' {branches}\n" > tglog = tlog --graph > EOF @@ -34,19 +34,19 @@ created new head $ hg tglog - @ 3: 'rename A' + @ 3: 73a3ee40125d 'rename A' | - | o 2: 'rename B' + | o 2: 220d0626d185 'rename B' |/ - o 1: 'B' + o 1: 3ab5da9a5c01 'B' | - o 0: 'A' + o 0: 1994f17a630e 'A' Rename is tracked: $ hg tlog -p --git -r tip - 3: 'rename A' + 3: 73a3ee40125d 'rename A' diff --git a/a b/a-renamed rename from a rename to a-renamed @@ -64,19 +64,19 @@ saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-rebase.hg (glob) $ hg tglog - @ 3: 'rename A' + @ 3: 032a9b75e83b 'rename A' | - o 2: 'rename B' + o 2: 220d0626d185 'rename B' | - o 1: 'B' + o 1: 3ab5da9a5c01 'B' | - o 0: 'A' + o 0: 1994f17a630e 'A' Rename is not lost: $ hg tlog -p --git -r tip - 3: 'rename A' + 3: 032a9b75e83b 'rename A' diff --git a/a b/a-renamed rename from a rename to a-renamed @@ -132,18 +132,18 @@ created new head $ hg tglog - @ 3: 'copy A' + @ 3: 0a8162ff18a8 'copy A' | - | o 2: 'copy B' + | o 2: 39e588434882 'copy B' |/ - o 1: 'B' + o 1: 6c81ed0049f8 'B' | - o 0: 'A' + o 0: 1994f17a630e 'A' Copy is tracked: $ hg tlog -p --git -r tip - 3: 'copy A' + 3: 0a8162ff18a8 'copy A' diff --git a/a b/a-copied copy from a copy to a-copied @@ -155,19 +155,19 @@ saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-rebase.hg (glob) $ hg tglog - @ 3: 'copy A' + @ 3: 98f6e6dbf45a 'copy A' | - o 2: 'copy B' + o 2: 39e588434882 'copy B' | - o 1: 'B' + o 1: 6c81ed0049f8 'B' | - o 0: 'A' + o 0: 1994f17a630e 'A' Copy is not lost: $ hg tlog -p --git -r tip - 3: 'copy A' + 3: 98f6e6dbf45a 'copy A' diff --git a/a b/a-copied copy from a copy to a-copied @@ -223,15 +223,15 @@ created new head $ hg tglog - @ 4: 'Another unrelated change' + @ 4: b918d683b091 'Another unrelated change' | - | o 3: 'Rename file2 back to file1' + | o 3: 1ac17e43d8aa 'Rename file2 back to file1' |/ - o 2: 'Unrelated change' + o 2: 480101d66d8d 'Unrelated change' | - o 1: 'Rename file1 to file2' + o 1: be44c61debd2 'Rename file1 to file2' | - o 0: 'Adding file1' + o 0: 8ce9a346991d 'Adding file1' $ hg rebase -s 4 -d 3 @@ -263,13 +263,13 @@ Note that there are four entries in the log for d $ hg tglog --follow d - @ 3: 'File d created as copy of c and modified' + @ 3: 421b7e82bb85 'File d created as copy of c and modified' | - o 2: 'File c created as copy of b and modified' + o 2: 327f772bc074 'File c created as copy of b and modified' | - o 1: 'File b created as copy of a and modified' + o 1: 79d255d24ad2 'File b created as copy of a and modified' | - o 0: 'File a created' + o 0: b220cd6d2326 'File a created' Update back to before we performed copies, and inject an unrelated change. $ hg update 0 @@ -293,13 +293,13 @@ There should still be four entries in the log for d $ hg tglog --follow d - @ 4: 'File d created as copy of c and modified' + @ 4: dbb9ba033561 'File d created as copy of c and modified' | - o 3: 'File c created as copy of b and modified' + o 3: af74b229bc02 'File c created as copy of b and modified' | - o 2: 'File b created as copy of a and modified' + o 2: 68bf06433839 'File b created as copy of a and modified' : - o 0: 'File a created' + o 0: b220cd6d2326 'File a created' Same steps as above, but with --collapse on rebase to make sure the copy records collapse correctly. @@ -322,11 +322,11 @@ copy of 'a'. $ hg tglog --follow d - @ 3: 'Collapsed revision + @ 3: 5a46b94210e5 'Collapsed revision : * File b created as copy of a and modified : * File c created as copy of b and modified : * File d created as copy of c and modified' - o 0: 'File a created' + o 0: b220cd6d2326 'File a created' $ cd .. diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t --- a/tests/test-rebase-scenario-global.t +++ b/tests/test-rebase-scenario-global.t @@ -7,7 +7,7 @@ > publish=False > > [alias] - > tglog = log -G --template "{rev}: '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > EOF @@ -34,21 +34,21 @@ $ cd a1 $ hg tglog - @ 7: 'H' + @ 7: 02de42196ebe 'H' | - | o 6: 'G' + | o 6: eea13746799a 'G' |/| - o | 5: 'F' + o | 5: 24b6387c8c8c 'F' | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ hg status --rev "3^1" --rev 3 @@ -72,21 +72,21 @@ $ rm D.orig $ hg tglog - o 7: 'D' + o 7: 1619f02ff7dd 'D' | - @ 6: 'H' + @ 6: 02de42196ebe 'H' | - | o 5: 'G' + | o 5: eea13746799a 'G' |/| - o | 4: 'F' + o | 4: 24b6387c8c8c 'F' | | - | o 3: 'E' + | o 3: 9520eea781bc 'E' |/ - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -107,21 +107,21 @@ $ rm D.orig $ hg tglog - o 7: 'D' + o 7: 2107530e74ab 'D' | - | @ 6: 'H' + | @ 6: 02de42196ebe 'H' |/ - | o 5: 'G' + | o 5: eea13746799a 'G' |/| - o | 4: 'F' + o | 4: 24b6387c8c8c 'F' | | - | o 3: 'E' + | o 3: 9520eea781bc 'E' |/ - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -144,19 +144,19 @@ E.orig: file not found $ hg tglog - o 6: 'E' + o 6: 9f8b8ec77260 'E' | - @ 5: 'H' + @ 5: 02de42196ebe 'H' | - o 4: 'F' + o 4: 24b6387c8c8c 'F' | - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -174,19 +174,19 @@ saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) $ hg tglog - @ 6: 'H' + @ 6: e9240aeaa6ad 'H' | - o 5: 'F' + o 5: 5d0ccadb6e3e 'F' | - o 4: 'E' + o 4: 9520eea781bc 'E' | - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -201,21 +201,21 @@ saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob) $ hg tglog - o 7: 'G' + o 7: 397834907a90 'G' |\ - | @ 6: 'H' + | @ 6: 02de42196ebe 'H' | | - | o 5: 'F' + | o 5: 24b6387c8c8c 'F' | | - o | 4: 'E' + o | 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -232,21 +232,21 @@ saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob) $ hg tglog - @ 7: 'H' + @ 7: c87be72f9641 'H' | - | o 6: 'G' + | o 6: 17badd73d4f1 'G' |/| - o | 5: 'F' + o | 5: 74fb9ed646c4 'F' | | - | o 4: 'E' + | o 4: 9520eea781bc 'E' | | - | | o 3: 'D' + | | o 3: 32af7686d403 'D' | | | - +---o 2: 'C' + +---o 2: 5fddd98957c8 'C' | | - o | 1: 'B' + o | 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' $ cd .. @@ -304,21 +304,21 @@ rebasing 3:32af7686d403 "D" saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) $ hg tglog - o 7: 'D' + o 7: c9659aac0000 'D' | - o 6: 'C' + o 6: e1c4361dd923 'C' | - | @ 5: 'H' + | @ 5: 02de42196ebe 'H' | | - | | o 4: 'G' + | | o 4: eea13746799a 'G' | |/| - | o | 3: 'F' + | o | 3: 24b6387c8c8c 'F' |/ / - | o 2: 'E' + | o 2: 9520eea781bc 'E' |/ - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' Check rebasing public changeset @@ -424,23 +424,23 @@ new changesets 9ae2ed22e576:479ddb54a924 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg tglog - o 8: 'I' + o 8: 479ddb54a924 'I' | - o 7: 'H' + o 7: 72434a4e60b0 'H' | - o 6: 'G' + o 6: 3d8a618087a7 'G' | - | o 5: 'F' + | o 5: 41bfcc75ed73 'F' | | - | o 4: 'E' + | o 4: c01897464e7f 'E' |/ - o 3: 'D' + o 3: ffd453c31098 'D' | - o 2: 'C' + o 2: c9e50f6cdc55 'C' | - | o 1: 'B' + | o 1: 8fd0f7e49f53 'B' |/ - o 0: 'A' + o 0: 9ae2ed22e576 'A' $ cd .. @@ -462,33 +462,33 @@ rebasing 7:72434a4e60b0 "H" rebasing 8:479ddb54a924 "I" (tip) $ hg tglog - o 13: 'I' + o 13: 9bf1d9358a90 'I' | - o 12: 'H' + o 12: 274623a778d4 'H' | - o 11: 'G' + o 11: ab8c8617c8e8 'G' | - o 10: 'D' + o 10: c8cbf59f70da 'D' | - o 9: 'C' + o 9: 563e4faab485 'C' | - | o 8: 'I' + | o 8: 479ddb54a924 'I' | | - | o 7: 'H' + | o 7: 72434a4e60b0 'H' | | - | o 6: 'G' + | o 6: 3d8a618087a7 'G' | | - | | o 5: 'F' + | | o 5: 41bfcc75ed73 'F' | | | - | | o 4: 'E' + | | o 4: c01897464e7f 'E' | |/ - | o 3: 'D' + | o 3: ffd453c31098 'D' | | - | o 2: 'C' + | o 2: c9e50f6cdc55 'C' | | - o | 1: 'B' + o | 1: 8fd0f7e49f53 'B' |/ - o 0: 'A' + o 0: 9ae2ed22e576 'A' $ cd .. @@ -507,31 +507,31 @@ rebasing 7:72434a4e60b0 "H" rebasing 8:479ddb54a924 "I" (tip) $ hg tglog - o 12: 'I' + o 12: 9d7da0053b1c 'I' | - o 11: 'H' + o 11: 8fbd00952cbc 'H' | - o 10: 'G' + o 10: 51d434a615ee 'G' | - o 9: 'D' + o 9: a9c125634b0b 'D' | - | o 8: 'I' + | o 8: 479ddb54a924 'I' | | - | o 7: 'H' + | o 7: 72434a4e60b0 'H' | | - | o 6: 'G' + | o 6: 3d8a618087a7 'G' | | - | | o 5: 'F' + | | o 5: 41bfcc75ed73 'F' | | | - | | o 4: 'E' + | | o 4: c01897464e7f 'E' | |/ - | o 3: 'D' + | o 3: ffd453c31098 'D' | | - | o 2: 'C' + | o 2: c9e50f6cdc55 'C' | | - o | 1: 'B' + o | 1: 8fd0f7e49f53 'B' |/ - o 0: 'A' + o 0: 9ae2ed22e576 'A' $ cd .. @@ -549,29 +549,29 @@ rebasing 6:3d8a618087a7 "G" rebasing 7:72434a4e60b0 "H" $ hg tglog - o 11: 'H' + o 11: 8fbd00952cbc 'H' | - o 10: 'G' + o 10: 51d434a615ee 'G' | - o 9: 'D' + o 9: a9c125634b0b 'D' | - | o 8: 'I' + | o 8: 479ddb54a924 'I' | | - | o 7: 'H' + | o 7: 72434a4e60b0 'H' | | - | o 6: 'G' + | o 6: 3d8a618087a7 'G' | | - | | o 5: 'F' + | | o 5: 41bfcc75ed73 'F' | | | - | | o 4: 'E' + | | o 4: c01897464e7f 'E' | |/ - | o 3: 'D' + | o 3: ffd453c31098 'D' | | - | o 2: 'C' + | o 2: c9e50f6cdc55 'C' | | - o | 1: 'B' + o | 1: 8fd0f7e49f53 'B' |/ - o 0: 'A' + o 0: 9ae2ed22e576 'A' $ cd .. @@ -591,33 +591,33 @@ rebasing 6:3d8a618087a7 "G" rebasing 7:72434a4e60b0 "H" $ hg tglog - o 13: 'H' + o 13: 8fbd00952cbc 'H' | - o 12: 'G' + o 12: 51d434a615ee 'G' | - | o 11: 'F' + | o 11: df23d8bda0b7 'F' | | - | o 10: 'E' + | o 10: 47b7889448ff 'E' |/ - o 9: 'D' + o 9: a9c125634b0b 'D' | - | o 8: 'I' + | o 8: 479ddb54a924 'I' | | - | o 7: 'H' + | o 7: 72434a4e60b0 'H' | | - | o 6: 'G' + | o 6: 3d8a618087a7 'G' | | - | | o 5: 'F' + | | o 5: 41bfcc75ed73 'F' | | | - | | o 4: 'E' + | | o 4: c01897464e7f 'E' | |/ - | o 3: 'D' + | o 3: ffd453c31098 'D' | | - | o 2: 'C' + | o 2: c9e50f6cdc55 'C' | | - o | 1: 'B' + o | 1: 8fd0f7e49f53 'B' |/ - o 0: 'A' + o 0: 9ae2ed22e576 'A' $ cd .. @@ -634,23 +634,23 @@ rebasing 8:479ddb54a924 "I" (tip) saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-rebase.hg (glob) $ hg tglog - o 8: 'I' + o 8: fcb52e68a694 'I' | - o 7: 'H' + o 7: 77bd65cd7600 'H' | - o 6: 'G' + o 6: 12d0e738fb18 'G' | - | o 5: 'F' + | o 5: 41bfcc75ed73 'F' | | - | o 4: 'E' + | o 4: c01897464e7f 'E' | | - | o 3: 'D' + | o 3: ffd453c31098 'D' |/ - o 2: 'C' + o 2: c9e50f6cdc55 'C' | - | o 1: 'B' + | o 1: 8fd0f7e49f53 'B' |/ - o 0: 'A' + o 0: 9ae2ed22e576 'A' $ cd .. @@ -669,23 +669,23 @@ rebasing 8:479ddb54a924 "I" (tip) saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-rebase.hg (glob) $ hg tglog - o 8: 'I' + o 8: 9136df9a87cf 'I' | - o 7: 'H' + o 7: 23e8f30da832 'H' | - o 6: 'G' + o 6: b0efe8534e8b 'G' | - | o 5: 'F' + | o 5: 6eb5b496ab79 'F' | | - | o 4: 'E' + | o 4: d15eade9b0b1 'E' |/ - | o 3: 'D' + | o 3: ffd453c31098 'D' | | - | o 2: 'C' + | o 2: c9e50f6cdc55 'C' | | - o | 1: 'B' + o | 1: 8fd0f7e49f53 'B' |/ - o 0: 'A' + o 0: 9ae2ed22e576 'A' $ cd .. @@ -709,27 +709,27 @@ $ hg add K $ hg commit -m K $ hg tglog - @ 10: 'K' + @ 10: 23a4ace37988 'K' | - o 9: 'J' + o 9: 1301922eeb0c 'J' | - | o 8: 'I' + | o 8: e7ec4e813ba6 'I' | | - | o 7: 'H' + | o 7: 02de42196ebe 'H' | | - +---o 6: 'G' + +---o 6: eea13746799a 'G' | |/ - | o 5: 'F' + | o 5: 24b6387c8c8c 'F' | | - o | 4: 'E' + o | 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' (actual test) @@ -752,27 +752,27 @@ summary: K $ hg tglog - @ 10: 'K' + @ 10: 882431a34a0e 'K' | - | o 9: 'I' + | o 9: adb617877056 'I' |/ - | o 8: 'J' + | o 8: 1301922eeb0c 'J' | | - | | o 7: 'H' + | | o 7: 02de42196ebe 'H' | | | - o---+ 6: 'G' + o---+ 6: eea13746799a 'G' |/ / - | o 5: 'F' + | o 5: 24b6387c8c8c 'F' | | - o | 4: 'E' + o | 4: 9520eea781bc 'E' |/ - | o 3: 'D' + | o 3: 32af7686d403 'D' | | - | o 2: 'C' + | o 2: 5fddd98957c8 'C' | | - | o 1: 'B' + | o 1: 42ccdea3bb16 'B' |/ - o 0: 'A' + o 0: cd010b8cd998 'A' Test that rebase is not confused by $CWD disappearing during rebase (issue4121) @@ -833,19 +833,19 @@ created new head $ hg tglog - @ 6: 'G' + @ 6: 124bb27b6f28 'G' | - | o 5: 'F' + | o 5: 412b391de760 'F' | | - | | o 4: 'E' + | | o 4: 82ae8dc7a9b7 'E' | | | - | o | 3: 'D' + | o | 3: ab709c9f7171 'D' | | | - | | o 2: 'C' + | | o 2: d84f5cfaaf14 'C' | |/ - | o 1: 'B' + | o 1: 76035bbd54bd 'B' |/ - o 0: 'A' + o 0: 216878401574 'A' $ hg rebase -s 1 -d 6 @@ -857,19 +857,19 @@ saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-rebase.hg (glob) $ hg tglog - o 6: 'F' + o 6: 31884cfb735e 'F' | - o 5: 'D' + o 5: 6d89fa5b0909 'D' | - | o 4: 'E' + | o 4: de64d97c697b 'E' | | - | o 3: 'C' + | o 3: b18e4d2d0aa1 'C' |/ - o 2: 'B' + o 2: 0983daf9ff6a 'B' | - @ 1: 'G' + @ 1: 124bb27b6f28 'G' | - o 0: 'A' + o 0: 216878401574 'A' Test experimental revset