upstream/mercurial-mirror Files · mercurial/templates/monoblue/graph.tmpl

tests: test divergence created during interrupted rebase...

tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

av6 - - Load All Authors

File last commit:

r38501:5faaa31a default


                r47586:6648307d

default

Download file

             graph.tmpl
        
                    65 lines
            
             | 2.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / graph.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

          <title>{repo|escape}: graph</title>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
          <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

          <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </head>

      <body>

      <div id="container">

          <div class="page-header">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        Gregory Szorc
    
hgweb: consolidate search form for monoblue...

              r32759
            
              {searchform}

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
              <ul class="page-nav">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
                  <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>

                  <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>

                  <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
                  <li class="current">graph</li>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
                  <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>

                  <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

                  <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
                  <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>

        av6
    
hgweb: add archive entries to graph page...

              r38501
            
                  {archives%archiveentry}

        Anton Shestakov
    
hgweb: don't mix tabs and spaces in monoblue templates

              r24129
            
                  <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
              </ul>

          </div>

          <h2 class="no-link no-border">graph</h2>

          <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>

          <div id="wrapper">

        av6
    
hgweb: calculate <canvas> width and height client-side...

              r35408
            
              <canvas id="graph"></canvas>

        av6
    
monoblue: render changesets server-side on /graph page

              r35221
            
              <ul id="graphnodes">{nodes%graphentry}</ul>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
          </div>

        Gregory Szorc
    
hgweb: support Content Security Policy...

              r30766
            
          <script{if(nonce, ' nonce="{nonce}"')}>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
          document.getElementById('noscript').style.display = 'none';

          var data = {jsdata|json};

          var graph = new Graph();

          graph.scale({bg_height});

          graph.render(data);

          </script>

          <div class="page-path">

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
              <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>

              <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
              | {changenav%navgraph}

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
          </div>

        Gregory Szorc
    
hgweb: support Content Security Policy...

              r30766
            
          <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>

        Takumi IINO
    
hgweb: infinite scroll support for monoblue style

              r20255
            
          ajaxScrollInit(

        av6
    
hgweb: render next pages on /graph incrementally...

              r35410
            
                  '{url|urlescape}graph/%next%{graphvars%urlparameter}',

                  '{nextentry%"{node}"}', <!-- NEXTHASH

        av6
    
hgweb: remove unused second argument of nextPageVarGet()...

              r35672
            
                  function (htmlText) \{

        av6
    
hgweb: render next pages on /graph incrementally...

              r35410
            
                      var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);

                      return m ? m[1] : null;

                  },

        Takumi IINO
    
hgweb: infinite scroll support for monoblue style

              r20255
            
                  '#wrapper',

                  '<div class="%class%" style="text-align: center;">%text%</div>',

                  'graph'

          );

          </script>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: graph</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<link rel="alternate" type="application/atom+xml" href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
		<link rel="alternate" type="application/rss+xml" href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>

		<body>
		<div id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Gregory Szorc hgweb: consolidate search form for monoblue...	r32759	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<ul class="page-nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
		<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
		<li><a href="{url\|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="current">graph</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>
av6 hgweb: add archive entries to graph page...	r38501	{archives%archiveentry}
Anton Shestakov hgweb: don't mix tabs and spaces in monoblue templates	r24129	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		</div>

		<h2 class="no-link no-border">graph</h2>

		<div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
		<div id="wrapper">
av6 hgweb: calculate <canvas> width and height client-side...	r35408	<canvas id="graph"></canvas>
av6 monoblue: render changesets server-side on /graph page	r35221	<ul id="graphnodes">{nodes%graphentry}</ul>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Gregory Szorc hgweb: support Content Security Policy...	r30766	<script{if(nonce, ' nonce="{nonce}"')}>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	document.getElementById('noscript').style.display = 'none';

		var data = {jsdata\|json};
		var graph = new Graph();
		graph.scale({bg_height});
		graph.render(data);
		</script>

		<div class="page-path">
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<a href="{url\|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	\| {changenav%navgraph}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Gregory Szorc hgweb: support Content Security Policy...	r30766	<script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
Takumi IINO hgweb: infinite scroll support for monoblue style	r20255	ajaxScrollInit(
av6 hgweb: render next pages on /graph incrementally...	r35410	'{url\|urlescape}graph/%next%{graphvars%urlparameter}',
		'{nextentry%"{node}"}', <!-- NEXTHASH
av6 hgweb: remove unused second argument of nextPageVarGet()...	r35672	function (htmlText) \{
av6 hgweb: render next pages on /graph incrementally...	r35410	var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
		return m ? m[1] : null;
		},
Takumi IINO hgweb: infinite scroll support for monoblue style	r20255	'#wrapper',
		'<div class="%class%" style="text-align: center;">%text%</div>',
		'graph'
		);
		</script>

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{footer}