Bug 3904 - hgweb diff between p2 disabled in templates
Summary: hgweb diff between p2 disabled in templates
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: hgweb (show other bugs)
Version: 2.6-rc
Hardware: PC Linux
: normal feature
Assignee: Bugzilla
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-22 18:14 UTC by Matt Mackall
Modified: 2015-01-22 15:04 UTC (History)
5 users (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Matt Mackall 2013-04-22 18:14 UTC

    
Comment 1 Matt Mackall 2013-04-22 18:17 UTC
Support for this feature was added in the 2.5 cycle but the UI portion was backed out prior to release:

http://mercurial.markmail.org/thread/c4qybinbf3owja2m

We'd like to re-enable this with an improved UI.
Comment 2 HG Bot 2015-01-07 16:46 UTC
Fixed by http://selenic.com/repo/hg/rev/9e1f4c65f5f5
Anton Shestakov <engored@ya.ru>
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)

This adds UI portion of the feature that has resided in mercurial since 2012.
Back then the interface was added together with the code, but was shortly
backed out because it was deemed "not ready". Code, however, stayed.

For the original feature and its implementation, see issue2810 and
d605a82cf189.

In short, the backed-out interface had two outstanding issues:
1. it was introducing an entirely new term (baseline) and
2. it was present on every changeset's page, even for changesets with 1 parent
   (or no parents), which didn't make sense

This patch implements a hopefully better interface because:
1. it uses the usual terms (diff) and
2. it only shows up when there actually are 2 parents.

(please test the fix)
Comment 3 Matt Mackall 2015-01-22 15:04 UTC
Bulk testing -> fixed