rhodecode-enterprise-ce Files · rhodecode/public/js/mode/diff/diff.js

git: use force fetch and update for target ref. This solves a case...

git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r2784:e8c62649

default

Download file

             diff.js
        
                    47 lines
            
             | 1.1 KiB
            
                | application/javascript
            
             |
                JavascriptLexer
            
             / rhodecode / public / js / mode / diff / diff.js
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // CodeMirror, copyright (c) by Marijn Haverbeke and others

      // Distributed under an MIT license: http://codemirror.net/LICENSE

      (function(mod) {

        if (typeof exports == "object" && typeof module == "object") // CommonJS

          mod(require("../../lib/codemirror"));

        else if (typeof define == "function" && define.amd) // AMD

          define(["../../lib/codemirror"], mod);

        else // Plain browser env

          mod(CodeMirror);

      })(function(CodeMirror) {

      "use strict";

      CodeMirror.defineMode("diff", function() {

        var TOKEN_NAMES = {

          '+': 'positive',

          '-': 'negative',

          '@': 'meta'

        };

        return {

          token: function(stream) {

            var tw_pos = stream.string.search(/[\t ]+?$/);

            if (!stream.sol() || tw_pos === 0) {

              stream.skipToEnd();

              return ("error " + (

                TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');

            }

            var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();

            if (tw_pos === -1) {

              stream.skipToEnd();

            } else {

              stream.pos = tw_pos;

            }

            return token_name;

          }

        };

      });

      CodeMirror.defineMIME("text/x-diff", "diff");

      });

	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

				// CodeMirror, copyright (c) by Marijn Haverbeke and others
				// Distributed under an MIT license: http://codemirror.net/LICENSE

				(function(mod) {
				if (typeof exports == "object" && typeof module == "object") // CommonJS
				mod(require("../../lib/codemirror"));
				else if (typeof define == "function" && define.amd) // AMD
				define(["../../lib/codemirror"], mod);
				else // Plain browser env
				mod(CodeMirror);
				})(function(CodeMirror) {
				"use strict";

				CodeMirror.defineMode("diff", function() {

				var TOKEN_NAMES = {
				'+': 'positive',
				'-': 'negative',
				'@': 'meta'
				};

				return {
				token: function(stream) {
				var tw_pos = stream.string.search(/[\t ]+?$/);

				if (!stream.sol() \|\| tw_pos === 0) {
				stream.skipToEnd();
				return ("error " + (
				TOKEN_NAMES[stream.string.charAt(0)] \|\| '')).replace(/ $/, '');
				}

				var token_name = TOKEN_NAMES[stream.peek()] \|\| stream.skipToEnd();

				if (tw_pos === -1) {
				stream.skipToEnd();
				} else {
				stream.pos = tw_pos;
				}

				return token_name;
				}
				};
				});

				CodeMirror.defineMIME("text/x-diff", "diff");

				});