upstream/mercurial-mirror Files · contrib/phab-refresh-stack.sh

filemerge: add support for partial conflict resolution by external tool...

filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356

marmoute - - Load All Authors

File last commit:

r49546:fba2d7fa default


                r49838:f3aafd78

default

Download file

             phab-refresh-stack.sh
        
                    47 lines
            
             | 1.3 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / phab-refresh-stack.sh
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marmoute
    
contrib: add a small script to refresh all diff in the current stack...

              r46605
            
      #!/bin/bash

      set -eu

        marmoute
    
phabricator-refresh: add a magic value to skip it in the CI...

              r49546
            
      if [[ "$PHABRICATOR_TOKEN" == "NO-PHAB" ]]; then

          echo 'Skipping Phabricator Step' >&2

          exit 0

      fi

        marmoute
    
phab-refresh: do not pick draft changeset from the bare "default" branch...

              r46658
            
      revision_in_stack=`hg log \

          --rev '.#stack and ::. and topic()' \

          -T '\nONE-REV\n' \

          | grep 'ONE-REV' | wc -l`

      revision_on_phab=`hg log \

          --rev '.#stack and ::. and topic() and desc("re:\nDifferential Revision: [^\n]+D\d+$")'\

          -T '\nONE-REV\n' \

          | grep 'ONE-REV' | wc -l`

        marmoute
    
contrib: add a small script to refresh all diff in the current stack...

              r46605
            
      if [[ $revision_in_stack -eq 0 ]]; then

          echo "stack is empty" >&2

        marmoute
    
phab-refresh: do not error out when the stack is empty...

              r46637
            
          exit 0

        marmoute
    
contrib: add a small script to refresh all diff in the current stack...

              r46605
            
      fi

      if [[ $revision_on_phab -eq 0 ]]; then

          echo "no tracked diff in this stack" >&2

          exit 0

      fi

      if [[ $revision_on_phab -lt $revision_in_stack ]]; then

          echo "not all stack changesets (${revision_in_stack}) have matching Phabricator Diff (${revision_on_phab})" >&2

          exit 2

      fi

      if [[ "$PHABRICATOR_TOKEN" == "" ]]; then

          echo 'missing $PHABRICATOR_TOKEN variable' >&2

        marmoute
    
phabricator-refresh: add a magic value to skip it in the CI...

              r49546
            
          echo '(use PHABRICATOR_TOKEN="NO-PHAB" to disable this step)' >&2

        marmoute
    
contrib: add a small script to refresh all diff in the current stack...

              r46605
            
          exit 2

      fi

      hg \

      --config extensions.phabricator= \

      --config phabricator.url=https://phab.mercurial-scm.org/ \

      --config phabricator.callsign=HG \

      --config auth.phabricator.schemes=https \

      --config auth.phabricator.prefix=phab.mercurial-scm.org \

      --config auth.phabricator.phabtoken=$PHABRICATOR_TOKEN \

        marmoute
    
phab-refresh: do not pick draft changeset from the bare "default" branch...

              r46658
            
      phabsend --rev '.#stack and ::. and topic()' \

        marmoute
    
phab-refresh: allow passing additional argument to the phabsend...

              r46659
            
      "$@"

	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

marmoute contrib: add a small script to refresh all diff in the current stack...	r46605	#!/bin/bash
		set -eu

marmoute phabricator-refresh: add a magic value to skip it in the CI...	r49546	if [[ "$PHABRICATOR_TOKEN" == "NO-PHAB" ]]; then
		echo 'Skipping Phabricator Step' >&2
		exit 0
		fi

marmoute phab-refresh: do not pick draft changeset from the bare "default" branch...	r46658	revision_in_stack=`hg log \
		--rev '.#stack and ::. and topic()' \
		-T '\nONE-REV\n' \
		\| grep 'ONE-REV' \| wc -l`
		revision_on_phab=`hg log \
		--rev '.#stack and ::. and topic() and desc("re:\nDifferential Revision: [^\n]+D\d+$")'\
		-T '\nONE-REV\n' \
		\| grep 'ONE-REV' \| wc -l`
marmoute contrib: add a small script to refresh all diff in the current stack...	r46605
		if [[ $revision_in_stack -eq 0 ]]; then
		echo "stack is empty" >&2
marmoute phab-refresh: do not error out when the stack is empty...	r46637	exit 0
marmoute contrib: add a small script to refresh all diff in the current stack...	r46605	fi

		if [[ $revision_on_phab -eq 0 ]]; then
		echo "no tracked diff in this stack" >&2
		exit 0
		fi

		if [[ $revision_on_phab -lt $revision_in_stack ]]; then
		echo "not all stack changesets (${revision_in_stack}) have matching Phabricator Diff (${revision_on_phab})" >&2
		exit 2
		fi

		if [[ "$PHABRICATOR_TOKEN" == "" ]]; then
		echo 'missing $PHABRICATOR_TOKEN variable' >&2
marmoute phabricator-refresh: add a magic value to skip it in the CI...	r49546	echo '(use PHABRICATOR_TOKEN="NO-PHAB" to disable this step)' >&2
marmoute contrib: add a small script to refresh all diff in the current stack...	r46605	exit 2
		fi

		hg \
		--config extensions.phabricator= \
		--config phabricator.url=https://phab.mercurial-scm.org/ \
		--config phabricator.callsign=HG \
		--config auth.phabricator.schemes=https \
		--config auth.phabricator.prefix=phab.mercurial-scm.org \
		--config auth.phabricator.phabtoken=$PHABRICATOR_TOKEN \
marmoute phab-refresh: do not pick draft changeset from the bare "default" branch...	r46658	phabsend --rev '.#stack and ::. and topic()' \
marmoute phab-refresh: allow passing additional argument to the phabsend...	r46659	"$@"