Skip to content

Instantly share code, notes, and snippets.

@jorendorff
Last active February 26, 2019 16:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jorendorff/ca4942e4bd9c77ab7bb1a0f1915cdc24 to your computer and use it in GitHub Desktop.
Save jorendorff/ca4942e4bd9c77ab7bb1a0f1915cdc24 to your computer and use it in GitHub Desktop.

Here's one of the ORIGINALRANGE changesets:

$ hg log --graph --hidden -r 0262c62d81e5
x  changeset:   528466:0262c62d81e5
~  parent:      528452:47e514e01c5c
   user:        Jason Orendorff <jorendorff@mozilla.com>
   date:        Thu Feb 21 09:51:45 2019 -0600
   obsolete:    rewritten using prune as 528566:e7fd0ec90ddf
   obsolete:    rewritten using pick as 528814:b3cce8cc8cf8
   summary:     Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia

The three changesets marked x "pruned by prune" below are the LOCALREBASE changesets.

The changeset marked * "content-divergent" is the VICTIM changeset.

@  changeset:   528821:ef42e7a2d90d
|  tag:         tip
|  user:        Jason Orendorff <jorendorff@mozilla.com>
|  date:        Tue Feb 26 09:59:18 2019 -0600
|  summary:     Bug 1459932 - Add assertions that all parse nodes visited in NameFunctions are in the parser's allocator. r?Waldo
|
o  changeset:   528820:0b51e6221cd8
|  user:        Jason Orendorff <jorendorff@mozilla.com>
|  date:        Fri Feb 22 11:48:53 2019 -0600
|  summary:     No bug - Fix a few bogus argument names in FoldConstants.h. r?khyperia
|
o  changeset:   528819:242a711776a9
|  user:        Jason Orendorff <jorendorff@mozilla.com>
|  date:        Thu Feb 21 16:59:49 2019 -0600
|  summary:     Bug 1529772 - Implement ASI for fields. r?khyperia
|
o  changeset:   528818:1b524d9e624a
|  parent:      528814:b3cce8cc8cf8
|  user:        Jason Orendorff <jorendorff@mozilla.com>
|  date:        Thu Feb 21 16:23:24 2019 -0600
|  summary:     Bug 1529758 - Add a pref for fields. r?tcampbell
|
| x  changeset:   528817:6e3b018fa290
|/   parent:      528814:b3cce8cc8cf8
|    user:        Jason Orendorff <jorendorff@mozilla.com>
|    date:        Thu Feb 21 09:38:30 2019 -0600
|    obsolete:    pruned using prune
|    summary:     Bug 1529607 - Part 5: Style tweaks to existing NameFunctions code. r?khyperia
|
| x  changeset:   528816:d4662ced32c4
|/   parent:      528814:b3cce8cc8cf8
|    user:        Jason Orendorff <jorendorff@mozilla.com>
|    date:        Wed Feb 20 15:06:51 2019 -0600
|    obsolete:    pruned using prune
|    summary:     Bug 1529607 - Part 4: Rename ParseNodeKind::CallSiteObjExpr to CallSiteObj. r?khyperia
|
| x  changeset:   528815:65e9d3ccbbe5
|/   user:        Jason Orendorff <jorendorff@mozilla.com>
|    date:        Wed Feb 20 10:56:14 2019 -0600
|    obsolete:    pruned using prune
|    summary:     Bug 1529607 - Part 1: Fix misleading name in existing ParseNodeVisitor code. r?khyperia
|
*  changeset:   528814:b3cce8cc8cf8
|  user:        Jason Orendorff <jorendorff@mozilla.com>
|  date:        Fri Feb 15 14:01:15 2019 -0600
|  instability: content-divergent
|  summary:     Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
|
o  changeset:   528813:75701f9e7547
|  parent:      528805:e376ef5bf453
|  user:        Jason Orendorff <jorendorff@mozilla.com>
|  date:        Fri Feb 15 16:47:20 2019 -0600
|  summary:     Bug 1528409 - Part 1: Autogenerate the dispatch code in ParseNode::dump(). r?khyperia
|

The first two entries in this obslog are VICTIM and one of the ORIGINALRANGE changesets.

