Patchwork [1,of,2] hgweb: rename 'changesetbaseline' template to 'diffbase'

login
register
mail settings
Submitter Kevin Bullock
Date Feb. 1, 2013, 6:17 p.m.
Message ID <58ddfba8e948636bb8bf.1359742671@opendoor.mincava.umn.edu>
Download mbox | patch
Permalink /patch/787/
State Superseded
Headers show

Comments

Kevin Bullock - Feb. 1, 2013, 6:17 p.m.
# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1359734305 21600
# Branch stable
# Node ID 58ddfba8e948636bb8bf5911e35337e869fc51b5
# Parent  0c51532ec2335b89fa0283a84e57754495df2c08
hgweb: rename 'changesetbaseline' template to 'diffbase'

More accurately reflects what it will be used for, and is also shorter.
Pierre-Yves David - Feb. 1, 2013, 7:13 p.m.
On Fri, Feb 01, 2013 at 12:36:07PM -0600, Kevin Bullock wrote:
> On Feb 1, 2013, at 12:17 PM, Kevin Bullock wrote:
> 
> > # HG changeset patch
> > # User Kevin Bullock <kbullock@ringworld.org>
> > # Date 1359734305 21600
> > # Branch stable
> > # Node ID 58ddfba8e948636bb8bf5911e35337e869fc51b5
> > # Parent  0c51532ec2335b89fa0283a84e57754495df2c08
> > hgweb: rename 'changesetbaseline' template to 'diffbase'
> > 
> > More accurately reflects what it will be used for, and is also shorter.
> > 
> > diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map
> > --- a/mercurial/templates/paper/map
> > +++ b/mercurial/templates/paper/map
> > @@ -101,7 +101,7 @@ changelogparent = '
> > 
> > changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
> > 
> > -changesetbaseline = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
> > +diffbase = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
> 
> Actually 'diffagainst' might be better here: the purpose of this template is to show a link that -changes- the rev we're diffing against, not to link to the rev itself.

So this is a "revision it would make sense to diff against" (and we are possibly already diffing against)

So maybe "alternativediffbase"

The current diffbase should probably be excluded from this list (That's a list isn't it?)
Thomas Arendsen Hein - Feb. 1, 2013, 7:25 p.m.
* Pierre-Yves David <pierre-yves.david@ens-lyon.org> [20130201 20:14]:
> On Fri, Feb 01, 2013 at 12:36:07PM -0600, Kevin Bullock wrote:
> > On Feb 1, 2013, at 12:17 PM, Kevin Bullock wrote:
> > 
> > > # HG changeset patch
> > > # User Kevin Bullock <kbullock@ringworld.org>
> > > # Date 1359734305 21600
> > > # Branch stable
> > > # Node ID 58ddfba8e948636bb8bf5911e35337e869fc51b5
> > > # Parent  0c51532ec2335b89fa0283a84e57754495df2c08
> > > hgweb: rename 'changesetbaseline' template to 'diffbase'
> > > 
> > > More accurately reflects what it will be used for, and is also shorter.
> > > 
> > > diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map
> > > --- a/mercurial/templates/paper/map
> > > +++ b/mercurial/templates/paper/map
> > > @@ -101,7 +101,7 @@ changelogparent = '
> > > 
> > > changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
> > > 
> > > -changesetbaseline = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
> > > +diffbase = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
> > 
> > Actually 'diffagainst' might be better here: the purpose of this template is to show a link that -changes- the rev we're diffing against, not to link to the rev itself.

I still consider "diffbase" a good keyword here.

> So this is a "revision it would make sense to diff against" (and we are possibly already diffing against)

... short: "diffrev" or "diffto" or "diffwith"?

> So maybe "alternativediffbase"

That is even longer than the imho too long "changesetbaseline",
additionally it reads like "alternatived iffbase"

But "altdiff" might be a good, too.

> The current diffbase should probably be excluded from this list (That's a list isn't it?)

Not today :)

Regards,
Thomas

Patch

diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map
--- a/mercurial/templates/paper/map
+++ b/mercurial/templates/paper/map
@@ -101,7 +101,7 @@  changelogparent = '
 
 changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
 
-changesetbaseline = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
+diffbase = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
 filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '