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

simplemerge: change _minimize() to minimize a single conflict...

simplemerge: change _minimize() to minimize a single conflict `_minimize()` is weird in that it changes `a_lines` and `b_lines` but leaves `base_lines` unchanged, which means they'll be inconsistent. That was fine because the caller never used `base_lines`. With the recent refactorings of this code, we can now make this function cleaner by having it minimize a single conflict and not care about `base_lines`. This also makes the code simpler and makes the code for each `render_*()` function more similar. Differential Revision: https://phab.mercurial-scm.org/D11981

marmoute - - Load All Authors

File last commit:

r46659:9be5db61 default


                r49413:c2537aec

default

Download file

             phab-refresh-stack.sh
        
                    41 lines
            
             | 1.1 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / phab-refresh-stack.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/bash

      set -eu

      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`

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

          echo "stack is empty" >&2

          exit 0

      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

          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 \

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

      "$@"

	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

				#!/bin/bash
				set -eu

				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`

				if [[ $revision_in_stack -eq 0 ]]; then
				echo "stack is empty" >&2
				exit 0
				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
				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 \
				phabsend --rev '.#stack and ::. and topic()' \
				"$@"