$ hg obslog --hidden -r b3cce8cc8cf8 -r 0262c62d81e5
*    b3cce8cc8cf8 (528814) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
|\
x |  0262c62d81e5 (528466) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
| |    rewritten(description, date, parent, content) as b3cce8cc8cf8 using pick by Jason Orendorff <jorendorff@mozilla.com> (Mon Feb 25 17:25:53 2019 -0600)
| |    rewritten(description, meta, date, parent) as e7fd0ec90ddf using prune by Jason Orendorff <jorendorff@mozilla.com> (Mon Feb 25 17:39:32 2019 -0600)
| |
| x  665acebdc5f9 (528812) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(parent, content) as b3cce8cc8cf8 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Mon Feb 25 16:12:17 2019 -0600)
| |
x |  d516dddb8c41 (528453) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
| |    rewritten(content) as 0262c62d81e5 using amend by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 22 11:38:02 2019 -0600)
| |
| x  fb60e8fc8157 (528451) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(parent, content) as 665acebdc5f9 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Mon Feb 25 15:49:07 2019 -0600)
| |
x |  3aff30cd40b9 (528112) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
| |    rewritten(parent) as d516dddb8c41 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 22 10:53:23 2019 -0600)
| |
| x  c0e0867ad0ba (528132) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(parent) as fb60e8fc8157 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 22 10:52:07 2019 -0600)
| |
| x  55e8ed3019b2 (528103) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(parent, content) as c0e0867ad0ba using evolve by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 22 10:49:31 2019 -0600)
| |
x |  9c87eb32a19b (527687) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
| |    rewritten(parent) as 3aff30cd40b9 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Thu Feb 21 14:46:57 2019 -0600)
| |
| x  13d6a8d65aa0 (527622) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(parent) as 55e8ed3019b2 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Thu Feb 21 14:20:37 2019 -0600)
| |
x |  632de598e373 (527681) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
| |    rewritten(parent) as 9c87eb32a19b using rebase by Jason Orendorff <jorendorff@mozilla.com> (Thu Feb 21 14:02:07 2019 -0600)
| |
x |  7525efd95572 (527668) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
| |    rewritten(description) as 632de598e373 using amend by Jason Orendorff <jorendorff@mozilla.com> (Thu Feb 21 13:56:38 2019 -0600)
| |
| x  bfe8edc3b858 (527325) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(parent, content) as 13d6a8d65aa0 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Tue Feb 19 11:13:31 2019 -0600)
| |
| x  31a85f6e9e76 (527324) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(parent) as bfe8edc3b858 using rebase by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 15 18:18:52 2019 -0600)
| |
x |  fc6b18ebe0cc (527664) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
| |    rewritten(parent) as 7525efd95572 using pick by Jason Orendorff <jorendorff@mozilla.com> (Thu Feb 21 11:42:47 2019 -0600)
| |
| x  b98867684c74 (527322) Bug 1528409 - Part 2: Rename ParseNodeArity to ParseNode::TypeCode. r?khyperia
| |    rewritten(description) as 31a85f6e9e76 using amend by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 15 18:18:18 2019 -0600)
| |
x |  e9a762b310b8 (527663) Bug 1529607 - Part 2: Rename ParseNodeVisitor::cx to cx_. r?khyperia
 /     rewritten(content) as fc6b18ebe0cc using amend by Jason Orendorff <jorendorff@mozilla.com> (Thu Feb 21 09:52:38 2019 -0600)
|
x  847f7f51fe58 (527321) No bug yet - rename ParseNodeArity.
|    rewritten(description) as b98867684c74 using amend by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 15 18:00:28 2019 -0600)
|
x  13a0e90fd10e (527319) No bug yet - rename ParseNodeArity.
|    rewritten(parent) as 847f7f51fe58 using evolve by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 15 17:58:49 2019 -0600)
|
x  131a6a41abf9 (526765) No bug yet - rename ParseNodeArity.
     rewritten(parent, content) as 13a0e90fd10e using pick by Jason Orendorff <jorendorff@mozilla.com> (Fri Feb 15 17:54:55 2019 -0600)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment