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

merge: add a config to allow conflict-free merge of changes on adjacent lines...

merge: add a config to allow conflict-free merge of changes on adjacent lines This change adds a config to make it no longer a conflict to merge changes made on adjacent lines. The reason these changes are considered a conflict is that there's no region of text at the relevant position (sync region) that's kept unchanged by both sides of the merge. The problem can be solved by making the sync regions being a bit more powerful: we can keep a 0-length sync region if we find that a block unchanged by one side is ajacent to a block unchanged by the other side. Since these 0-length sync regions are emitted using the ~same algorithm as the normal non-empty sync regions, this change involves no arbitrary decisions and I expect it to work pretty well. 0-length sync regions do create an ambiguity in a special case where two pairs of adjacent regions "meet" at the same point. This corresponds to an insertion made at the same place by the two sides of the merge, and this still results in a conflict.

av6 - - Load All Authors

File last commit:

r35623:45a81636 default


                r52974:a021da4e

default

Download file

             graph.tmpl
        
                    53 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / 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>

      <link rel="alternate" type="application/atom+xml"

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

              r18526
            
         href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}: tags">

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

              r9999
            
      <link rel="alternate" type="application/rss+xml"

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

              r18526
            
         href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}: tags">

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

              r9999
            
      </head>

      <body>

      <div class="buttons">

        av6
    
spartan: don't drop current revision in log/graph links...

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

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

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

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

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

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

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

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

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

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

              r9999
            
      </div>

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb, spartan: add "URL breadcrumbs"...

              r18259
            
      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h2>

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

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

              r18526
            
      <form action="{url|urlescape}log">

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

              r9999
            
      {sessionvars%hiddenformentry}

      <p>

      <label for="search1">search:</label>

      <input name="rev" id="search1" type="text" size="30">

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

              r10254
            
      navigate: <small class="navigate">{changenav%navgraph}</small>

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

              r9999
            
      </p>

      </form>

      <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>

      <div id="wrapper">

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

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

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

              r35222
            
      <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 type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>

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

              r9999
            
      var data = {jsdata|json};

      var graph = new Graph();

      graph.scale({bg_height});

      graph.render(data);

      </script>

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

              r18526
            
      <form action="{url|urlescape}log">

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

              r9999
            
      {sessionvars%hiddenformentry}

      <p>

      <label for="search1">search:</label>

      <input name="rev" id="search1" type="text" size="30">

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

              r10254
            
      navigate: <small class="navigate">{changenav%navgraph}</small>

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

              r9999
            
      </p>

      </form>

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

		<div class="buttons">
av6 spartan: don't drop current revision in log/graph links...	r25794	<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
		<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
av6 hgweb: don't dereference symbolic revision in spartan style...	r25603	<a href="{url\|urlescape}file/{symrev}/{sessionvars%urlparameter}">files</a>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb, spartan: add "URL breadcrumbs"...	r18259	<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<p>
		<label for="search1">search:</label>
		<input name="rev" id="search1" type="text" size="30">
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	navigate: <small class="navigate">{changenav%navgraph}</small>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</p>
		</form>

		<noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>

		<div id="wrapper">
av6 hgweb: calculate <canvas> width and height client-side...	r35408	<canvas id="graph"></canvas>
av6 spartan: render changesets server-side on /graph page	r35222	<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 type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	var data = {jsdata\|json};
		var graph = new Graph();
		graph.scale({bg_height});
		graph.render(data);
		</script>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<p>
		<label for="search1">search:</label>
		<input name="rev" id="search1" type="text" size="30">
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	navigate: <small class="navigate">{changenav%navgraph}</small>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</p>
		</form>

		{footer}