view tests/test-hooklib-changeset_published.t @ 44909:d452acc8cce8 stable

flags: account for flag change when tracking rename relevant to merge

There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.

There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.

Differential Revision: https://phab.mercurial-scm.org/D8531

  $ cat <<EOF >> $HGRCPATH
  > [extensions]
  > notify =
  > hooklib =
  > 
  > [phases]
  > publish = False
  > 
  > [notify]
  > sources = pull
  > diffstat = False
  > messageidseed = example
  > domain = example.com
  > 
  > [reposubs]
  > * = baz
  > EOF
  $ hg init a
  $ hg --cwd a debugbuilddag .
  $ hg init b
  $ cat <<EOF >> b/.hg/hgrc
  > [hooks]
  > incoming.notify = python:hgext.notify.hook
  > txnclose-phase.changeset_published = python:hgext.hooklib.changeset_published.hook
  > EOF
  $ hg --cwd b pull ../a | "$PYTHON" $TESTDIR/unwrap-message-id.py
  pulling from ../a
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 0 changes to 0 files
  new changesets 1ea73414a91b (1 drafts)
  MIME-Version: 1.0
  Content-Type: text/plain; charset="us-ascii"
  Content-Transfer-Encoding: 7bit
  Date: * (glob)
  Subject: changeset in * (glob)
  From: [e-mail]
  X-Hg-Notification: changeset 1ea73414a91b
  Message-Id: <hg.[e-mail]>
  To: [e-mail]
  
  changeset 1ea73414a91b in $TESTTMP/b
  details: $TESTTMP/b?cmd=changeset;node=1ea73414a91b
  description:
  	r0
  (run 'hg update' to get a working copy)
  $ hg --cwd a phase --public 0
  $ hg --cwd b pull ../a | "$PYTHON" $TESTDIR/unwrap-message-id.py
  pulling from ../a
  searching for changes
  no changes found
  1 local changesets published
  Subject: changeset published
  In-reply-to: <hg.[e-mail]>
  Message-Id: <hg.[e-mail]>
  Date: * (glob)
  From: [e-mail]
  To: [e-mail]
  
  This changeset has been published.
  $ hg --cwd b phase --force --draft 0
  $ cat <<EOF >> b/.hg/hgrc
  > [notify_published]
  > messageidseed = example2
  > domain = alt.example.com
  > template = Subject: changeset published
  >            From: [e-mail]\n
  >            This draft changeset has been published.\n
  > EOF
  $ hg --cwd b pull ../a | "$PYTHON" $TESTDIR/unwrap-message-id.py
  pulling from ../a
  searching for changes
  no changes found
  1 local changesets published
  Subject: changeset published
  From: [e-mail]
  In-reply-to: <hg.[e-mail]>
  Message-Id: <hg.[e-mail]>
  Date: * (glob)
  To: [e-mail]
  
  This draft changeset has been published.