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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

av6 - - Load All Authors

File last commit:

r38501:5faaa31a default


                r38817:bb54db4a

@96 default

Download file

             graph.tmpl
        
                    70 lines
            
             | 2.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / graph.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

      <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}"/>

      </head>

      <body>

      <div class="page_header">

      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

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

      </div>

      <div class="page_nav">

      <div>

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

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

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

      graph |

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

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

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

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

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

      <br/>

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

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

      | {changenav%navgraph}

      </div>

      {searchform}

      </div>

      <div class="title">&nbsp;</div>

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

      <div id="wrapper">

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

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

      </div>

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

      var data = {jsdata|json};

      var graph = new Graph();

      graph.scale({bg_height});

      graph.render(data);

      </script>

      <div class="extra_nav">

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

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

      | {changenav%navgraph}

      </div>

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

          ajaxScrollInit(

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

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

                  function (htmlText) \{

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

                      return m ? m[1] : null;

                  },

                  '#wrapper',

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

                  'graph'

          );

      </script>

      {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

				{header}
				<title>{repo\|escape}: Graph</title>
				<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}"/>
				</head>
				<body>

				<div class="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb} / graph
				</div>

				<div class="page_nav">
				<div>
				<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
				<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> \|
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> \|
				graph \|
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
				<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
				<a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>{archives%archiveentry} \|
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				<br/>
				<a href="{url\|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>
				\| {changenav%navgraph}
				</div>
				{searchform}
				</div>

				<div class="title"> </div>

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

				<div id="wrapper">
				<canvas id="graph"></canvas>
				<ul id="graphnodes">{nodes%graphentry}</ul>
				</div>

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

				<div class="extra_nav">
				<a href="{url\|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>
				\| {changenav%navgraph}
				</div>

				<script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
				ajaxScrollInit(
				'{url\|urlescape}graph/%next%{graphvars%urlparameter}',
				'{nextentry%"{node}"}', <!-- NEXTHASH
				function (htmlText) \{
				var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
				return m ? m[1] : null;
				},
				'#wrapper',
				'<div class="%class%" style="text-align: center;">%text%</div>',
				'graph'
				);
				</script>

				{footer}