Homec4science

Show merged changes in commit views for merges

Authored by epriestley <git@epriestley.com> on Mar 23 2012, 23:32.

Description

Show merged changes in commit views for merges

Summary:
When a commit is a merge, show what it merged.

Also fix some bugs:

  • Mercurial queries may contain ":", but mercurial rev ranges may also contain ":". A rev range with a branch that has a ":" in it is ambigiuous, e.g. branch "a:b" might appear in a rev range like "a:b:0", which can not be parsed. Use stable commit names instead.
  • Mercurial stable commit name implementation was broken, fix it.
  • Extend DiffusionHistoryQuery from DiffusionQuery to share code.
  • Fix a bug where Mercurial's main browse list would not show the most recent commit if it was a merge commit.

Test Plan: Generated a bunch of mercurial/git merge commits and looked at them, they seemed to accurately represent the repository state.

Reviewers: btrahan, Makinde

Reviewed By: btrahan

CC: aran, epriestley

Maniphest Tasks: T961

Differential Revision: https://secure.phabricator.com/D2005

Details

Committed
epriestley <git@epriestley.com>Mar 23 2012, 23:32
Pushed
aubortJan 31 2017, 17:16
Parents
rPH2ee5086ce943: With the {F...} syntax, render non-images as links
Branches
Unknown
Tags
Unknown

Event Timeline

epriestley <git@epriestley.com> committed rPHd28eb759d622: Show merged changes in commit views for merges (authored by epriestley <git@epriestley.com>).Mar 23 2012, 23:32